diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java new file mode 100644 index 00000000..1038f18d --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java @@ -0,0 +1,121 @@ +package com.cricketcraft.chisel.block; + +import java.util.ArrayList; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.StatList; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockCarvableIcePillar extends BlockCarvablePillar { + + public BlockCarvableIcePillar(Material m) { + super(m); + this.slipperiness = 0.98F; + this.setTickRandomly(true); + } + /** + * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha + */ + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() + { + return 1; + } + + /** + * Returns true if the given side of this block type should be rendered, if the adjacent block is at the given + * coordinates. Args: blockAccess, x, y, z, side + */ + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) + { + return super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + } + + /** + * Called when the player destroys a block with an item that can harvest it. (i, j, k) are the coordinates of the + * block and l is the block's subtype/damage. + */ + public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) + { + p_149636_2_.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1); + p_149636_2_.addExhaustion(0.025F); + + if (this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) + { + ArrayList items = new ArrayList(); + ItemStack itemstack = this.createStackedBlock(p_149636_6_); + + if (itemstack != null) items.add(itemstack); + + ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_); + for (ItemStack is : items) + this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is); + } + else + { + if (p_149636_1_.provider.isHellWorld) + { + p_149636_1_.setBlockToAir(p_149636_3_, p_149636_4_, p_149636_5_); + return; + } + + int i1 = EnchantmentHelper.getFortuneModifier(p_149636_2_); + harvesters.set(p_149636_2_); + this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1); + harvesters.set(null); + Material material = p_149636_1_.getBlock(p_149636_3_, p_149636_4_ - 1, p_149636_5_).getMaterial(); + + if (material.blocksMovement() || material.isLiquid()) + { + p_149636_1_.setBlock(p_149636_3_, p_149636_4_, p_149636_5_, Blocks.flowing_water); + } + } + } + + /** + * Returns the quantity of items to drop on block destruction. + */ + public int quantityDropped(Random p_149745_1_) + { + return 0; + } + + /** + * Ticks the block if it's been scheduled + */ + public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) + { + if (p_149674_1_.getSavedLightValue(EnumSkyBlock.Block, p_149674_2_, p_149674_3_, p_149674_4_) > 11 - this.getLightOpacity()) + { + if (p_149674_1_.provider.isHellWorld) + { + p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); + return; + } + + this.dropBlockAsItem(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_, p_149674_1_.getBlockMetadata(p_149674_2_, p_149674_3_, p_149674_4_), 0); + p_149674_1_.setBlock(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.water); + } + } + + /** + * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility + * and stop pistons + */ + public int getMobilityFlag() + { + return 0; + } +} diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java new file mode 100644 index 00000000..f6546a4d --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java @@ -0,0 +1,11 @@ +package com.cricketcraft.chisel.block; + +import net.minecraft.block.material.Material; + +public class BlockCarvablePackedIcePillar extends BlockCarvablePillar { + + public BlockCarvablePackedIcePillar(Material m) { + super(m); + this.slipperiness = 0.98F; + } +} diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 42bb45ad..2447c936 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -31,9 +31,11 @@ import com.cricketcraft.chisel.block.BlockCarvableGlass; import com.cricketcraft.chisel.block.BlockCarvableGlow; import com.cricketcraft.chisel.block.BlockCarvableGlowstone; import com.cricketcraft.chisel.block.BlockCarvableIce; +import com.cricketcraft.chisel.block.BlockCarvableIcePillar; import com.cricketcraft.chisel.block.BlockCarvableIceStairs; import com.cricketcraft.chisel.block.BlockCarvableLayered; import com.cricketcraft.chisel.block.BlockCarvablePackedIce; +import com.cricketcraft.chisel.block.BlockCarvablePackedIcePillar; import com.cricketcraft.chisel.block.BlockCarvablePackedIceStairs; import com.cricketcraft.chisel.block.BlockCarvablePane; import com.cricketcraft.chisel.block.BlockCarvablePillar; @@ -1039,24 +1041,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvableIce ice_pillar = (BlockCarvableIce) new BlockCarvableIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + BlockCarvableIcePillar ice_pillar = (BlockCarvableIcePillar) new BlockCarvableIcePillar(Material.ice).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); ice_pillar.carverHelper.setChiselBlockName("Ice Pillar"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.0.desc"), 0, "icepillar/column"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.1.desc"), 1, "icepillar/capstone"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.2.desc"), 2, "icepillar/base"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.3.desc"), 3, "icepillar/small"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.4.desc"), 4, "icepillar/pillar-carved"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.5.desc"), 5, "icepillar/a1-stoneornamental-marblegreek"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.6.desc"), 6, "icepillar/a1-stonepillar-greek"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.7.desc"), 7, "icepillar/a1-stonepillar-plain"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.8.desc"), 8, "icepillar/a1-stonepillar-greektopplain"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.9.desc"), 9, "icepillar/a1-stonepillar-plaintopplain"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.10.desc"), 10, "icepillar/a1-stonepillar-greekbottomplain"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.11.desc"), 11, "icepillar/a1-stonepillar-plainbottomplain"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.12.desc"), 12, "icepillar/a1-stonepillar-greektopgreek"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.13.desc"), 13, "icepillar/a1-stonepillar-plaintopgreek"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.14.desc"), 14, "icepillar/a1-stonepillar-greekbottomgreek"); - ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.15.desc"), 15, "icepillar/a1-stonepillar-plainbottomgreek"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.0.desc"), 0, "icepillar/plainplain"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.1.desc"), 1, "icepillar/plaingreek"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.2.desc"), 2, "icepillar/greekplain"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.3.desc"), 3, "icepillar/greekgreek"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.4.desc"), 4, "icepillar/convexplain"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.5.desc"), 5, "icepillar/carved"); + ice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.6.desc"), 6, "icepillar/ornamental"); ice_pillar.carverHelper.register(ice_pillar, "ice_pillar"); Carving.chisel.setGroupClass("ice_pillar", "ice"); } @@ -1614,21 +1607,21 @@ public enum Features { BlockCarvablePackedIce packedice = (BlockCarvablePackedIce) new BlockCarvablePackedIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("packedice", Blocks.packed_ice, 0, 0); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.1.desc"), 1, "packedice/a1-ice-light"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.2.desc"), 2, "packedice/a1-stonecobble-icecobble"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.3.desc"), 3, "packedice/a1-netherbrick-ice"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.4.desc"), 4, "packedice/a1-stonecobble-icebrick"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.5.desc"), 5, "packedice/a1-stonecobble-icebricksmall"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.6.desc"), 6, "packedice/a1-stonecobble-icedungeon"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.7.desc"), 7, "packedice/a1-stonecobble-icefour"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.8.desc"), 8, "packedice/a1-stonecobble-icefrench"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.9.desc"), 9, "packedice/sunkentiles"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.10.desc"), 10, "packedice/tiles"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.11.desc"), 11, "packedice/a1-stonecobble-icepanel"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.12.desc"), 12, "packedice/a1-stoneslab-ice"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.13.desc"), 13, "packedice/zelda"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.14.desc"), 14, "packedice/bismuth"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.15.desc"), 15, "packedice/poison"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.1.desc"), 1, "ice/a1-ice-light"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.2.desc"), 2, "ice/a1-stonecobble-icecobble"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.3.desc"), 3, "ice/a1-netherbrick-ice"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.4.desc"), 4, "ice/a1-stonecobble-icebrick"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.7.desc"), 7, "ice/a1-stonecobble-icefour"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.8.desc"), 8, "ice/a1-stonecobble-icefrench"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.9.desc"), 9, "ice/sunkentiles"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.10.desc"), 10, "ice/tiles"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.11.desc"), 11, "ice/a1-stonecobble-icepanel"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.12.desc"), 12, "ice/a1-stoneslab-ice"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.13.desc"), 13, "ice/zelda"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.14.desc"), 14, "ice/bismuth"); + packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.15.desc"), 15, "ice/poison"); packedice.carverHelper.register(packedice, "packedice"); Carving.chisel.registerOre("packedice", "packedice"); } @@ -1638,25 +1631,16 @@ public enum Features { @Override void addBlocks() { - BlockCarvablePackedIce packedice_pillar = (BlockCarvablePackedIce) new BlockCarvablePackedIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) + BlockCarvablePackedIcePillar packedice_pillar = (BlockCarvablePackedIcePillar) new BlockCarvablePackedIcePillar(Material.ice).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) .setStepSound(Block.soundTypeGlass); packedice_pillar.carverHelper.setChiselBlockName("Packed Ice Pillar"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.0.desc"), 0, "packedicepillar/column"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.1.desc"), 1, "packedicepillar/capstone"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.2.desc"), 2, "packedicepillar/base"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.3.desc"), 3, "packedicepillar/small"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.4.desc"), 4, "packedicepillar/pillar-carved"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.5.desc"), 5, "packedicepillar/a1-stoneornamental-marblegreek"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.6.desc"), 6, "packedicepillar/a1-stonepillar-greek"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.7.desc"), 7, "packedicepillar/a1-stonepillar-plain"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.8.desc"), 8, "packedicepillar/a1-stonepillar-greektopplain"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.9.desc"), 9, "packedicepillar/a1-stonepillar-plaintopplain"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.10.desc"), 10, "packedicepillar/a1-stonepillar-greekbottomplain"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.11.desc"), 11, "packedicepillar/a1-stonepillar-plainbottomplain"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.12.desc"), 12, "packedicepillar/a1-stonepillar-greektopgreek"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.13.desc"), 13, "packedicepillar/a1-stonepillar-plaintopgreek"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.14.desc"), 14, "packedicepillar/a1-stonepillar-greekbottomgreek"); - packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.15.desc"), 15, "packedicepillar/a1-stonepillar-plainbottomgreek"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.0.desc"), 0, "icepillar/plainplain"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.1.desc"), 1, "icepillar/plaingreek"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.2.desc"), 2, "icepillar/greekplain"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.3.desc"), 3, "icepillar/greekgreek"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.4.desc"), 4, "icepillar/convexplain"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.5.desc"), 5, "icepillar/carved"); + packedice_pillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.6.desc"), 6, "icepillar/ornamental"); packedice_pillar.carverHelper.register(packedice_pillar, "packedice_pillar"); Carving.chisel.setGroupClass("packedice_pillar", "packedice"); } @@ -1669,21 +1653,21 @@ public enum Features { BlockMarbleStairsMaker makerPackedIceStairs = new BlockMarbleStairsMaker(Blocks.packed_ice); makerPackedIceStairs.carverHelper.setChiselBlockName("Packed Ice Stairs"); makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.0.desc"), 0, Blocks.packed_ice); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.1.desc"), 1, "packedice/a1-ice-light"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.2.desc"), 2, "packedice/a1-stonecobble-icecobble"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.3.desc"), 3, "packedice/a1-netherbrick-ice"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.4.desc"), 4, "packedice/a1-stonecobble-icebrick"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.5.desc"), 5, "packedice/a1-stonecobble-icebricksmall"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.6.desc"), 6, "packedice/a1-stonecobble-icedungeon"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.7.desc"), 7, "packedice/a1-stonecobble-icefour"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.8.desc"), 8, "packedice/a1-stonecobble-icefrench"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.9.desc"), 9, "packedice/sunkentiles"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.10.desc"), 10, "packedice/tiles"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.11.desc"), 11, "packedice/a1-stonecobble-icepanel"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.12.desc"), 12, "packedice/a1-stoneslab-ice"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.13.desc"), 13, "packedice/zelda"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.14.desc"), 14, "packedice/bismuth"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.15.desc"), 15, "packedice/poison"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.1.desc"), 1, "ice/a1-ice-light"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.2.desc"), 2, "ice/a1-stonecobble-icecobble"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.3.desc"), 3, "ice/a1-netherbrick-ice"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.4.desc"), 4, "ice/a1-stonecobble-icebrick"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.7.desc"), 7, "ice/a1-stonecobble-icefour"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.8.desc"), 8, "ice/a1-stonecobble-icefrench"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.9.desc"), 9, "ice/sunkentiles"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.10.desc"), 10, "ice/tiles"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.11.desc"), 11, "ice/a1-stonecobble-icepanel"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.12.desc"), 12, "ice/a1-stoneslab-ice"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.13.desc"), 13, "ice/zelda"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.14.desc"), 14, "ice/bismuth"); + makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.15.desc"), 15, "ice/poison"); makerPackedIceStairs.create(new BlockMarbleStairsMakerCreator() { @Override diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greek-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greek-side.png deleted file mode 100644 index d8ce9695..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomgreek-side.png deleted file mode 100644 index 1d360183..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomplain-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomplain-side.png deleted file mode 100644 index d075980f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopgreek-side.png deleted file mode 100644 index 6ce9f597..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopplain-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopplain-side.png deleted file mode 100644 index 48d48542..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plain-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plain-side.png deleted file mode 100644 index 9dbaca71..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomgreek-side.png deleted file mode 100644 index 2d4b9004..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomgreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomgreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomplain-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomplain-side.png deleted file mode 100644 index 3b84bf04..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomplain-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomplain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plainbottomplain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopgreek-side.png deleted file mode 100644 index 02944947..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopgreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopgreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopplain-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopplain-side.png deleted file mode 100644 index 1aa13688..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopplain-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopplain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plaintopplain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/base-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/base-side.png deleted file mode 100644 index abb97bd0..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/base-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/base-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/base-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/base-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/capstone-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/capstone-side.png deleted file mode 100644 index a2a4fe8b..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/capstone-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/capstone-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/capstone-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/capstone-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/pillar-carved-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/carved-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/pillar-carved-side.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/carved-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stoneornamental-marblegreek-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/carved-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stoneornamental-marblegreek-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/carved-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/column-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/column-side.png deleted file mode 100644 index c271ec1a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/column-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/column-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/column-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/column-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/convexplain-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/convexplain-ctmv.png new file mode 100644 index 00000000..446fbae6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/icepillar/convexplain-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greek-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/convexplain-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greek-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/convexplain-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/greekgreek-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/greekgreek-ctmv.png new file mode 100644 index 00000000..d8fcfb45 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/icepillar/greekgreek-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/greekgreek-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomgreek-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/greekgreek-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/greekplain-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/greekplain-ctmv.png new file mode 100644 index 00000000..c8491e92 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/icepillar/greekplain-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomplain-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/greekplain-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greekbottomplain-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/greekplain-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stoneornamental-marblegreek-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/ornamental-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stoneornamental-marblegreek-side.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/ornamental-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/ornamental-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopgreek-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/ornamental-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/pillar-carved-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/pillar-carved-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/pillar-carved-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/plaingreek-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/plaingreek-ctmv.png new file mode 100644 index 00000000..cede4fcd Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/icepillar/plaingreek-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopplain-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/plaingreek-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-greektopplain-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/plaingreek-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/plainplain-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/plainplain-ctmv.png new file mode 100644 index 00000000..fc110e4e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/icepillar/plainplain-ctmv.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plain-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/plainplain-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/icepillar/a1-stonepillar-plain-top.png rename to src/main/resources/assets/chisel/textures/blocks/icepillar/plainplain-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/small-side.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/small-side.png deleted file mode 100644 index 99866588..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/small-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/icepillar/small-top.png b/src/main/resources/assets/chisel/textures/blocks/icepillar/small-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/icepillar/small-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-ice-light.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-ice-light.png deleted file mode 100644 index 394a53ae..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-ice-light.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-netherbrick-ice.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-netherbrick-ice.png deleted file mode 100644 index 8d18165c..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-netherbrick-ice.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icebrick.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icebrick.png deleted file mode 100644 index 2fea3518..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icebrick.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icebricksmall.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icebricksmall.png deleted file mode 100644 index b1be76bb..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icebricksmall.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icecobble.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icecobble.png deleted file mode 100644 index f335546a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icecobble.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icedungeon-side.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icedungeon-side.png deleted file mode 100644 index 633299b9..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icedungeon-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icedungeon-top.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icedungeon-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icedungeon-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icefour.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icefour.png deleted file mode 100644 index cf9c3578..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icefour.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icefrench.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icefrench.png deleted file mode 100644 index 0a578ac4..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icefrench.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icepanel.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icepanel.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stonecobble-icepanel.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-ice-side.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-ice-side.png deleted file mode 100644 index c70d9147..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-ice-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-ice-top.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-ice-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-ice-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-icetop.png b/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-icetop.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/a1-stoneslab-icetop.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/bismuth.png b/src/main/resources/assets/chisel/textures/blocks/packedice/bismuth.png deleted file mode 100644 index 21647a10..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/bismuth.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/poison.png b/src/main/resources/assets/chisel/textures/blocks/packedice/poison.png deleted file mode 100644 index 1a917dc9..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/poison.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/scribbles-side.png b/src/main/resources/assets/chisel/textures/blocks/packedice/scribbles-side.png deleted file mode 100644 index cd734bc3..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/scribbles-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/scribbles-top.png b/src/main/resources/assets/chisel/textures/blocks/packedice/scribbles-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/scribbles-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/sunkentiles.png b/src/main/resources/assets/chisel/textures/blocks/packedice/sunkentiles.png deleted file mode 100644 index df32b1d7..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/sunkentiles.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/tiles.png b/src/main/resources/assets/chisel/textures/blocks/packedice/tiles.png deleted file mode 100644 index a6626b5f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/tiles.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedice/zelda.png b/src/main/resources/assets/chisel/textures/blocks/packedice/zelda.png deleted file mode 100644 index 6f2e9a27..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedice/zelda.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stoneornamental-marblegreek-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stoneornamental-marblegreek-side.png deleted file mode 100644 index d61c8506..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stoneornamental-marblegreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stoneornamental-marblegreek-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stoneornamental-marblegreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stoneornamental-marblegreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greek-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greek-side.png deleted file mode 100644 index d8ce9695..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greek-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomgreek-side.png deleted file mode 100644 index 1d360183..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomgreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomgreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomplain-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomplain-side.png deleted file mode 100644 index d075980f..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomplain-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomplain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greekbottomplain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopgreek-side.png deleted file mode 100644 index 6ce9f597..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopgreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopgreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopplain-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopplain-side.png deleted file mode 100644 index 48d48542..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopplain-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopplain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-greektopplain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plain-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plain-side.png deleted file mode 100644 index 9dbaca71..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plain-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomgreek-side.png deleted file mode 100644 index 2d4b9004..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomgreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomgreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomplain-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomplain-side.png deleted file mode 100644 index 3b84bf04..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomplain-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomplain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plainbottomplain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopgreek-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopgreek-side.png deleted file mode 100644 index 02944947..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopgreek-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopgreek-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopgreek-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopgreek-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopplain-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopplain-side.png deleted file mode 100644 index 1aa13688..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopplain-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopplain-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopplain-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/a1-stonepillar-plaintopplain-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/base-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/base-side.png deleted file mode 100644 index abb97bd0..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/base-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/base-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/base-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/base-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/capstone-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/capstone-side.png deleted file mode 100644 index a2a4fe8b..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/capstone-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/capstone-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/capstone-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/capstone-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/column-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/column-side.png deleted file mode 100644 index c271ec1a..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/column-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/column-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/column-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/column-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/pillar-carved-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/pillar-carved-side.png deleted file mode 100644 index 27eba7fd..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/pillar-carved-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/pillar-carved-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/pillar-carved-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/pillar-carved-top.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/small-side.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/small-side.png deleted file mode 100644 index 99866588..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/small-side.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/small-top.png b/src/main/resources/assets/chisel/textures/blocks/packedicepillar/small-top.png deleted file mode 100644 index 5a668828..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/packedicepillar/small-top.png and /dev/null differ