diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index d239a351e..4c32c83dc 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2050,6 +2050,7 @@ void addBlocks() { } Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); + iron_block.carverHelper.addVariation("tile.iron.0.desc", 0, "iron/terrain-iron-rusted"); iron_block.carverHelper.addVariation("tile.iron.1.desc", 1, "iron/terrain-iron-largeingot"); iron_block.carverHelper.addVariation("tile.iron.2.desc", 2, "iron/terrain-iron-smallingot"); iron_block.carverHelper.addVariation("tile.iron.3.desc", 3, "iron/terrain-iron-gears"); @@ -3810,6 +3811,12 @@ void addBlocks() { 7, "technical/new/concrete/concreteBlocks", new SubmapManagerCombinedCTM(9, "technical/new/concrete/concreteBlocks", TextureType.R9)); + technical4.carverHelper.addVariation("tile.technical4.8.desc", 8, "technical/new/cinderblock", 42); + technical4.carverHelper.addVariation("tile.technical4.9.desc", 9, "technical/new/polishedcinderblock", 43); + technical4.carverHelper.addVariation("tile.technical4.10.desc", 10, "technical/new/cinderbrick", 44); + technical4.carverHelper.addVariation("tile.technical4.11.desc", 11, "technical/new/cardboardbox", 45); + technical4.carverHelper.addVariation("tile.technical4.12.desc", 12, "technical/new/foldedcardboard", 46); + technical4.carverHelper.addVariation("tile.technical4.13.desc", 13, "technical/new/cardboardscrap", 47); // The animation is malfunctioning. :( // technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); @@ -4536,6 +4543,76 @@ void addRecipes() { 'B', new ItemStack(Items.slime_ball, 1)); } + }, + + LANTERN { + + @Override + void addBlocks() { + BlockCarvable lantern = (BlockCarvable) new BlockCarvable().setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1F) + .setLightLevel(1.0F) + .setStepSound(Block.soundTypeGlass); + + lantern.carverHelper.addVariation("tile.lantern.0.desc", 0, "lantern/lantern"); + lantern.carverHelper.addVariation("tile.lantern.1.desc", 1, "lantern/glowlantern"); + lantern.carverHelper.addVariation("tile.lantern.2.desc", 2, "lantern/redlantern"); + lantern.carverHelper.addVariation("tile.lantern.3.desc", 3, "lantern/soullantern"); + lantern.carverHelper.addVariation("tile.lantern.4.desc", 4, "lantern/cursedlantern"); + lantern.carverHelper.addVariation("tile.lantern.5.desc", 5, "lantern/endlantern"); + + lantern.carverHelper.registerAll(lantern, "lantern"); + } + + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.lantern, 1, 0), + "gig", + "iGi", + "gig", + 'i', + new ItemStack(Items.iron_ingot, 1, 0), + 'G', + new ItemStack(Blocks.glowstone, 1), + 'g', + new ItemStack(Items.glowstone_dust, 1)); + } + }, + + SHEETMETAL { + + @Override + void addBlocks() { + BlockCarvable sheetmetal = (BlockCarvable) new BlockCarvable() + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1F) + .setStepSound(Block.soundTypeMetal); + + sheetmetal.carverHelper.addVariation("tile.sheetmetal.0.desc", 0, "sheetmetal/walling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.1.desc", 1, "sheetmetal/siding"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.2.desc", 2, "sheetmetal/paneling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.3.desc", 3, "sheetmetal/plating"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.4.desc", 4, "sheetmetal/treading"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.5.desc", 5, "sheetmetal/rustywalling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.6.desc", 6, "sheetmetal/rustysiding"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.7.desc", 7, "sheetmetal/rustypaneling"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.8.desc", 8, "sheetmetal/rustyplating"); + sheetmetal.carverHelper.addVariation("tile.sheetmetal.9.desc", 9, "sheetmetal/rustytreading"); + + sheetmetal.carverHelper.registerAll(sheetmetal, "sheetmetal"); + } + + @Override + void addRecipes() { + GameRegistry.addRecipe( + new ItemStack(ChiselBlocks.sheetmetal, 32, 0), + "iii", + " ", + "iii", + 'i', + new ItemStack(Items.iron_ingot, 1, 0)); + } }; private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index 46ed4e761..03289fb0e 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -173,5 +173,9 @@ public final class ChiselBlocks { // 1.19, skipped 10 versions but thats fine public static final BlockCarvable froglight = null; + // Backports from Dustrial Decor. Original artists are WDSPC and Evo_94! + public static final BlockCarvable lantern = null; + public static final BlockCarvable sheetmetal = null; + private ChiselBlocks() {} } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 600f0d684..73e0c7eba 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -881,6 +881,12 @@ tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Pipe Dream tile.technical4.7.desc=Worn Concrete +tile.technical4.8.desc=Cinder Block +tile.technical4.9.desc=Cinder Block (Polished) +tile.technical4.10.desc=Cinder Brick +tile.technical4.11.desc=Cardboard Box +tile.technical4.12.desc=Folded Cardboard +tile.technical4.13.desc=Cardboard Scrap tile.technical4.16.desc=Tape Drive? (I'm too young for this.) #End Stone @@ -1297,6 +1303,7 @@ tile.roadLine.4.desc=Hazard Tape #Iron Blocks tile.chisel.iron_block.name=Iron Block +tile.iron.0.desc=Rusted Block tile.iron.1.desc=Large Iron Ingots tile.iron.2.desc=Small Iron Ingots tile.iron.3.desc=Iron Gears @@ -2698,5 +2705,27 @@ tile.froglight.7.desc=Orundum tile.froglight.8.desc=Blood-Stained tile.froglight.9.desc=Ichor +#Lanterns +tile.chisel.lantern.name=Lantern +tile.lantern.0.desc=Simple +tile.lantern.1.desc=Glow +tile.lantern.2.desc=Redstone +tile.lantern.3.desc=Soul +tile.lantern.4.desc=Cursed +tile.lantern.5.desc=Ender + +#Sheetmetal +tile.chisel.sheetmetal.name=Sheetmetal +tile.sheetmetal.0.desc=Walling +tile.sheetmetal.1.desc=Siding +tile.sheetmetal.2.desc=Paneling +tile.sheetmetal.3.desc=Plating +tile.sheetmetal.4.desc=Treading +tile.sheetmetal.5.desc=Walling (Rusty) +tile.sheetmetal.6.desc=Siding (Rusty) +tile.sheetmetal.7.desc=Paneling (Rusty) +tile.sheetmetal.8.desc=Plating (Rusty) +tile.sheetmetal.9.desc=Treading (Rusty) + tile.chisel.amber.name=Block of Amber tile.chisel.bloodBrick.name=Bloodstone Brick diff --git a/src/main/resources/assets/chisel/textures/blocks/iron/terrain-iron-rusted.png b/src/main/resources/assets/chisel/textures/blocks/iron/terrain-iron-rusted.png new file mode 100644 index 000000000..232cca0e1 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/iron/terrain-iron-rusted.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-bottom.png new file mode 100644 index 000000000..b72d2c6ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-side.png new file mode 100644 index 000000000..e7ee0e78e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-top.png new file mode 100644 index 000000000..2929ab706 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/cursedlantern-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-bottom.png new file mode 100644 index 000000000..b72d2c6ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-side.png new file mode 100644 index 000000000..555949616 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-top.png new file mode 100644 index 000000000..4de46024e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/endlantern-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-bottom.png new file mode 100644 index 000000000..b72d2c6ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-side.png new file mode 100644 index 000000000..e3a4b0403 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-top.png new file mode 100644 index 000000000..8b71e9277 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/glowlantern-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-bottom.png new file mode 100644 index 000000000..b72d2c6ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-side.png new file mode 100644 index 000000000..6f63942e9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-top.png new file mode 100644 index 000000000..34692725e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/lantern-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-bottom.png new file mode 100644 index 000000000..b72d2c6ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-side.png new file mode 100644 index 000000000..4e1eb2091 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-top.png new file mode 100644 index 000000000..230b952bc Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/redlantern-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-bottom.png b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-bottom.png new file mode 100644 index 000000000..b72d2c6ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-side.png b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-side.png new file mode 100644 index 000000000..f6ee6b4f7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-top.png b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-top.png new file mode 100644 index 000000000..c41e0111b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/lantern/soullantern-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/paneling.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/paneling.png new file mode 100644 index 000000000..e13b1aef2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/paneling.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/plating.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/plating.png new file mode 100644 index 000000000..758701733 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/plating.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustypaneling.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustypaneling.png new file mode 100644 index 000000000..033a865d9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustypaneling.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustyplating.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustyplating.png new file mode 100644 index 000000000..d2aafbb3b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustyplating.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustysiding.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustysiding.png new file mode 100644 index 000000000..348e95d11 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustysiding.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustytreading.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustytreading.png new file mode 100644 index 000000000..fa4ab349c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustytreading.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustywalling.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustywalling.png new file mode 100644 index 000000000..8a7e82551 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/rustywalling.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/siding.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/siding.png new file mode 100644 index 000000000..5d20d3a7d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/siding.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/treading.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/treading.png new file mode 100644 index 000000000..aac24aceb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/treading.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sheetmetal/walling.png b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/walling.png new file mode 100644 index 000000000..71cff6f7d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/sheetmetal/walling.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-bottom.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-bottom.png new file mode 100644 index 000000000..58e578bf2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-bottom.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-side.png new file mode 100644 index 000000000..58e578bf2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-top.png new file mode 100644 index 000000000..295f83d99 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardbox-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardscrap.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardscrap.png new file mode 100644 index 000000000..46e66e0fb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cardboardscrap.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-side.png new file mode 100644 index 000000000..7420402d8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-top.png new file mode 100644 index 000000000..76089d842 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderblock-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderbrick.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderbrick.png new file mode 100644 index 000000000..df29b5239 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/cinderbrick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/foldedcardboard.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/foldedcardboard.png new file mode 100644 index 000000000..da48d21be Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/foldedcardboard.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-side.png new file mode 100644 index 000000000..b16e4e388 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-top.png new file mode 100644 index 000000000..6f20fd3ea Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/polishedcinderblock-top.png differ