From 60981e3ee88e124a2ce66d663256df9a4c6385ce Mon Sep 17 00:00:00 2001 From: Drullkus Date: Sun, 22 Feb 2015 17:25:20 -0800 Subject: [PATCH 1/2] Add Hex Armor Plating --- .../java/com/cricketcraft/chisel/Features.java | 1 + src/main/resources/assets/chisel/lang/en_US.lang | 1 + .../blocks/technical/massiveHexPlating-v9.png | Bin 0 -> 4404 bytes 3 files changed, 2 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/massiveHexPlating-v9.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index aa1c469a..2c3cd394 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2257,6 +2257,7 @@ public enum Features { BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan"); + technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating"); technical2.carverHelper.registerAll(technical3, "technical3"); //Carving.chisel.registerOre("technical3", "technical"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 9513345a..5fb7ebbf 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -244,6 +244,7 @@ tile.technical.13.desc=Grate tile.technical.14.desc=Fan (Malfunctioning) tile.technical.15.desc=Rusty Grate tile.technical3.0.desc=I'm a big fan of this massive fan! +tile.technical3.1.desc=Industrial Armor Plating #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/massiveHexPlating-v9.png b/src/main/resources/assets/chisel/textures/blocks/technical/massiveHexPlating-v9.png new file mode 100644 index 0000000000000000000000000000000000000000..7a3329f8d4367f5d0035e01f9d1f69a7d2eaea86 GIT binary patch literal 4404 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 F{|}IYdK&-$ literal 0 HcmV?d00001 From 036c10c9c8897104be32f6d2cef68f242b5495ce Mon Sep 17 00:00:00 2001 From: Drullkus Date: Sun, 22 Feb 2015 18:34:42 -0800 Subject: [PATCH 2/2] Dehackify things --- .../java/com/cricketcraft/chisel/Features.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 2c3cd394..4cda79e8 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2252,23 +2252,14 @@ public enum Features { technical2.carverHelper.addVariation("tile.technical.4.desc", 1, "technical/fanFastTransparent"); technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent"); technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent"); - technical2.carverHelper.registerAll(technical2, "technical2"); - //Carving.chisel.registerOre("technical2", "technical"); + technical2.carverHelper.registerBlock(technical2, "technical2"); + technical2.carverHelper.registerVariations("technical", technical2); BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan"); technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating"); - technical2.carverHelper.registerAll(technical3, "technical3"); - //Carving.chisel.registerOre("technical3", "technical"); - - for (int i = 0; i < 4; i++) { - Carving.chisel.addVariation("technical", GameRegistry.findBlock("chisel", "technical2"), i, i); - } - - for (int i = 0; i < 1; i++) { - Carving.chisel.addVariation("technical", GameRegistry.findBlock("chisel", "technical3"), i, i); - } - + technical2.carverHelper.registerBlock(technical3, "technical3"); + technical2.carverHelper.registerVariations("technical", technical3); Carving.chisel.registerOre("technical", "technical"); }