diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index ce9816ce..7d1a801b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -64,6 +64,8 @@ public class ChiselBlocks public static BlockCarvablePane blockPaperwall; public static BlockCarvable blockWoolenClay; public static BlockCarvable blockLaboratory; + public static BlockCarvablePumpkin blockCarvablePumpkinOn; + public static BlockCarvablePumpkin blockCarvablePumpkinOff; public static BlockSnakestone blockSnakestone; public static BlockSnakestone blockSandSnakestone; @@ -1250,6 +1252,11 @@ public class ChiselBlocks blockLaboratory.carverHelper.register(blockLaboratory, "laboratoryblock"); } + if(Configurations.featureEnabled("pumpkin")) + { + //TODO + } + Blocks.stone.setHarvestLevel("chisel", 0, 0); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java new file mode 100644 index 00000000..ad9a0d29 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java @@ -0,0 +1,22 @@ +package info.jbcs.minecraft.chisel.block; + +import net.minecraft.world.World; + +/** + * Created by Pokefenn. + * Licensed under MIT (If this is one of my Mods) + */ +public class BlockCarvablePumpkin extends BlockCarvable +{ + + public BlockCarvablePumpkin() + { + super(); + } + + @Override + public int onBlockPlaced(World world_, int x, int y, int z_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_) + { + return p_149660_9_; + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tile/TilePumpkin.java b/src/main/java/info/jbcs/minecraft/chisel/block/tile/TilePumpkin.java new file mode 100644 index 00000000..04af113a --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tile/TilePumpkin.java @@ -0,0 +1,34 @@ +package info.jbcs.minecraft.chisel.block.tile; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +/** + * Created by Pokefenn. + * Licensed under MIT (If this is one of my Mods) + */ +public class TilePumpkin extends TileEntity +{ + + public int pos; + + public TilePumpkin() + { + pos = 0; + } + + @Override + public void writeToNBT(NBTTagCompound nbtTagCompound) + { + super.writeToNBT(nbtTagCompound); + nbtTagCompound.setInteger("pos", pos); + } + + @Override + public void readFromNBT(NBTTagCompound nbtTagCompound) + { + super.readFromNBT(nbtTagCompound); + pos = nbtTagCompound.getInteger("pos"); + } + +} diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_10_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_10_off.png new file mode 100644 index 00000000..ea6fff22 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_10_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_10_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_10_on.png new file mode 100644 index 00000000..fa5304fa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_10_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_11_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_11_off.png new file mode 100644 index 00000000..d511ec26 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_11_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_11_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_11_on.png new file mode 100644 index 00000000..deb63501 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_11_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_12_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_12_off.png new file mode 100644 index 00000000..d5e7d611 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_12_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_12_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_12_on.png new file mode 100644 index 00000000..3a3b91c2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_12_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_13_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_13_off.png new file mode 100644 index 00000000..e3733d9b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_13_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_13_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_13_on.png new file mode 100644 index 00000000..91152e75 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_13_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_14_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_14_off.png new file mode 100644 index 00000000..e74cc16d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_14_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_14_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_14_on.png new file mode 100644 index 00000000..fd54e0d9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_14_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_15_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_15_off.png new file mode 100644 index 00000000..82beca7b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_15_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_15_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_15_on.png new file mode 100644 index 00000000..6ee14e04 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_15_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_16_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_16_off.png new file mode 100644 index 00000000..db359602 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_16_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_16_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_16_on.png new file mode 100644 index 00000000..784db881 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_16_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_17_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_17_off.png new file mode 100644 index 00000000..63371cd1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_17_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_17_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_17_on.png new file mode 100644 index 00000000..c34293b4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_17_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_1_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_1_off.png new file mode 100644 index 00000000..10534ab5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_1_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_1_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_1_on.png new file mode 100644 index 00000000..e2a9f37e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_1_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_2_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_2_off.png new file mode 100644 index 00000000..8e8c59e6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_2_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_2_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_2_on.png new file mode 100644 index 00000000..a12becbb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_2_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_3_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_3_off.png new file mode 100644 index 00000000..f6b8a4f2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_3_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_3_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_3_on.png new file mode 100644 index 00000000..4355ea45 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_3_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_4_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_4_off.png new file mode 100644 index 00000000..9543a93c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_4_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_4_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_4_on.png new file mode 100644 index 00000000..a4a1293c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_4_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_5_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_5_off.png new file mode 100644 index 00000000..2045a1ab Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_5_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_5_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_5_on.png new file mode 100644 index 00000000..2780eefc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_5_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_6_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_6_off.png new file mode 100644 index 00000000..a6249b53 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_6_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_6_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_6_on.png new file mode 100644 index 00000000..cf3a5a47 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_6_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_7_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_7_off.png new file mode 100644 index 00000000..f8e945c3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_7_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_7_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_7_on.png new file mode 100644 index 00000000..1f4af848 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_7_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_8_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_8_off.png new file mode 100644 index 00000000..b7025188 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_8_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_8_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_8_on.png new file mode 100644 index 00000000..150ba810 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_8_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_9_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_9_off.png new file mode 100644 index 00000000..6d024f2b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_9_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_9_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_9_on.png new file mode 100644 index 00000000..b9e2af90 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_9_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_off.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_off.png new file mode 100644 index 00000000..ecef0250 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_off.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_on.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_on.png new file mode 100644 index 00000000..907f499f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_face_on.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_side.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_side.png new file mode 100644 index 00000000..75dfc475 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_side.png differ