diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 9bfebde4..02632d84 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1488,17 +1488,18 @@ public class ModBlocks { 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/relic"); + 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.4.desc"), 4, "mechanical/fan"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.5.desc"), 5, "mechanical/vent"); - mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.6.desc"), 6, "mechanical/vent-glow"); - //mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.7.desc"), 7, "mechanical/hex"); - //mechanical.carverHelper.addVariation(StatCollector.translateToLocal("tile.mechanical.8.desc"), 8, "mechanical/gear"); + 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.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.9.desc"), 9, "mechanical/vent2"); mechanical.carverHelper.register(mechanical, "mechanical"); Carving.chisel.registerOre("mechanical", "mechanical"); } + if(Configurations.featureEnabled("bone")) { bone = (BlockCarvable) new BlockCarvable(Material.rock); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6da08b56..5f7e09e6 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -122,18 +122,18 @@ tile.grimstone.12.desc=Smooth Grimstone Plate tile.grimstone.13.desc=Grimstone plate tile.grimstone.14.desc=Flaky Grimstone -#Mechanical Block -tile.mechanical.name=Mechanical Block +#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 elves of Alfheim +tile.mechanical.2.desc=An Old Relic from the land of Oneteufyv tile.mechanical.3.desc=Tangled Wires -tile.mechanical.4.desc=Fan -tile.mechanical.5.desc=Vent -tile.mechanical.6.desc=Glowing Vent -tile.mechanical.7.desc=Hex Patterned Panel -tile.mechanical.8.desc=Gear -tile.mechanical.9.desc=Alternate Vent +tile.mechanical.4.desc=Fan (Fast) +tile.mechanical.5.desc=Fan (Slow) +tile.mechanical.6.desc=Fan (Off) +tile.mechanical.7.desc=Vent +tile.mechanical.8.desc=Vent with lights +tile.mechanical.9.desc=Scaffold tile.mechanical.10.desc=Scaffold tile.mechanical.11.desc=Scaffold tile.mechanical.12.desc=Scaffold diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png new file mode 100644 index 00000000..662fdac5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png new file mode 100644 index 00000000..5838a689 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png.mcmeta new file mode 100644 index 00000000..ac2e1892 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanFast-top.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-side.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-side.png new file mode 100644 index 00000000..caf083eb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-top.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-top.png new file mode 100644 index 00000000..5838a689 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/mechanical/fanStill-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/relic.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/industrialrelic.png similarity index 79% rename from src/main/resources/assets/chisel/textures/blocks/mechanical/relic.png rename to src/main/resources/assets/chisel/textures/blocks/mechanical/industrialrelic.png index 37d1ab30..d6455c0c 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/mechanical/relic.png and b/src/main/resources/assets/chisel/textures/blocks/mechanical/industrialrelic.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold-ctm.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold-ctm.png index 1d60ac07..5d93d61f 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold-ctm.png and b/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold.png b/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold.png index e571ec4c..31e2819c 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold.png and b/src/main/resources/assets/chisel/textures/blocks/mechanical/scaffold.png differ