diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index f924f118..786488bf 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -82,6 +82,7 @@ public class ModBlocks { public static BlockSnakestoneObsidian obsidianSnakestone; public static BlockCarvable hexPlating; public static BlockCarvable technical; + //public static BlockCarvableGlass technical2; public static BlockCarvable bone; public static BlockCarvable scorching; public static BlockCarvable brickCustom; @@ -1479,8 +1480,22 @@ public class ModBlocks { technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.9.desc"), 9, "technical/insulation"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.10.desc"), 10, "technical/spinningStuffAnim"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.11.desc"), 11, "technical/cables"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.12.desc"), 12, "technical/rustyCover"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.13.desc"), 13, "technical/grate"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.14.desc"), 14, "technical/fanStill"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.15.desc"), 15, "technical/grateRusty"); technical.carverHelper.register(technical, "technical"); Carving.chisel.registerOre("technical", "technical"); + + //Crash :/ + + /*technical2 = (BlockCarvableGlass) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.0.desc"), 0, "technical/scaffoldTransparent"); + technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.4.desc"), 1, "technical/fanFastTransparent"); + technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.6.desc"), 2, "technical/fanStillTransparent"); + technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.14.desc"), 3, "technical/fanStillTransparent"); + technical2.carverHelper.register(technical2, "technical2"); + Carving.chisel.registerOre("technical2", "technical2");*/ } 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 37a007e3..7fc59fdb 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -140,10 +140,10 @@ tile.technical.8.desc=Glowing Vents tile.technical.9.desc=Insulation tile.technical.10.desc=Gears and Flywheels tile.technical.11.desc=Cables -tile.technical.12.desc=Broken Panels on Scaffolds +tile.technical.12.desc=Rusty Panel tile.technical.13.desc=Grate -tile.technical.14.desc=Malfunctioning Fan -tile.technical.15.desc=Glowing Grate +tile.technical.14.desc=Malfunctioning Fan (WIP) +tile.technical.15.desc=Rusty Grate #Scorching tile.scorching.name=Scorching Block diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-side.png new file mode 100644 index 00000000..3350dca8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-side.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-side.png.mcmeta new file mode 100644 index 00000000..ac2e1892 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-side.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/technical/fanFastTransparent-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-top.png new file mode 100644 index 00000000..5838a689 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/fanFastTransparent-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanStillTransparent-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanStillTransparent-side.png new file mode 100644 index 00000000..00552f7d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/fanStillTransparent-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanStillTransparent-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanStillTransparent-top.png new file mode 100644 index 00000000..5838a689 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/fanStillTransparent-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/grate-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/grate-ctm.png new file mode 100644 index 00000000..908f782f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/grate-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/grate.png b/src/main/resources/assets/chisel/textures/blocks/technical/grate.png new file mode 100644 index 00000000..ada496e5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/grate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/grateRusty-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/grateRusty-ctm.png new file mode 100644 index 00000000..ea60f94e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/grateRusty-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/grateRusty.png b/src/main/resources/assets/chisel/textures/blocks/technical/grateRusty.png new file mode 100644 index 00000000..08196bed Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/grateRusty.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/rustyCover.png b/src/main/resources/assets/chisel/textures/blocks/technical/rustyCover.png new file mode 100644 index 00000000..6a155497 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/rustyCover.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent-ctm.png new file mode 100644 index 00000000..47a635ea Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent.png new file mode 100644 index 00000000..7ec5627b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldsTransparent.png differ