diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 0036ca11..2dc3b748 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2183,23 +2183,34 @@ public enum Features { technical.carverHelper.addVariation("tile.technical.13.desc", 13, "technical/grate"); technical.carverHelper.addVariation("tile.technical.14.desc", 14, "technical/malfunctionFan"); technical.carverHelper.addVariation("tile.technical.15.desc", 15, "technical/grateRusty"); - technical.carverHelper.registerAll(technical, "technical"); + technical.carverHelper.registerAll(technical, "technical"); BlockCarvableGlass technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F); technical2.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffoldTransparent", 20); technical2.carverHelper.addVariation("tile.technical.4.desc", 1, "technical/fanFastTransparent", 21); technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent", 22); technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent", 23); - technical2.carverHelper.registerBlock(technical2, "technical2"); - technical2.carverHelper.registerVariations("technical"); + technical2.carverHelper.registerBlock(technical2, "technical2"); + technical2.carverHelper.registerVariations("technical"); - 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", 40); - technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); - technical3.carverHelper.registerBlock(technical3, "technical3"); - technical3.carverHelper.registerVariations("technical"); + BlockCarvable technicalLarge = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + technicalLarge.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan", 40); + technicalLarge.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); + technicalLarge.carverHelper.registerBlock(technicalLarge, "technical3"); + technicalLarge.carverHelper.registerVariations("technical"); - Carving.chisel.registerOre("technical", "technical"); + BlockCarvable technical4 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + technical4.carverHelper.addVariation("tile.technical4.0.desc", 0, "technical/new/weatheredGreenPanels"); + technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); + technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); + technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); + technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"); + technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); + technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); + technical4.carverHelper.registerBlock(technical4, "technical4"); + technical4.carverHelper.registerVariations("technical"); + + Carving.chisel.registerOre("technical", "technical"); } @Override diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index f7300f95..6991f882 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -329,6 +329,7 @@ tile.grimstone.14.desc=Flaky Grimstone tile.chisel.technical.name=Technical Block tile.chisel.technical2.name=Transparent Technical Block tile.chisel.technical3.name=Industrial Technical Block +tile.chisel.technical4.name=Technical Block tile.technical.0.desc=Scaffold tile.technical.1.desc=Panels with Caution Tape tile.technical.2.desc=An Old Relic from the land of Oneteufyv @@ -347,6 +348,13 @@ 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 +tile.technical4.0.desc=Corroded Metal Chunks +tile.technical4.1.desc=Rusted Metal Chunks +tile.technical4.2.desc=Sturdy +tile.technical4.3.desc=MegaCell© +tile.technical4.4.desc=Thermal Exhaust Plating +tile.technical4.5.desc=Makeshift Plating +tile.technical4.6.desc=Tape Drive? (I'm too young for this.) #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png rename to src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta new file mode 100644 index 00000000..4bfd9101 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frames": [ + 0, + 4, + 5, + 6, + 7, + 4, + 5, + 6, + 7, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png new file mode 100644 index 00000000..0c72813f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta new file mode 100644 index 00000000..143d4db3 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta @@ -0,0 +1,117 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 4, + 5, + 6, + 7, + 4, + 5, + 6, + 7, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 4, + 5, + 2, + 2, + 2, + 11, + 8, + 9, + 10, + 11, + 8, + 9, + 10, + 19, + 17, + 19, + 17, + 19, + 17, + 19, + 17, + 19, + 17, + 11, + 8, + 1, + 1, + 1, + 6, + 7, + 4, + 5, + 6, + 7, + 4, + 13, + 15, + 13, + 15, + 13, + 15, + 13, + 15, + 13, + 15, + 13, + 15, + 5, + 6, + 7, + 4, + 5, + 6, + 3, + 3, + 3, + 8, + 9, + 10 + 11, + 8, + 9, + 10, + 11, + 8, + 9, + 18, + 16, + 18, + 16, + 18, + 16, + 18, + 16, + 18, + 16, + 18, + 8, + 9, + 10, + 11, + 8, + 9, + 10, + 11, + ] + } +} \ No newline at end of file