From a53aa1bfd2752e9d1eccd64d1460292449dace25 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Tue, 16 Dec 2014 13:01:11 +0000 Subject: [PATCH] Rename mechanical blocks to technical blocks as per the lang file --- .../cricketcraft/chisel/init/ModBlocks.java | 30 +++++++++--------- .../resources/assets/chisel/lang/en_US.lang | 27 ++++++---------- .../cautiontape-ctm.png | Bin .../{mechanical => technical}/cautiontape.png | Bin .../fanFast-side.png | Bin .../fanFast-side.png.mcmeta | 0 .../{mechanical => technical}/fanFast-top.png | Bin .../fanStill-side.png | Bin .../fanStill-top.png | Bin .../industrialrelic.png | Bin .../blocks/{mechanical => technical}/old.png | Bin .../pipesLarge-ctm.png | Bin .../{mechanical => technical}/pipesLarge.png | Bin .../pipesSmall-ctm.png | Bin .../{mechanical => technical}/pipesSmall.png | Bin .../scaffold-ctm.png | Bin .../{mechanical => technical}/scaffold.png | Bin .../{mechanical => technical}/vent-ctm.png | Bin .../blocks/{mechanical => technical}/vent.png | Bin .../ventGlowing-ctm.png | Bin .../{mechanical => technical}/ventGlowing.png | Bin .../{mechanical => technical}/wires.png | Bin 22 files changed, 25 insertions(+), 32 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/cautiontape-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/cautiontape.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/fanFast-side.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/fanFast-side.png.mcmeta (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/fanFast-top.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/fanStill-side.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/fanStill-top.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/industrialrelic.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/old.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/pipesLarge-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/pipesLarge.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/pipesSmall-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/pipesSmall.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/scaffold-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/scaffold.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/vent-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/vent.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/ventGlowing-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/ventGlowing.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{mechanical => technical}/wires.png (100%) diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index cb78a03c..0dde4d65 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -81,7 +81,7 @@ public class ModBlocks { public static BlockSnakestone sandSnakestone; public static BlockSnakestoneObsidian obsidianSnakestone; public static BlockCarvable hexPlating; - public static BlockCarvable mechanical; + public static BlockCarvable technical; public static BlockCarvable bone; // 1.7 @@ -1485,20 +1485,20 @@ public class ModBlocks { Carving.chisel.registerOre("grimstone", "grimstone"); } - if(Configurations.featureEnabled("mechanical")){ - mechanical = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.0.desc"), 0, "mechanical/scaffold"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.1.desc"), 1, "mechanical/cautiontape"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.2.desc"), 2, "mechanical/industrialrelic"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.3.desc"), 3, "mechanical/pipesLarge"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.4.desc"), 4, "mechanical/fanFast"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.5.desc"), 5, "mechanical/pipesSmall"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.6.desc"), 6, "mechanical/fanStill"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.7.desc"), 7, "mechanical/vent"); // I need help making this thing accept the CTM :( - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.8.desc"), 8, "mechanical/ventGlowing"); - //mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.9.desc"), 9, "mechanical/vent2"); - mechanical.carverHelper.register(mechanical, "mechanical"); - Carving.chisel.registerOre("mechanical", "mechanical"); + if(Configurations.featureEnabled("technical")){ + technical = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.0.desc"), 0, "technical/scaffold"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.1.desc"), 1, "technical/cautiontape"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.2.desc"), 2, "technical/industrialrelic"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.3.desc"), 3, "technical/pipesLarge"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.4.desc"), 4, "technical/fanFast"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.5.desc"), 5, "technical/pipesSmall"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.6.desc"), 6, "technical/fanStill"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.7.desc"), 7, "technical/vent"); // I need help making this thing accept the CTM :( + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.8.desc"), 8, "technical/ventGlowing"); + //technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.9.desc"), 9, "technical/vent2"); + technical.carverHelper.register(technical, "technical"); + Carving.chisel.registerOre("technical", "technical"); } if(Configurations.featureEnabled("bone")) diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 863260b2..7ce05c7a 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -123,23 +123,16 @@ tile.grimstone.13.desc=Grimstone plate tile.grimstone.14.desc=Flaky Grimstone #Technical Block -tile.mechanical.name=Technical Block -tile.mechanical.0.desc=Scaffold -tile.mechanical.1.desc=Panels with Caution Tape -tile.mechanical.2.desc=An Old Relic from the land of Oneteufyv -tile.mechanical.3.desc=Under-Pipe (Large Pipe) -tile.mechanical.4.desc=Fan (Fast) -tile.mechanical.5.desc=Under-Pipe (Small Pipes) -tile.mechanical.6.desc=Fan (Off) -tile.mechanical.7.desc=Vents -tile.mechanical.8.desc=Glowing Vents -tile.mechanical.9.desc=Scaffold -tile.mechanical.10.desc=Scaffold -tile.mechanical.11.desc=Scaffold -tile.mechanical.12.desc=Scaffold -tile.mechanical.13.desc=Scaffold -tile.mechanical.14.desc=Scaffold -tile.mechanical.15.desc=Scaffold +tile.technical.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 +tile.technical.3.desc=Under-Pipe (Large Pipe) +tile.technical.4.desc=Fan (Fast) +tile.technical.5.desc=Under-Pipe (Small Pipes) +tile.technical.6.desc=Fan (Off) +tile.technical.7.desc=Vents +tile.technical.8.desc=Glowing Vents #Cloudbrick tile.cloudbrick.name=Cloudbrick diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/cautiontape-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/cautiontape-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/cautiontape-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/technical/cautiontape-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/cautiontape.png b/src/main/resources/assets/chisel/textures/blocks/technical/cautiontape.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/cautiontape.png rename to src/main/resources/assets/chisel/textures/blocks/technical/cautiontape.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanFast-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png rename to src/main/resources/assets/chisel/textures/blocks/technical/fanFast-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/fanFast-side.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/technical/fanFast-side.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanFast-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png rename to src/main/resources/assets/chisel/textures/blocks/technical/fanFast-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanStill-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-side.png rename to src/main/resources/assets/chisel/textures/blocks/technical/fanStill-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanStill-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-top.png rename to src/main/resources/assets/chisel/textures/blocks/technical/fanStill-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/industrialrelic.png b/src/main/resources/assets/chisel/textures/blocks/technical/industrialrelic.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/industrialrelic.png rename to src/main/resources/assets/chisel/textures/blocks/technical/industrialrelic.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/old.png b/src/main/resources/assets/chisel/textures/blocks/technical/old.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/old.png rename to src/main/resources/assets/chisel/textures/blocks/technical/old.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/pipesLarge-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/technical/pipesLarge-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge.png b/src/main/resources/assets/chisel/textures/blocks/technical/pipesLarge.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge.png rename to src/main/resources/assets/chisel/textures/blocks/technical/pipesLarge.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/pipesSmall-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/technical/pipesSmall-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall.png b/src/main/resources/assets/chisel/textures/blocks/technical/pipesSmall.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall.png rename to src/main/resources/assets/chisel/textures/blocks/technical/pipesSmall.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffold-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/technical/scaffold-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffold.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold.png rename to src/main/resources/assets/chisel/textures/blocks/technical/scaffold.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vent-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/vent-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/vent-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/technical/vent-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vent.png b/src/main/resources/assets/chisel/textures/blocks/technical/vent.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/vent.png rename to src/main/resources/assets/chisel/textures/blocks/technical/vent.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/ventGlowing-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/ventGlowing-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/ventGlowing-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/technical/ventGlowing-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/ventGlowing.png b/src/main/resources/assets/chisel/textures/blocks/technical/ventGlowing.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/ventGlowing.png rename to src/main/resources/assets/chisel/textures/blocks/technical/ventGlowing.png diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/wires.png b/src/main/resources/assets/chisel/textures/blocks/technical/wires.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/wires.png rename to src/main/resources/assets/chisel/textures/blocks/technical/wires.png