diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index ae2c57e6..3c5652b7 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1341,7 +1341,10 @@ public class ModBlocks { //TODO: will be done at winter time present = (BlockPresent) new BlockPresent().setHardness(2.5F).setStepSound(Block.soundTypeWood); Carving.chisel.addVariation("chest", Blocks.chest, 0, 0); + present.carverHelper.addVariation(StatCollector.translateToLocal("tile.present.0.desc"), 0, present, 1); present.carverHelper.addVariation(StatCollector.translateToLocal("tile.present.1.desc"), 1, present, 1); + present.carverHelper.addVariation(StatCollector.translateToLocal("tile.present.2.desc"), 2, present, 1); + present.carverHelper.addVariation(StatCollector.translateToLocal("tile.present.3.desc"), 3, present, 1); present.carverHelper.register(present, "present"); Carving.chisel.registerOre("chest", "chest"); } @@ -1480,9 +1483,9 @@ public class ModBlocks { technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.9.desc"), 9, "technical/insulationv2"); 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.12.desc"), 12, "technical/rustyBoltedPlates"); 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.14.desc"), 14, "technical/fanMalfunction"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.15.desc"), 15, "technical/grateRusty"); technical.carverHelper.register(technical, "technical"); Carving.chisel.registerOre("technical", "technical"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 7fc59fdb..e653c3d4 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -142,8 +142,16 @@ tile.technical.10.desc=Gears and Flywheels tile.technical.11.desc=Cables tile.technical.12.desc=Rusty Panel tile.technical.13.desc=Grate -tile.technical.14.desc=Malfunctioning Fan (WIP) +tile.technical.14.desc=Fan (Malfunctioning) tile.technical.15.desc=Rusty Grate +tile.technical2.name=Transparent Technical Block + +#Present Chest +tile.present.name=Present Box +tile.present.0.desc=§cRed Present +tile.present.1.desc=§9Blue Present +tile.present.2.desc=§aGreen Present +tile.present.3.desc=§eYellow Present #Scorching tile.scorching.name=Scorching Block diff --git a/src/main/resources/assets/chisel/textures/blocks/present/giftboxBlue.png b/src/main/resources/assets/chisel/textures/blocks/present/giftboxBlue.png new file mode 100644 index 00000000..25d9ac4d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/present/giftboxBlue.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/present/giftboxGreen.png b/src/main/resources/assets/chisel/textures/blocks/present/giftboxGreen.png new file mode 100644 index 00000000..ea58b390 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/present/giftboxGreen.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/present/giftboxYellow.png b/src/main/resources/assets/chisel/textures/blocks/present/giftboxYellow.png new file mode 100644 index 00000000..27ebbe9a Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/present/giftboxYellow.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-side.png new file mode 100644 index 00000000..4f807d30 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-side.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-side.png.mcmeta new file mode 100644 index 00000000..840e55f7 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-side.png.mcmeta @@ -0,0 +1,31 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-top.png new file mode 100644 index 00000000..5838a689 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/fanMalfunction-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/rustyBoltedPlates-v9.png b/src/main/resources/assets/chisel/textures/blocks/technical/rustyBoltedPlates-v9.png new file mode 100644 index 00000000..2280b42e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/rustyBoltedPlates-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldTransparent-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldTransparent-ctm.png new file mode 100644 index 00000000..47a635ea Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldTransparent-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldTransparent.png b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldTransparent.png new file mode 100644 index 00000000..7ec5627b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/scaffoldTransparent.png differ