diff --git a/src/main/java/com/cricketcraft/chisel/Configurations.java b/src/main/java/com/cricketcraft/chisel/Configurations.java index de04ac97..e6a2de26 100644 --- a/src/main/java/com/cricketcraft/chisel/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/Configurations.java @@ -18,7 +18,6 @@ public class Configurations public static boolean autoChisel; public static boolean fancy; public static boolean enableFMP; - public static boolean animatedVoidstone; public static int factoryBlockAmount; public static int particlesTickrate; @@ -45,7 +44,6 @@ public class Configurations chiselRecipe = config.get("general", "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel").getBoolean(false); autoChisel = config.get("general", "autoChisel", true, "Should people be allowed to use the auto chisel").getBoolean(true); enableFMP = config.get("general", "enableFMP", true, "Do you want to enable FMP").getBoolean(true); - animatedVoidstone = config.get("client", "animatedVoidstone", true, "True, you want animated textures. False, nah i'm good.").getBoolean(true); if(config.hasChanged()) { diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 1f8fe651..62f3627a 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -72,7 +72,9 @@ public class ModBlocks { public static BlockCarvable pumpkin; public static BlockCarvable jackOLantern; public static BlockVoidstone voidstone; + public static BlockVoidstone voidstone2; public static BlockVoidstonePillar voidstonePillar; + public static BlockVoidstonePillar voidstonePillar2; public static Block autoChisel; public static BlockPresent present; public static BlockSnakestone snakestone; @@ -1320,17 +1322,7 @@ public class ModBlocks { } if(Configurations.featureEnabled("voidstone")){ - if(Configurations.animatedVoidstone){ - voidstone = (BlockVoidstone) new BlockVoidstone(Chisel.MOD_ID + ":voidstone/animated/void").setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/animated/metalborder"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/animated/quarters"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/animated/smooth"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/animated/rune"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/animated/raw"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/animated/eye"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.15.desc"), 15, "voidstone/animated/bevel"); - } else { - voidstone = (BlockVoidstone) new BlockVoidstone(null).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); + voidstone = (BlockVoidstone) new BlockVoidstone(Chisel.MOD_ID + ":voidstone").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"); @@ -1339,20 +1331,33 @@ public class ModBlocks { voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/raw"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/eye"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.15.desc"), 15, "voidstone/bevel"); - } - voidstone.carverHelper.register(voidstone, "voidstone"); - Carving.chisel.registerOre("voidstone", "voidstone"); + + voidstone.carverHelper.register(voidstone, "voidstone"); + Carving.chisel.registerOre("voidstone", "voidstone"); + + voidstone2 = (BlockVoidstone) new BlockVoidstone(Chisel.MOD_ID + ":voidstone/animated/void").setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/animated/metalborder"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/animated/quarters"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/animated/smooth"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/animated/rune"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/animated/raw"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/animated/eye"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.15.desc"), 15, "voidstone/animated/bevel"); + + voidstone2.carverHelper.register(voidstone2, "voidstone2"); + Carving.chisel.registerOre("voidstone2", "voidstone2"); } if(Configurations.featureEnabled("voidstonePillars")){ - voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar(Configurations.animatedVoidstone).setStepSound(Block.soundTypeStone); - if(Configurations.animatedVoidstone){ - voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); - } else { - voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); - } + voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar(false).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.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar2.0.desc"), 0, "voidstone/pillar-side"); + voidstonePillar2.carvableHelper.register(voidstonePillar2, "voidstonePillar2"); + Carving.chisel.registerOre("voidstonePillar2", "voidstonePillar2"); } if (Configurations.featureEnabled("waterstone")) { diff --git a/src/main/resources/assets/chisel/lang/en_GB.lang b/src/main/resources/assets/chisel/lang/en_GB.lang index 4b40f678..a369fc86 100644 --- a/src/main/resources/assets/chisel/lang/en_GB.lang +++ b/src/main/resources/assets/chisel/lang/en_GB.lang @@ -48,8 +48,22 @@ tile.voidstone.14.desc=Eye Voidstone tile.voidstone.15.desc=Beveled Voidstone #Void Stone Pillars -tile.voidstonePillar.name=Void Stone Pillar -tile.voidstonePillar.0.desc=Striped Void Stone Pillar +tile.voidstonePillar.name=Voidstone Pillar +tile.voidstonePillar.0.desc=Striped Voidstone Pillar + +#Animated Void Stone Blocks +tile.voidstone2.name=Animated Voidstone +tile.voidstone2.0.desc=Metal-Bordered Animated Voidstone +tile.voidstone2.1.desc=Large Animated Voidstone tiles +tile.voidstone2.2.desc=Smooth Animated Voidstone +tile.voidstone2.12.desc=Runic Animated Voidstone +tile.voidstone2.13.desc=Raw Animated Voidstone +tile.voidstone2.14.desc=Eye Animated Voidstone +tile.voidstone2.15.desc=Beveled Animated Voidstone + +#Void Stone Pillars +tile.voidstonePillar2.name=Animated Voidstone Pillar +tile.voidstonePillar2.0.desc=Striped Voidstone Pillar #Waterstone tile.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index cef78917..b4ae9520 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -51,6 +51,20 @@ tile.voidstone.15.desc=Beveled Voidstone tile.voidstonePillar.name=Void Stone Pillar tile.voidstonePillar.0.desc=Striped Void Stone Pillar +#Animated Void Stone Blocks +tile.voidstone2.name=Animated Voidstone +tile.voidstone2.0.desc=Metal-Bordered Animated Voidstone +tile.voidstone2.1.desc=Large Animated Voidstone tiles +tile.voidstone2.2.desc=Smooth Animated Voidstone +tile.voidstone2.12.desc=Runic Animated Voidstone +tile.voidstone2.13.desc=Raw Animated Voidstone +tile.voidstone2.14.desc=Eye Animated Voidstone +tile.voidstone2.15.desc=Beveled Animated Voidstone + +#Void Stone Pillars +tile.voidstonePillar2.name=Animated Voidstone Pillar +tile.voidstonePillar2.0.desc=Striped Animated Voidstone Pillar + #Waterstone tile.waterstone.name=Waterstone tile.waterstone.0.desc=Waterstone Bricks diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/pillar-top.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/pillar-top.png.mcmeta index 895e9201..71538873 100644 --- a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/pillar-top.png.mcmeta +++ b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/pillar-top.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 2, + "frametime": 4, "frames": [ 0, 1, diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png.mcmeta index 895e9201..71538873 100644 --- a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png.mcmeta +++ b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/void.png.mcmeta @@ -1,6 +1,6 @@ { "animation": { - "frametime": 2, + "frametime": 4, "frames": [ 0, 1,