From 56b8b346f0d4d8d11ba0f50766aaa87f2f78bf3b Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Thu, 5 Jan 2017 13:16:51 -0800 Subject: [PATCH] The Great Refactor of 2017 - make things more abstract --- .../init/recipes/ExtractorRecipes.java | 46 +-- .../recipes/ImplosionCompressorRecipes.java | 6 +- .../recipes/IndustrialCentrifugeRecipes.java | 92 +++--- .../IndustrialElectrolyzerRecipes.java | 8 +- .../recipes/IndustrialGrinderRecipes.java | 14 +- .../init/recipes/RollingMachineRecipes.java | 22 +- .../init/recipes/ScrapboxRecipes.java | 272 +++++++++--------- .../init/recipes/SmeltingRecipes.java | 6 +- 8 files changed, 233 insertions(+), 233 deletions(-) diff --git a/src/main/java/techreborn/init/recipes/ExtractorRecipes.java b/src/main/java/techreborn/init/recipes/ExtractorRecipes.java index 58d8f4648..e76a86896 100644 --- a/src/main/java/techreborn/init/recipes/ExtractorRecipes.java +++ b/src/main/java/techreborn/init/recipes/ExtractorRecipes.java @@ -15,31 +15,31 @@ import techreborn.items.DynamicCell; */ public class ExtractorRecipes extends RecipeMethods { public static void init() { - register(new ItemStack(ModBlocks.RUBBER_SAPLING), false, getMaterial("rubber", Type.PART)); - register(new ItemStack(ModBlocks.RUBBER_LOG), false, getMaterial("rubber", Type.PART)); - register(new ItemStack(Items.SLIME_BALL), getMaterial("rubber", 2, Type.PART)); + register(getStack(ModBlocks.RUBBER_SAPLING), false, getMaterial("rubber", Type.PART)); + register(getStack(ModBlocks.RUBBER_LOG), false, getMaterial("rubber", Type.PART)); + register(getStack(Items.SLIME_BALL), getMaterial("rubber", 2, Type.PART)); register(getMaterial("sap", Type.PART), getMaterial("rubber", 3, Type.PART)); - register(new ItemStack(Blocks.RED_FLOWER), new ItemStack(Items.DYE, 2, 1)); - register(new ItemStack(Blocks.YELLOW_FLOWER), new ItemStack(Items.DYE, 2, 11)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 1), new ItemStack(Items.DYE, 2, 12)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 2), new ItemStack(Items.DYE, 2, 13)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 3), new ItemStack(Items.DYE, 2, 7)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 4), new ItemStack(Items.DYE, 2, 1)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 5), new ItemStack(Items.DYE, 2, 14)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 6), new ItemStack(Items.DYE, 2, 7)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 7), new ItemStack(Items.DYE, 2, 9)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 8), new ItemStack(Items.DYE, 2, 7)); - register(new ItemStack(Blocks.DOUBLE_PLANT), new ItemStack(Items.DYE, 4, 11)); - register(new ItemStack(Blocks.DOUBLE_PLANT, 1, 1), new ItemStack(Items.DYE, 4, 13)); - register(new ItemStack(Blocks.DOUBLE_PLANT, 1, 4), new ItemStack(Items.DYE, 4, 1)); - register(new ItemStack(Blocks.DOUBLE_PLANT, 1, 5), new ItemStack(Items.DYE, 4, 9)); - register(new ItemStack(Blocks.TALLGRASS, 1, 1), new ItemStack(Items.WHEAT_SEEDS)); - register(new ItemStack(Blocks.TALLGRASS, 1, 2), new ItemStack(Items.WHEAT_SEEDS)); - register(new ItemStack(Blocks.DOUBLE_PLANT, 1, 2), new ItemStack(Items.WHEAT_SEEDS, 2)); - register(new ItemStack(Blocks.DOUBLE_PLANT, 1, 3), new ItemStack(Items.WHEAT_SEEDS, 2)); - register(new ItemStack(Blocks.DEADBUSH, 1, 0), new ItemStack(Items.STICK)); + register(getStack(Blocks.RED_FLOWER), getStack(Items.DYE, 2, 1)); + register(getStack(Blocks.YELLOW_FLOWER), getStack(Items.DYE, 2, 11)); + register(getStack(Blocks.RED_FLOWER, 1, 1), getStack(Items.DYE, 2, 12)); + register(getStack(Blocks.RED_FLOWER, 1, 2), getStack(Items.DYE, 2, 13)); + register(getStack(Blocks.RED_FLOWER, 1, 3), getStack(Items.DYE, 2, 7)); + register(getStack(Blocks.RED_FLOWER, 1, 4), getStack(Items.DYE, 2, 1)); + register(getStack(Blocks.RED_FLOWER, 1, 5), getStack(Items.DYE, 2, 14)); + register(getStack(Blocks.RED_FLOWER, 1, 6), getStack(Items.DYE, 2, 7)); + register(getStack(Blocks.RED_FLOWER, 1, 7), getStack(Items.DYE, 2, 9)); + register(getStack(Blocks.RED_FLOWER, 1, 8), getStack(Items.DYE, 2, 7)); + register(getStack(Blocks.DOUBLE_PLANT), getStack(Items.DYE, 4, 11)); + register(getStack(Blocks.DOUBLE_PLANT, 1, 1), getStack(Items.DYE, 4, 13)); + register(getStack(Blocks.DOUBLE_PLANT, 1, 4), getStack(Items.DYE, 4, 1)); + register(getStack(Blocks.DOUBLE_PLANT, 1, 5), getStack(Items.DYE, 4, 9)); + register(getStack(Blocks.TALLGRASS, 1, 1), getStack(Items.WHEAT_SEEDS)); + register(getStack(Blocks.TALLGRASS, 1, 2), getStack(Items.WHEAT_SEEDS)); + register(getStack(Blocks.DOUBLE_PLANT, 1, 2), getStack(Items.WHEAT_SEEDS, 2)); + register(getStack(Blocks.DOUBLE_PLANT, 1, 3), getStack(Items.WHEAT_SEEDS, 2)); + register(getStack(Blocks.DEADBUSH, 1, 0), getStack(Items.STICK)); for (int i = 1; i < 15; i++) - register(new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Blocks.WOOL, 1, 0)); + register(getStack(Blocks.WOOL, 1, i), getStack(Blocks.WOOL, 1, 0)); for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { register(DynamicCell.getCellWithFluid(fluid), DynamicCell.getEmptyCell(1)); } diff --git a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java index eb9884b25..35ff1f522 100644 --- a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java @@ -14,8 +14,8 @@ import java.security.InvalidParameterException; public class ImplosionCompressorRecipes extends RecipeMethods { public static void init() { register(getOre("ingotIridiumAlloy"), getMaterial("iridium", Type.PLATE), 4); - register(getOre("dustDiamond", 4), new ItemStack(Items.DIAMOND, 3), 16); - register(getOre("dustEmerald", 4), new ItemStack(Items.EMERALD, 3), 12); + register(getOre("dustDiamond", 4), getStack(Items.DIAMOND, 3), 16); + register(getOre("dustEmerald", 4), getStack(Items.EMERALD, 3), 12); register(getOre("dustRuby", 4), getMaterial("ruby", 3, Type.GEM), 12); register(getOre("dustSapphire", 4), getMaterial("sapphire", 3, Type.GEM), 12); register(getOre("dustPeridot", 4), getMaterial("peridot", 3, Type.GEM), 12); @@ -50,6 +50,6 @@ public class ImplosionCompressorRecipes extends RecipeMethods { throw new InvalidParameterException("Invalid implosion compressor darkAshes input: " + darkAshes); } - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(input, new ItemStack(Blocks.TNT, 16), output, getMaterial("dark_ashes", darkAshes, Type.DUST), 20, 32)); + RecipeHandler.addRecipe(new ImplosionCompressorRecipe(input, getStack(Blocks.TNT, 16), output, getMaterial("dark_ashes", darkAshes, Type.DUST), 20, 32)); } } diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java index 1490d8b72..61d9c9686 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java @@ -15,46 +15,46 @@ import java.security.InvalidParameterException; */ public class IndustrialCentrifugeRecipes extends RecipeMethods { public static void init() { - register(new ItemStack(Items.MAGMA_CREAM), 500, new ItemStack(Items.BLAZE_POWDER), new ItemStack(Items.SLIME_BALL)); - register(new ItemStack(Blocks.DIRT, 16), 2500, new ItemStack(Blocks.SAND, 8), new ItemStack(Items.CLAY_BALL), new ItemStack(Blocks.GRAVEL, 2)); - register(new ItemStack(Blocks.DIRT, 16), 2500, new ItemStack(Blocks.SAND, 8), new ItemStack(Items.CLAY_BALL), new ItemStack(Blocks.GRAVEL, 2), new ItemStack(Items.WHEAT_SEEDS, 4)); - register(new ItemStack(Blocks.MYCELIUM, 8), 1640, new ItemStack(Blocks.SAND, 4), new ItemStack(Items.CLAY_BALL), new ItemStack(Blocks.BROWN_MUSHROOM, 2), new ItemStack(Blocks.RED_MUSHROOM, 2)); - register(new ItemStack(Items.GOLDEN_APPLE), 10000, new ItemStack(Items.GOLD_INGOT, 6), getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.GOLDEN_APPLE, 1, 1), 10000, new ItemStack(Items.GOLD_INGOT, 64), getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.GOLDEN_CARROT), 10000, new ItemStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.SPECKLED_MELON, 8), 10000, new ItemStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.APPLE, 32), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.MUSHROOM_STEW, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.BREAD, 64), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.PORKCHOP, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKED_PORKCHOP, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.BEEF, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKED_BEEF, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.CHICKEN, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKED_CHICKEN, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.MUTTON, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKED_MUTTON, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.RABBIT, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKED_RABBIT, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.FISH, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKED_FISH, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.MELON, 64), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Blocks.PUMPKIN, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.ROTTEN_FLESH, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.SPIDER_EYE, 32), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.CARROT, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.POTATO, 16), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.POISONOUS_POTATO, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.BAKED_POTATO, 24), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.BEETROOT, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.COOKIE, 64), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Blocks.BROWN_MUSHROOM_BLOCK, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Blocks.RED_MUSHROOM_BLOCK, 12), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Blocks.BROWN_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Blocks.RED_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); - register(new ItemStack(Items.NETHER_WART, 32), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.MAGMA_CREAM), 500, getStack(Items.BLAZE_POWDER), getStack(Items.SLIME_BALL)); + register(getStack(Blocks.DIRT, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2)); + register(getStack(Blocks.DIRT, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2), getStack(Items.WHEAT_SEEDS, 4)); + register(getStack(Blocks.MYCELIUM, 8), 1640, getStack(Blocks.SAND, 4), getStack(Items.CLAY_BALL), getStack(Blocks.BROWN_MUSHROOM, 2), getStack(Blocks.RED_MUSHROOM, 2)); + register(getStack(Items.GOLDEN_APPLE), 10000, getStack(Items.GOLD_INGOT, 6), getMaterial("methane", Type.CELL)); + register(getStack(Items.GOLDEN_APPLE, 1, 1), 10000, getStack(Items.GOLD_INGOT, 64), getMaterial("methane", Type.CELL)); + register(getStack(Items.GOLDEN_CARROT), 10000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); + register(getStack(Items.SPECKLED_MELON, 8), 10000, getStack(Items.GOLD_NUGGET, 6), getMaterial("methane", Type.CELL)); + register(getStack(Items.APPLE, 32), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.MUSHROOM_STEW, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.BREAD, 64), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.PORKCHOP, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_PORKCHOP, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.BEEF, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_BEEF, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.CHICKEN, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_CHICKEN, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.MUTTON, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_MUTTON, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.RABBIT, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_RABBIT, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.FISH, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKED_FISH, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.MELON, 64), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Blocks.PUMPKIN, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.ROTTEN_FLESH, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.SPIDER_EYE, 32), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.CARROT, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.POTATO, 16), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.POISONOUS_POTATO, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.BAKED_POTATO, 24), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.BEETROOT, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.COOKIE, 64), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Blocks.BROWN_MUSHROOM_BLOCK, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Blocks.RED_MUSHROOM_BLOCK, 12), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Blocks.BROWN_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Blocks.RED_MUSHROOM, 32), 5000, getMaterial("methane", Type.CELL)); + register(getStack(Items.NETHER_WART, 32), 5000, getMaterial("methane", Type.CELL)); register(getMaterial("sap", 4, Type.PART), 1300, getMaterial("rubber", 14, Type.PART)); - register(new ItemStack(Blocks.SOUL_SAND, 16), 2500, new ItemStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL)); + register(getStack(Blocks.SOUL_SAND, 16), 2500, getStack(Blocks.SAND, 10), getMaterial("saltpeter", 4, Type.DUST), getMaterial("coal", Type.DUST), getMaterial("oil", Type.CELL)); register(getMaterial("lava", 16, Type.CELL), 15000, getMaterial("tin", 18, Type.INGOT), getMaterial("copper", 4, Type.INGOT), getMaterial("electrum", Type.INGOT), getMaterial("tungsten", Type.SMALL_DUST)); register(getMaterial("bronze", Type.DUST), 1500, getMaterial("copper", 6, Type.SMALL_DUST), getMaterial("tin", 2, Type.SMALL_DUST)); register(getMaterial("iron", 2, Type.DUST), 1500, getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); @@ -68,13 +68,13 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods { register(getMaterial("nickel", 3, Type.DUST), 3440, getMaterial("iron", Type.SMALL_DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("copper", Type.SMALL_DUST)); register(getMaterial("gold", 3, Type.DUST), 2400, getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); register(getMaterial("copper", 3, Type.DUST), 2400, getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(new ItemStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL)); - register(new ItemStack(Items.REDSTONE, 32), 22000, getMaterial("silicon", 3, Type.CELL), getMaterial("pyrite", 16, Type.DUST), getMaterial("ruby", 3, Type.DUST), getMaterial("mercury", 10, Type.CELL)); - register(new ItemStack(Items.GLOWSTONE_DUST, 16), 25000, new ItemStack(Items.REDSTONE, 8), getMaterial("sulfur", 8, Type.DUST), getMaterial("helium", Type.CELL)); - register(new ItemStack(Items.DYE, 4, 4), 1500, false, getMaterial("lazurite", 3, Type.DUST), getMaterial("pyrite", Type.SMALL_DUST), getMaterial("calcite", Type.SMALL_DUST), getMaterial("sodalite", 2, Type.SMALL_DUST)); - register(getMaterial("ender_eye", 2, Type.DUST), 1840, getMaterial("ender_pearl", Type.DUST), new ItemStack(Items.BLAZE_POWDER)); - register(getMaterial("netherrack", 16, Type.DUST), 2400, new ItemStack(Items.REDSTONE), getMaterial("sulfur", 4, Type.DUST), getMaterial("coal", Type.DUST), new ItemStack(Items.GOLD_NUGGET)); - register(getMaterial("endstone", 16, Type.DUST), 4800, getMaterial("helium3", Type.CELL), getMaterial("helium", Type.CELL), getMaterial("tungsten", Type.SMALL_DUST), new ItemStack(Blocks.SAND, 12)); + register(getStack(ModBlocks.RUBBER_LOG, 16), 5000, false, getMaterial("sap", 8, Type.PART), getMaterial("methane", Type.CELL), getMaterial("carbon", 4, Type.CELL)); + register(getStack(Items.REDSTONE, 32), 22000, getMaterial("silicon", 3, Type.CELL), getMaterial("pyrite", 16, Type.DUST), getMaterial("ruby", 3, Type.DUST), getMaterial("mercury", 10, Type.CELL)); + register(getStack(Items.GLOWSTONE_DUST, 16), 25000, getStack(Items.REDSTONE, 8), getMaterial("sulfur", 8, Type.DUST), getMaterial("helium", Type.CELL)); + register(getStack(Items.DYE, 4, 4), 1500, false, getMaterial("lazurite", 3, Type.DUST), getMaterial("pyrite", Type.SMALL_DUST), getMaterial("calcite", Type.SMALL_DUST), getMaterial("sodalite", 2, Type.SMALL_DUST)); + register(getMaterial("ender_eye", 2, Type.DUST), 1840, getMaterial("ender_pearl", Type.DUST), getStack(Items.BLAZE_POWDER)); + register(getMaterial("netherrack", 16, Type.DUST), 2400, getStack(Items.REDSTONE), getMaterial("sulfur", 4, Type.DUST), getMaterial("coal", Type.DUST), getStack(Items.GOLD_NUGGET)); + register(getMaterial("endstone", 16, Type.DUST), 4800, getMaterial("helium3", Type.CELL), getMaterial("helium", Type.CELL), getMaterial("tungsten", Type.SMALL_DUST), getStack(Blocks.SAND, 12)); register(getMaterial("red_garnet", 16, Type.DUST), 3000, getMaterial("pyrope", 3, Type.DUST), getMaterial("almandine", 5, Type.DUST), getMaterial("spessartine", 8, Type.DUST)); register(getMaterial("yellow_garnet", 16, Type.DUST), 3500, getMaterial("andradite", 5, Type.DUST), getMaterial("grossular", 8, Type.DUST), getMaterial("uvarovite", 3, Type.DUST)); register(getMaterial("dark_ashes", 2, Type.DUST), 240, getMaterial("ashes", 2, Type.DUST)); diff --git a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java index 73712ce5f..6d26e4afc 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java @@ -17,10 +17,10 @@ public class IndustrialElectrolyzerRecipes extends RecipeMethods { public static void init() { register(getMaterial("electrolyzedwater", 6, Type.CELL), 760, 120, getMaterial("hydrogen", 4, Type.CELL), getMaterial("compressedair", Type.CELL)); register(getMaterial("water", Type.CELL), 20, 50, getMaterial("electrolyzedwater", Type.CELL)); - register(new ItemStack(Items.DYE, 3, 15), 20, 106, false, getMaterial("calcium", Type.CELL)); - register(new ItemStack(Items.SUGAR, 32), 200, 32, getMaterial("carbon", 2, Type.CELL), getMaterial("water", 5, Type.CELL)); - register(new ItemStack(Items.BLAZE_POWDER, 4), 300, 25, getMaterial("dark_ashes", Type.DUST), getMaterial("sulfur", Type.DUST)); - register(new ItemStack(Blocks.SAND, 16), 1000, 25, getMaterial("silicon", Type.CELL), getMaterial("compressedair", Type.CELL)); + register(getStack(Items.DYE, 3, 15), 20, 106, false, getMaterial("calcium", Type.CELL)); + register(getStack(Items.SUGAR, 32), 200, 32, getMaterial("carbon", 2, Type.CELL), getMaterial("water", 5, Type.CELL)); + register(getStack(Items.BLAZE_POWDER, 4), 300, 25, getMaterial("dark_ashes", Type.DUST), getMaterial("sulfur", Type.DUST)); + register(getStack(Blocks.SAND, 16), 1000, 25, getMaterial("silicon", Type.CELL), getMaterial("compressedair", Type.CELL)); register(getOre("dustClay", 8), 200, 50, getMaterial("lithium", Type.CELL), getMaterial("silicon", 2, Type.CELL), getMaterial("aluminum", 2, Type.DUST), getMaterial("sodium", 2, Type.CELL)); register(getOre("dustCoal"), 40, 50, getMaterial("carbon", 2, Type.CELL)); register(getOre("dustCharcoal"), 20, 50, getMaterial("carbon", Type.CELL)); diff --git a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java index 96e6b9c06..e78840cc5 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java @@ -23,8 +23,8 @@ public class IndustrialGrinderRecipes extends RecipeMethods { public static void init() { - register(new ItemStack(Blocks.NETHERRACK, 16), WATER, 1600, 128, getMaterial("netherrack", 16, Type.DUST), new ItemStack(Items.GOLD_NUGGET)); - register(new ItemStack(Blocks.NETHERRACK, 8), MERCURY, 800, 128, getMaterial("netherrack", 8, Type.DUST), new ItemStack(Items.GOLD_NUGGET)); + register(getStack(Blocks.NETHERRACK, 16), WATER, 1600, 128, getMaterial("netherrack", 16, Type.DUST), getStack(Items.GOLD_NUGGET)); + register(getStack(Blocks.NETHERRACK, 8), MERCURY, 800, 128, getMaterial("netherrack", 8, Type.DUST), getStack(Items.GOLD_NUGGET)); register(getOre("oreCopper"), WATER, 100, 128, getMaterial("copper", 2, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); register(getOre("oreCopper"), SODIUM_PERSULFATE, 100, 128, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); @@ -44,15 +44,15 @@ public class IndustrialGrinderRecipes extends RecipeMethods { } register(getOre("oreIron"), WATER, 100, 128, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); - register(getOre("oreLapis"), WATER, 100, 128, new ItemStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); - register(getOre("oreRedstone"), WATER, 100, 128, new ItemStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); + register(getOre("oreLapis"), WATER, 100, 128, getStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); + register(getOre("oreRedstone"), WATER, 100, 128, getStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); register(getOre("oreGold"), WATER, 100, 128, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); register(getOre("oreGold"), MERCURY, 100, 128, getMaterial("gold", 3, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); register(getOre("oreGold"), SODIUM_PERSULFATE, 100, 128, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.DUST), getMaterial("nickel", Type.SMALL_DUST)); - register(getOre("oreDiamond"), WATER, 100, 128, new ItemStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); - register(getOre("oreEmerald"), WATER, 100, 128, new ItemStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); + register(getOre("oreDiamond"), WATER, 100, 128, getStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); + register(getOre("oreEmerald"), WATER, 100, 128, getStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); register(getOre("oreGalena"), WATER, 100, 128, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST)); register(getOre("oreGalena"), MERCURY, 100, 128, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST), getMaterial("silver", Type.DUST)); @@ -66,7 +66,7 @@ public class IndustrialGrinderRecipes extends RecipeMethods { register(getOre("oreRuby"), WATER, 100, 128, getMaterial("ruby", Type.GEM), getMaterial("ruby", 6, Type.SMALL_DUST), getMaterial("red_garnet", 2, Type.SMALL_DUST)); register(getOre("oreSapphire"), WATER, 100, 128, getMaterial("sapphire", Type.GEM), getMaterial("sapphire", 6, Type.SMALL_DUST), getMaterial("peridot", 2, Type.SMALL_DUST)); register(BlockOre.getOreByName("bauxite"), WATER, 100, 128, getMaterial("bauxite", 4, Type.DUST), getMaterial("aluminum", Type.DUST)); - register(getOre("oreQuartz"), WATER, 100, 128, new ItemStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + register(getOre("oreQuartz"), WATER, 100, 128, getStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); register(getOre("orePyrite"), WATER, 100, 128, getMaterial("pyrite", 5, Type.DUST), getMaterial("sulfur", 2, Type.DUST)); register(getOre("oreCinnabar"), WATER, 100, 128, getMaterial("cinnabar", 5, Type.DUST), getMaterial("redstone", 2, Type.SMALL_DUST), getMaterial("glowstone", Type.SMALL_DUST)); diff --git a/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java b/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java index dad84a631..f1b6a9837 100644 --- a/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java +++ b/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java @@ -18,17 +18,17 @@ public class RollingMachineRecipes extends RecipeMethods { if (oresExist("ingotAluminum")) { register(getMaterial("kanthal_heating_coil", 3, Type.PART), "RRR", "CAA", "CCA", 'R', "ingotRefinedIron", 'C', "ingotChrome", 'A', "ingotAluminium"); } - register(new ItemStack(Blocks.RAIL, 24), "I I", "ISI", "I I", 'I', "ingotIron", 'S', "stickWood"); - register(new ItemStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotIron", 'S', "stickWood", 'R', "dustRedstone"); - register(new ItemStack(Blocks.DETECTOR_RAIL, 8), "I I", "IPI", "IRI", 'I', "ingotIron", 'P', new ItemStack(Blocks.STONE_PRESSURE_PLATE), 'R', "dustRedstone"); - register(new ItemStack(Blocks.ACTIVATOR_RAIL, 8), "ISI", "IRI", "ISI", 'I', "ingotIron", 'S', "stickWood", 'R', new ItemStack(Blocks.REDSTONE_TORCH)); - register(new ItemStack(Blocks.IRON_BARS, 24), "III", "III", 'I', "ingotIron"); - register(new ItemStack(Items.IRON_DOOR, 4), "II ", "II ", "II ", 'I', "ingotIron"); - register(new ItemStack(Items.MINECART, 2), "I I", "III", 'I', "ingotIron"); - register(new ItemStack(Items.BUCKET, 2), "I I", "I I", " I ", 'I', "ingotIron"); - register(new ItemStack(Blocks.TRIPWIRE_HOOK, 4), " I ", " S ", " W ", 'I', "ingotIron", 'S', "stickWood", 'W', "plankWood"); - register(new ItemStack(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, 2), "II ", 'I', "ingotIron"); - register(new ItemStack(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, 2), "GG ", 'G', "ingotGold"); + register(getStack(Blocks.RAIL, 24), "I I", "ISI", "I I", 'I', "ingotIron", 'S', "stickWood"); + register(getStack(Blocks.GOLDEN_RAIL, 8), "I I", "ISI", "IRI", 'I', "ingotIron", 'S', "stickWood", 'R', "dustRedstone"); + register(getStack(Blocks.DETECTOR_RAIL, 8), "I I", "IPI", "IRI", 'I', "ingotIron", 'P', getStack(Blocks.STONE_PRESSURE_PLATE), 'R', "dustRedstone"); + register(getStack(Blocks.ACTIVATOR_RAIL, 8), "ISI", "IRI", "ISI", 'I', "ingotIron", 'S', "stickWood", 'R', getStack(Blocks.REDSTONE_TORCH)); + register(getStack(Blocks.IRON_BARS, 24), "III", "III", 'I', "ingotIron"); + register(getStack(Items.IRON_DOOR, 4), "II ", "II ", "II ", 'I', "ingotIron"); + register(getStack(Items.MINECART, 2), "I I", "III", 'I', "ingotIron"); + register(getStack(Items.BUCKET, 2), "I I", "I I", " I ", 'I', "ingotIron"); + register(getStack(Blocks.TRIPWIRE_HOOK, 4), " I ", " S ", " W ", 'I', "ingotIron", 'S', "stickWood", 'W', "plankWood"); + register(getStack(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, 2), "II ", 'I', "ingotIron"); + register(getStack(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE, 2), "GG ", 'G', "ingotGold"); } static void register(ItemStack output, Object... componentsObjects) { diff --git a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java index bdaf77ed7..2adb6cf50 100644 --- a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java +++ b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java @@ -21,76 +21,76 @@ import techreborn.utils.StackWIPHandler; */ public class ScrapboxRecipes extends RecipeMethods { public static void init() { - register(new ItemStack(Items.DIAMOND)); - register(new ItemStack(Items.STICK)); - register(new ItemStack(Items.COAL)); - register(new ItemStack(Items.APPLE)); - register(new ItemStack(Items.BAKED_POTATO)); - register(new ItemStack(Items.BLAZE_POWDER)); - register(new ItemStack(Items.WHEAT)); - register(new ItemStack(Items.CARROT)); - register(new ItemStack(Items.BOAT)); - register(new ItemStack(Items.ACACIA_BOAT)); - register(new ItemStack(Items.BIRCH_BOAT)); - register(new ItemStack(Items.DARK_OAK_BOAT)); - register(new ItemStack(Items.JUNGLE_BOAT)); - register(new ItemStack(Items.SPRUCE_BOAT)); - register(new ItemStack(Items.BLAZE_ROD)); - register(new ItemStack(Items.COMPASS)); - register(new ItemStack(Items.MAP)); - register(new ItemStack(Items.LEATHER_LEGGINGS)); - register(new ItemStack(Items.BOW)); - register(new ItemStack(Items.COOKED_CHICKEN)); - register(new ItemStack(Items.CAKE)); - register(new ItemStack(Items.ACACIA_DOOR)); - register(new ItemStack(Items.DARK_OAK_DOOR)); - register(new ItemStack(Items.BIRCH_DOOR)); - register(new ItemStack(Items.JUNGLE_DOOR)); - register(new ItemStack(Items.OAK_DOOR)); - register(new ItemStack(Items.SPRUCE_DOOR)); - register(new ItemStack(Items.WOODEN_AXE)); - register(new ItemStack(Items.WOODEN_HOE)); - register(new ItemStack(Items.WOODEN_PICKAXE)); - register(new ItemStack(Items.WOODEN_SHOVEL)); - register(new ItemStack(Items.WOODEN_SWORD)); - register(new ItemStack(Items.BED)); - register(new ItemStack(Items.SKULL, 1, 0)); - register(new ItemStack(Items.SKULL, 1, 2)); - register(new ItemStack(Items.SKULL, 1, 4)); + register(getStack(Items.DIAMOND)); + register(getStack(Items.STICK)); + register(getStack(Items.COAL)); + register(getStack(Items.APPLE)); + register(getStack(Items.BAKED_POTATO)); + register(getStack(Items.BLAZE_POWDER)); + register(getStack(Items.WHEAT)); + register(getStack(Items.CARROT)); + register(getStack(Items.BOAT)); + register(getStack(Items.ACACIA_BOAT)); + register(getStack(Items.BIRCH_BOAT)); + register(getStack(Items.DARK_OAK_BOAT)); + register(getStack(Items.JUNGLE_BOAT)); + register(getStack(Items.SPRUCE_BOAT)); + register(getStack(Items.BLAZE_ROD)); + register(getStack(Items.COMPASS)); + register(getStack(Items.MAP)); + register(getStack(Items.LEATHER_LEGGINGS)); + register(getStack(Items.BOW)); + register(getStack(Items.COOKED_CHICKEN)); + register(getStack(Items.CAKE)); + register(getStack(Items.ACACIA_DOOR)); + register(getStack(Items.DARK_OAK_DOOR)); + register(getStack(Items.BIRCH_DOOR)); + register(getStack(Items.JUNGLE_DOOR)); + register(getStack(Items.OAK_DOOR)); + register(getStack(Items.SPRUCE_DOOR)); + register(getStack(Items.WOODEN_AXE)); + register(getStack(Items.WOODEN_HOE)); + register(getStack(Items.WOODEN_PICKAXE)); + register(getStack(Items.WOODEN_SHOVEL)); + register(getStack(Items.WOODEN_SWORD)); + register(getStack(Items.BED)); + register(getStack(Items.SKULL, 1, 0)); + register(getStack(Items.SKULL, 1, 2)); + register(getStack(Items.SKULL, 1, 4)); for (int i = 0; i < StackWIPHandler.devHeads.size(); i++) register(StackWIPHandler.devHeads.get(i)); - register(new ItemStack(Items.GLOWSTONE_DUST)); - register(new ItemStack(Items.STRING)); - register(new ItemStack(Items.MINECART)); - register(new ItemStack(Items.CHEST_MINECART)); - register(new ItemStack(Items.HOPPER_MINECART)); - register(new ItemStack(Items.PRISMARINE_SHARD)); - register(new ItemStack(Items.SHEARS)); - register(new ItemStack(Items.EXPERIENCE_BOTTLE)); - register(new ItemStack(Items.BONE)); - register(new ItemStack(Items.BOWL)); - register(new ItemStack(Items.BRICK)); - register(new ItemStack(Items.FISHING_ROD)); - register(new ItemStack(Items.BOOK)); - register(new ItemStack(Items.PAPER)); - register(new ItemStack(Items.SUGAR)); - register(new ItemStack(Items.REEDS)); - register(new ItemStack(Items.SPIDER_EYE)); - register(new ItemStack(Items.SLIME_BALL)); - register(new ItemStack(Items.ROTTEN_FLESH)); - register(new ItemStack(Items.SIGN)); - register(new ItemStack(Items.WRITABLE_BOOK)); - register(new ItemStack(Items.COOKED_BEEF)); - register(new ItemStack(Items.NAME_TAG)); - register(new ItemStack(Items.SADDLE)); - register(new ItemStack(Items.REDSTONE)); - register(new ItemStack(Items.GUNPOWDER)); - register(new ItemStack(Items.RABBIT_HIDE)); - register(new ItemStack(Items.RABBIT_FOOT)); - register(new ItemStack(Items.APPLE)); - register(new ItemStack(Items.GOLDEN_APPLE)); - register(new ItemStack(Items.GOLD_NUGGET)); - register(new ItemStack(Items.SHULKER_SHELL)); + register(getStack(Items.GLOWSTONE_DUST)); + register(getStack(Items.STRING)); + register(getStack(Items.MINECART)); + register(getStack(Items.CHEST_MINECART)); + register(getStack(Items.HOPPER_MINECART)); + register(getStack(Items.PRISMARINE_SHARD)); + register(getStack(Items.SHEARS)); + register(getStack(Items.EXPERIENCE_BOTTLE)); + register(getStack(Items.BONE)); + register(getStack(Items.BOWL)); + register(getStack(Items.BRICK)); + register(getStack(Items.FISHING_ROD)); + register(getStack(Items.BOOK)); + register(getStack(Items.PAPER)); + register(getStack(Items.SUGAR)); + register(getStack(Items.REEDS)); + register(getStack(Items.SPIDER_EYE)); + register(getStack(Items.SLIME_BALL)); + register(getStack(Items.ROTTEN_FLESH)); + register(getStack(Items.SIGN)); + register(getStack(Items.WRITABLE_BOOK)); + register(getStack(Items.COOKED_BEEF)); + register(getStack(Items.NAME_TAG)); + register(getStack(Items.SADDLE)); + register(getStack(Items.REDSTONE)); + register(getStack(Items.GUNPOWDER)); + register(getStack(Items.RABBIT_HIDE)); + register(getStack(Items.RABBIT_FOOT)); + register(getStack(Items.APPLE)); + register(getStack(Items.GOLDEN_APPLE)); + register(getStack(Items.GOLD_NUGGET)); + register(getStack(Items.SHULKER_SHELL)); register(DynamicCell.getEmptyCell(1)); register(getMaterial("water", Type.CELL)); @@ -98,74 +98,74 @@ public class ScrapboxRecipes extends RecipeMethods { register(getMaterial("sap", Type.PART)); register(getMaterial("rubber", Type.PART)); - register(new ItemStack(Blocks.TRAPDOOR)); - register(new ItemStack(Blocks.STONE_BUTTON)); - register(new ItemStack(Blocks.WOODEN_BUTTON)); - register(new ItemStack(Blocks.ACACIA_FENCE)); - register(new ItemStack(Blocks.ACACIA_FENCE_GATE)); - register(new ItemStack(Blocks.BIRCH_FENCE)); - register(new ItemStack(Blocks.BIRCH_FENCE_GATE)); - register(new ItemStack(Blocks.DARK_OAK_FENCE)); - register(new ItemStack(Blocks.DARK_OAK_FENCE_GATE)); - register(new ItemStack(Blocks.JUNGLE_FENCE)); - register(new ItemStack(Blocks.JUNGLE_FENCE_GATE)); - register(new ItemStack(Blocks.NETHER_BRICK_FENCE)); - register(new ItemStack(Blocks.OAK_FENCE)); - register(new ItemStack(Blocks.OAK_FENCE_GATE)); - register(new ItemStack(Blocks.SPRUCE_FENCE)); - register(new ItemStack(Blocks.SPRUCE_FENCE_GATE)); - register(new ItemStack(Blocks.BRICK_BLOCK)); - register(new ItemStack(Blocks.CRAFTING_TABLE)); - register(new ItemStack(Blocks.PUMPKIN)); - register(new ItemStack(Blocks.NETHERRACK)); - register(new ItemStack(Blocks.GRASS)); - register(new ItemStack(Blocks.DIRT, 1, 0)); - register(new ItemStack(Blocks.DIRT, 1, 1)); - register(new ItemStack(Blocks.SAND, 1, 0)); - register(new ItemStack(Blocks.SAND, 1, 1)); - register(new ItemStack(Blocks.GLOWSTONE)); - register(new ItemStack(Blocks.GRAVEL)); - register(new ItemStack(Blocks.HARDENED_CLAY)); - register(new ItemStack(Blocks.GLASS)); - register(new ItemStack(Blocks.GLASS_PANE)); - register(new ItemStack(Blocks.CACTUS)); - register(new ItemStack(Blocks.TALLGRASS, 1, 0)); - register(new ItemStack(Blocks.TALLGRASS, 1, 1)); - register(new ItemStack(Blocks.DEADBUSH)); - register(new ItemStack(Blocks.CHEST)); - register(new ItemStack(Blocks.TNT)); - register(new ItemStack(Blocks.RAIL)); - register(new ItemStack(Blocks.DETECTOR_RAIL)); - register(new ItemStack(Blocks.GOLDEN_RAIL)); - register(new ItemStack(Blocks.ACTIVATOR_RAIL)); - register(new ItemStack(Blocks.YELLOW_FLOWER)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 0)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 1)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 2)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 3)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 4)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 5)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 6)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 7)); - register(new ItemStack(Blocks.RED_FLOWER, 1, 8)); - register(new ItemStack(Blocks.BROWN_MUSHROOM)); - register(new ItemStack(Blocks.RED_MUSHROOM)); - register(new ItemStack(Blocks.BROWN_MUSHROOM_BLOCK)); - register(new ItemStack(Blocks.RED_MUSHROOM_BLOCK)); - register(new ItemStack(Blocks.SAPLING, 1, 0)); - register(new ItemStack(Blocks.SAPLING, 1, 1)); - register(new ItemStack(Blocks.SAPLING, 1, 2)); - register(new ItemStack(Blocks.SAPLING, 1, 3)); - register(new ItemStack(Blocks.SAPLING, 1, 4)); - register(new ItemStack(Blocks.SAPLING, 1, 5)); - register(new ItemStack(Blocks.LEAVES, 1, 0)); - register(new ItemStack(Blocks.LEAVES, 1, 1)); - register(new ItemStack(Blocks.LEAVES, 1, 2)); - register(new ItemStack(Blocks.LEAVES, 1, 3)); - register(new ItemStack(Blocks.LEAVES2, 1, 0)); - register(new ItemStack(Blocks.LEAVES2, 1, 1)); + register(getStack(Blocks.TRAPDOOR)); + register(getStack(Blocks.STONE_BUTTON)); + register(getStack(Blocks.WOODEN_BUTTON)); + register(getStack(Blocks.ACACIA_FENCE)); + register(getStack(Blocks.ACACIA_FENCE_GATE)); + register(getStack(Blocks.BIRCH_FENCE)); + register(getStack(Blocks.BIRCH_FENCE_GATE)); + register(getStack(Blocks.DARK_OAK_FENCE)); + register(getStack(Blocks.DARK_OAK_FENCE_GATE)); + register(getStack(Blocks.JUNGLE_FENCE)); + register(getStack(Blocks.JUNGLE_FENCE_GATE)); + register(getStack(Blocks.NETHER_BRICK_FENCE)); + register(getStack(Blocks.OAK_FENCE)); + register(getStack(Blocks.OAK_FENCE_GATE)); + register(getStack(Blocks.SPRUCE_FENCE)); + register(getStack(Blocks.SPRUCE_FENCE_GATE)); + register(getStack(Blocks.BRICK_BLOCK)); + register(getStack(Blocks.CRAFTING_TABLE)); + register(getStack(Blocks.PUMPKIN)); + register(getStack(Blocks.NETHERRACK)); + register(getStack(Blocks.GRASS)); + register(getStack(Blocks.DIRT, 1, 0)); + register(getStack(Blocks.DIRT, 1, 1)); + register(getStack(Blocks.SAND, 1, 0)); + register(getStack(Blocks.SAND, 1, 1)); + register(getStack(Blocks.GLOWSTONE)); + register(getStack(Blocks.GRAVEL)); + register(getStack(Blocks.HARDENED_CLAY)); + register(getStack(Blocks.GLASS)); + register(getStack(Blocks.GLASS_PANE)); + register(getStack(Blocks.CACTUS)); + register(getStack(Blocks.TALLGRASS, 1, 0)); + register(getStack(Blocks.TALLGRASS, 1, 1)); + register(getStack(Blocks.DEADBUSH)); + register(getStack(Blocks.CHEST)); + register(getStack(Blocks.TNT)); + register(getStack(Blocks.RAIL)); + register(getStack(Blocks.DETECTOR_RAIL)); + register(getStack(Blocks.GOLDEN_RAIL)); + register(getStack(Blocks.ACTIVATOR_RAIL)); + register(getStack(Blocks.YELLOW_FLOWER)); + register(getStack(Blocks.RED_FLOWER, 1, 0)); + register(getStack(Blocks.RED_FLOWER, 1, 1)); + register(getStack(Blocks.RED_FLOWER, 1, 2)); + register(getStack(Blocks.RED_FLOWER, 1, 3)); + register(getStack(Blocks.RED_FLOWER, 1, 4)); + register(getStack(Blocks.RED_FLOWER, 1, 5)); + register(getStack(Blocks.RED_FLOWER, 1, 6)); + register(getStack(Blocks.RED_FLOWER, 1, 7)); + register(getStack(Blocks.RED_FLOWER, 1, 8)); + register(getStack(Blocks.BROWN_MUSHROOM)); + register(getStack(Blocks.RED_MUSHROOM)); + register(getStack(Blocks.BROWN_MUSHROOM_BLOCK)); + register(getStack(Blocks.RED_MUSHROOM_BLOCK)); + register(getStack(Blocks.SAPLING, 1, 0)); + register(getStack(Blocks.SAPLING, 1, 1)); + register(getStack(Blocks.SAPLING, 1, 2)); + register(getStack(Blocks.SAPLING, 1, 3)); + register(getStack(Blocks.SAPLING, 1, 4)); + register(getStack(Blocks.SAPLING, 1, 5)); + register(getStack(Blocks.LEAVES, 1, 0)); + register(getStack(Blocks.LEAVES, 1, 1)); + register(getStack(Blocks.LEAVES, 1, 2)); + register(getStack(Blocks.LEAVES, 1, 3)); + register(getStack(Blocks.LEAVES2, 1, 0)); + register(getStack(Blocks.LEAVES2, 1, 1)); - register(new ItemStack(ModBlocks.RUBBER_SAPLING)); + register(getStack(ModBlocks.RUBBER_SAPLING)); for (String i : ItemDusts.types) { if (!i.equals(ModItems.META_PLACEHOLDER)) { @@ -203,7 +203,7 @@ public class ScrapboxRecipes extends RecipeMethods { static void registerDyable(Item item) { for (int i = 0; i < 16; i++) - register(new ItemStack(item, 1, i)); + register(getStack(item, 1, i)); } static void registerDyable(Block block) { diff --git a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java index 593e3e5d3..f789636df 100644 --- a/src/main/java/techreborn/init/recipes/SmeltingRecipes.java +++ b/src/main/java/techreborn/init/recipes/SmeltingRecipes.java @@ -12,11 +12,11 @@ import techreborn.init.IC2Duplicates; */ public class SmeltingRecipes extends RecipeMethods { public static void init() { - register(getMaterial("iron", Type.DUST), new ItemStack(Items.IRON_INGOT)); - register(getMaterial("gold", Type.DUST), new ItemStack(Items.GOLD_INGOT)); + register(getMaterial("iron", Type.DUST), getStack(Items.IRON_INGOT)); + register(getMaterial("gold", Type.DUST), getStack(Items.GOLD_INGOT)); register(getMaterial("sap", Type.PART), getMaterial("rubber", Type.PART)); if (!IC2Duplicates.deduplicate()) { - register(new ItemStack(Items.IRON_INGOT), getMaterial("refined_iron", Type.INGOT)); + register(getStack(Items.IRON_INGOT), getMaterial("refined_iron", Type.INGOT)); } register(BlockOre2.getOreByName("copper"), getMaterial("copper", Type.INGOT)); register(BlockOre2.getOreByName("tin"), getMaterial("tin", Type.INGOT));