diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index b329bb69..f239ed12 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1490,12 +1490,12 @@ public class ModBlocks { 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/wires"); + 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/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"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.8.desc"), 8, "mechanical/vent-glow"); + mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.7.desc"), 7, "mechanical/vents"); // I need help making this thing accept the CTM :( + mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.8.desc"), 8, "mechanical/ventsglowing"); //mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.9.desc"), 9, "mechanical/vent2"); mechanical.carverHelper.register(mechanical, "mechanical"); Carving.chisel.registerOre("mechanical", "mechanical"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 5f7e09e6..55a5d2a9 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -127,12 +127,12 @@ 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=Tangled Wires +tile.mechanical.3.desc=Under-Pipe (Large Pipe) tile.mechanical.4.desc=Fan (Fast) -tile.mechanical.5.desc=Fan (Slow) +tile.mechanical.5.desc=Under-Pipe (Small Pipes) tile.mechanical.6.desc=Fan (Off) -tile.mechanical.7.desc=Vent -tile.mechanical.8.desc=Vent with lights +tile.mechanical.7.desc=Vents (CTM Broken) +tile.mechanical.8.desc=Glowing Vents (CTM Broken) tile.mechanical.9.desc=Scaffold tile.mechanical.10.desc=Scaffold tile.mechanical.11.desc=Scaffold diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fan.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/fan.png deleted file mode 100644 index 13fe1e98..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/mechanical/fan.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge-ctm.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge-ctm.png new file mode 100644 index 00000000..aca7fecb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge.png new file mode 100644 index 00000000..902e7005 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesLarge.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall-ctm.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall-ctm.png new file mode 100644 index 00000000..907113ee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall.png new file mode 100644 index 00000000..11914147 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/pipesSmall.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vent.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/vent.png deleted file mode 100644 index 95c24a33..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/mechanical/vent.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-ctm.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-ctm.png new file mode 100644 index 00000000..0ff339b7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-side-ctm.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-side-ctm.png new file mode 100644 index 00000000..0ff339b7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-side-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-side.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-side.png new file mode 100644 index 00000000..9b3dea09 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-top.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-top.png new file mode 100644 index 00000000..579be0da Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/vents-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-ctm-side.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-ctm-side.png new file mode 100644 index 00000000..2c9ba1da Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-ctm-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-side.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-side.png new file mode 100644 index 00000000..06b58f48 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-top.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-top.png new file mode 100644 index 00000000..579be0da Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/ventsglowing-top.png differ