From a419189926d15db8a3c68223d6e2dde84e4f200c Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 8 Dec 2017 16:43:04 +0300 Subject: [PATCH] Added dust->ingot<->block recipes for several materials. Closes #1356 --- .../java/techreborn/blocks/BlockStorage.java | 2 +- .../init/recipes/CraftingTableRecipes.java | 16 ++++++++-------- .../techreborn/init/recipes/SmeltingRecipes.java | 6 ++++++ .../assets/techreborn/blockstates/storage.json | 5 +++++ .../resources/assets/techreborn/lang/en_us.lang | 1 + 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index bf3fdd25d..f252f3b5c 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -50,7 +50,7 @@ import java.util.Random; public class BlockStorage extends BaseBlock { public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass", - "lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" }; + "lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium", "bronze" }; public static final PropertyString TYPE = new PropertyString("type", types); private static final List typesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 28cff0833..f46130362 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -295,22 +295,22 @@ public class CraftingTableRecipes extends RecipeMethods { static void registerCompressionRecipes() { for (String name : BlockStorage.types) { if (OreUtil.hasIngot(name)) { - registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', - "ingot" + StringUtils.toFirstCapital(name)); + registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(name)); + registerShapeless(getMaterial(name, 9, Type.INGOT), BlockStorage.getStorageBlockByName(name)); } else if (OreUtil.hasGem(name)) { - registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', - "gem" + StringUtils.toFirstCapital(name)); + registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(name)); + registerShapeless(getMaterial(name, 9, Type.GEM), BlockStorage.getStorageBlockByName(name)); } } for (String block : BlockStorage2.types){ block = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, block); if (OreUtil.hasIngot(block)) { - registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', - "ingot" + StringUtils.toFirstCapital(block)); + registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "ingot" + StringUtils.toFirstCapital(block)); + registerShapeless(getMaterial(block, 9, Type.INGOT), BlockStorage2.getStorageBlockByName(block)); } else if (OreUtil.hasGem(block)) { - registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', - "gem" + StringUtils.toFirstCapital(block)); + registerShaped(BlockStorage2.getStorageBlockByName(block), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(block)); + registerShapeless(getMaterial(block, 9, Type.GEM), BlockStorage2.getStorageBlockByName(block)); } } diff --git a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java index 51c7c92d7..7f2898ab2 100644 --- a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java +++ b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java @@ -59,6 +59,12 @@ public class SmeltingRecipes extends RecipeMethods { register(getMaterial("nickel", Type.DUST), getMaterial("nickel", Type.INGOT)); register(getMaterial("platinum", Type.DUST), getMaterial("platinum", Type.INGOT)); register(getMaterial("zinc", Type.DUST), getMaterial("zinc", Type.INGOT)); + register(getMaterial("brass", Type.DUST), getMaterial("brass", Type.INGOT)); + register(getMaterial("electrum", Type.DUST), getMaterial("electrum", Type.INGOT)); + register(getMaterial("invar", Type.DUST), getMaterial("invar", Type.INGOT)); + + + } static void register(ItemStack input, ItemStack output) { diff --git a/src/main/resources/assets/techreborn/blockstates/storage.json b/src/main/resources/assets/techreborn/blockstates/storage.json index b8c26dfd1..3214f0a32 100644 --- a/src/main/resources/assets/techreborn/blockstates/storage.json +++ b/src/main/resources/assets/techreborn/blockstates/storage.json @@ -134,6 +134,11 @@ "textures": { "all": "techreborn:blocks/storage/refinediron_block" } + }, + "bronze": { + "textures": { + "all": "techreborn:blocks/storage/bronze_block" + } } } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index ab76092f8..e5187da17 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -127,6 +127,7 @@ tile.techreborn:storage.nickel.name=Block of Nickel tile.techreborn:storage.invar.name=Block of Invar tile.techreborn:storage.osmium.name=Block of Osmium tile.techreborn:storage.iridium.name=Block of Iridium +tile.techreborn:storage.bronze.name=Block of Bronze tile.techreborn:storage2.tungstensteel.name=Block of Tungstensteel tile.techreborn:storage2.lodestone.name=Block of Lodestone tile.techreborn:storage2.tellurium.name=Block of Tellurium