diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index a9afef52..8dd4a8f0 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -775,7 +775,15 @@ public enum Features { futura.carverHelper.addVariation("tile.futura.2.desc", 2, "futura/WIP/controllerWIP"); futura.carverHelper.addVariation("tile.futura.3.desc", 3, "futura/WIP/wavyWIP"); futura.carverHelper.registerAll(futura, "futura"); - Carving.chisel.registerOre("futura", "futura"); + + BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + for (int i = 0; i < 16; i++) { + circuits.carverHelper.addVariation("tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", i, "futura/circuitPlate"); + } + + circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); + circuits.carverHelper.registerVariations("futura", circuits); + Carving.chisel.registerOre("futura", "futura"); } @Override @@ -1020,14 +1028,14 @@ public enum Features { @Override void addBlocks() { - BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("hexPlating/hexAnim").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/shroud").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); } hexPlating.carverHelper.registerAll(hexPlating, "hexPlating"); Carving.chisel.registerOre("hexPlating", "hexPlating"); - BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("hexPlating/hexAnim").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/shroud").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index e907c22e..67f0fc54 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -224,10 +224,27 @@ tile.bloodRune.5.desc=Blood Rune Tiles #Futura tile.chisel.futura.name=Futura Block +tile.chisel.futuraCircuit.name=Futura Circuit tile.futura.0.desc=Glowing Screen with Metallic Borders tile.futura.1.desc=Glowing Screen with Cyan Borders tile.futura.2.desc=Applied Labyrinthic Neon Lines tile.futura.3.desc=Poptart Rainbow +tile.futuraCircuit.black.desc=Black +tile.futuraCircuit.blue.desc=Blue +tile.futuraCircuit.brown.desc=Brown +tile.futuraCircuit.cyan.desc=Cyan +tile.futuraCircuit.green.desc=Green +tile.futuraCircuit.light_blue.desc=Light Blue +tile.futuraCircuit.silver.desc=Light Gray +tile.futuraCircuit.lime.desc=Lime +tile.futuraCircuit.magenta.desc=Magenta +tile.futuraCircuit.orange.desc=Orange +tile.futuraCircuit.pink.desc=Pink +tile.futuraCircuit.purple.desc=Purple +tile.futuraCircuit.red.desc=Red +tile.futuraCircuit.white.desc=White +tile.futuraCircuit.yellow.desc=Yellow +tile.futuraCircuit.gray.desc=Gray #Waterstone tile.chisel.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/circuitPlate-v9.png b/src/main/resources/assets/chisel/textures/blocks/futura/circuitPlate-v9.png new file mode 100644 index 00000000..72177cc9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/futura/circuitPlate-v9.png differ