From 182601780375e6c2ba49a26e83fd122a39a9659b Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 15 Dec 2014 00:58:00 +0000 Subject: [PATCH] Animated Voidstone pillar variant --- .../chisel/block/BlockVoidstonePillar.java | 10 +--- .../chisel/block/BlockVoidstonePillar2.java | 47 +++++++++++++++++++ .../cricketcraft/chisel/init/ModBlocks.java | 8 ++-- 3 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java index 1c4466f2..8dbf235c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java @@ -15,15 +15,13 @@ public class BlockVoidstonePillar extends Block implements ICarvable{ public static IIcon topBottom, pillarSide; public CarvableHelper carvableHelper; - private boolean isAnimated; - public BlockVoidstonePillar(boolean isAnimated) { + public BlockVoidstonePillar() { super(Material.rock); carvableHelper = new CarvableHelper(); setHardness(5.0F); setResistance(10.0F); setCreativeTab(ModTabs.tabChiselBlocks); - this.isAnimated = isAnimated; } @Override @@ -38,11 +36,7 @@ public class BlockVoidstonePillar extends Block implements ICarvable{ @Override public void registerBlockIcons(IIconRegister icon){ - if(this.isAnimated) - topBottom = icon.registerIcon(Chisel.MOD_ID + ":voidstone/animated/pillar-top"); - else - topBottom = icon.registerIcon(Chisel.MOD_ID + ":voidstone/pillar-top"); - + topBottom = icon.registerIcon(Chisel.MOD_ID + ":voidstone/pillar-top"); pillarSide = icon.registerIcon(Chisel.MOD_ID + ":voidstone/pillar-side"); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java new file mode 100644 index 00000000..c4a7c064 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java @@ -0,0 +1,47 @@ +package com.cricketcraft.chisel.block; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +public class BlockVoidstonePillar2 extends Block implements ICarvable{ + + public static IIcon topBottom, pillarSide; + public CarvableHelper carvableHelper; + + public BlockVoidstonePillar2() { + super(Material.rock); + carvableHelper = new CarvableHelper(); + setHardness(5.0F); + setResistance(10.0F); + setCreativeTab(ModTabs.tabChiselBlocks); + } + + @Override + public IIcon getIcon(int side, int meta){ + if(side == 0 || side == 1){ + return topBottom; + } else { + return pillarSide; + } + } + + + @Override + public void registerBlockIcons(IIconRegister icon){ + topBottom = icon.registerIcon(Chisel.MOD_ID + ":voidstone/animated/pillar-top"); + pillarSide = icon.registerIcon(Chisel.MOD_ID + ":voidstone/pillar-side"); + } + + @Override + public CarvableVariation getVariation(int metadata) { + return carvableHelper.getVariation(metadata); + } +} diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 62f3627a..0162f79a 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -74,7 +74,7 @@ public class ModBlocks { public static BlockVoidstone voidstone; public static BlockVoidstone voidstone2; public static BlockVoidstonePillar voidstonePillar; - public static BlockVoidstonePillar voidstonePillar2; + public static BlockVoidstonePillar2 voidstonePillar2; public static Block autoChisel; public static BlockPresent present; public static BlockSnakestone snakestone; @@ -1322,7 +1322,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstone")){ - voidstone = (BlockVoidstone) new BlockVoidstone(Chisel.MOD_ID + ":voidstone").setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); + voidstone = (BlockVoidstone) new BlockVoidstone(null).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/metalborder"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth"); @@ -1349,12 +1349,12 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstonePillars")){ - voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar(false).setStepSound(Block.soundTypeStone); + voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setStepSound(Block.soundTypeStone); voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar"); Carving.chisel.registerOre("voidstonePillar", "voidstonePillar"); - voidstonePillar2 = (BlockVoidstonePillar) new BlockVoidstonePillar(true).setStepSound(Block.soundTypeStone); + voidstonePillar2 = (BlockVoidstonePillar2) new BlockVoidstonePillar2().setStepSound(Block.soundTypeStone); voidstonePillar2.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar2.0.desc"), 0, "voidstone/pillar-side"); voidstonePillar2.carvableHelper.register(voidstonePillar2, "voidstonePillar2"); Carving.chisel.registerOre("voidstonePillar2", "voidstonePillar2");