From 308e55922946c59e05cfd9897d51d4fe229aca16 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 3 Dec 2025 15:34:29 +0100 Subject: [PATCH] spungus --- changelog | 2 + .../java/com/hbm/config/GeneralConfig.java | 22 ++--- .../java/com/hbm/config/VersatileConfig.java | 18 +--- .../java/com/hbm/crafting/RodRecipes.java | 2 +- .../java/com/hbm/crafting/ToolRecipes.java | 10 +- .../com/hbm/handler/EntityEffectHandler.java | 2 +- .../com/hbm/inventory/OreDictManager.java | 3 - .../inventory/recipes/AssemblerRecipes.java | 84 ++++++++-------- .../recipes/AssemblyMachineRecipes.java | 70 ++++++------- .../recipes/ChemicalPlantRecipes.java | 18 ++-- .../inventory/recipes/ChemplantRecipes.java | 92 +++--------------- .../inventory/recipes/anvil/AnvilRecipes.java | 14 +-- .../hbm/items/special/ItemBedrockOreNew.java | 4 +- .../java/com/hbm/items/tool/ItemWandS.java | 4 - src/main/java/com/hbm/lib/HbmWorldGen.java | 16 +-- .../java/com/hbm/main/CraftingManager.java | 2 +- .../tileentity/machine/rbmk/RBMKDials.java | 2 +- .../com/hbm/world/feature/BedrockOre.java | 6 -- .../assets/hbm/textures/misc/player.png | Bin 8708 -> 0 bytes .../assets/hbm/textures/player/player.png | Bin 0 -> 4788 bytes .../hbm/textures/player/player_carousel.png | Bin 0 -> 5286 bytes .../assets/hbm/textures/player/player_cf.png | Bin 0 -> 12762 bytes .../hbm/textures/player/player_monarch.png | Bin 0 -> 1631 bytes 23 files changed, 132 insertions(+), 239 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/misc/player.png create mode 100644 src/main/resources/assets/hbm/textures/player/player.png create mode 100644 src/main/resources/assets/hbm/textures/player/player_carousel.png create mode 100644 src/main/resources/assets/hbm/textures/player/player_cf.png create mode 100644 src/main/resources/assets/hbm/textures/player/player_monarch.png diff --git a/changelog b/changelog index 8b0e712a8..424c110a3 100644 --- a/changelog +++ b/changelog @@ -23,6 +23,8 @@ * Recipes require the divine pufferfish, driver of all innovation * Where can you get this much pufferfish? Go figure it out * Chance output stacks no longer do an RNG call to determine if the whole stack is provided or none, rather, each single item of the stack has its own RNG call +* Hiperf bedrock ore processing of heavy metals now yields tantalium +* Bedrock coltan is no longer a dedicated bedrock ore type ## Fixed * Fixed gamebreaking issue causing crashes and world corruption where the multi detonator had its tooltip misspelled diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index dd204d6fe..9dc23a824 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -47,13 +47,10 @@ public class GeneralConfig { public static boolean enable528ReasimBoilers = true; public static boolean enable528ColtanDeposit = true; public static boolean enable528ColtanSpawn = false; - public static boolean enable528BedrockDeposit = true; - public static boolean enable528BedrockSpawn = false; public static boolean enable528BosniaSimulator = true; - public static boolean enable528BedrockReplacement = true; public static boolean enable528NetherBurn = true; + public static boolean enable528PressurizedRecipes = true; public static int coltanRate = 2; - public static int bedrockRate = 50; public static boolean enableLBSM = false; public static boolean enableLBSMFullSchrab = true; @@ -68,7 +65,6 @@ public class GeneralConfig { public static boolean enableLBSMSimpleMedicineRecipes = true; public static boolean enableLBSMSafeCrates = true; public static boolean enableLBSMSafeMEDrives = true; - public static boolean enableLBSMIGen = true; public static int schrabRate = 20; public static String[] preferredOutputMod = new String[] {RefStrings.MODID}; @@ -129,18 +125,14 @@ public class GeneralConfig { + "528-Modus: Lassen Sie Vorsicht walten!\n" + "способ-528: действовать с осторожностью!"); - enable528 = CommonConfig.createConfigBool(config, CATEGORY_528, "enable528Mode", "The central toggle for 528 mode.", false); + enable528 = CommonConfig.createConfigBool(config, CATEGORY_528, "enable528Mode", "The central toggle for 528 mode, required TRUE for most subsequent toggles to work.", false); enable528ReasimBoilers = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_forceReasimBoilers", "Keeps the RBMK dial for ReaSim boilers on, preventing use of non-ReaSim boiler columns and forcing the use of steam in-/outlets", true); enable528ColtanDeposit = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableColtanDepsoit", "Enables the coltan deposit. A large amount of coltan will spawn around a single random location in the world.", true); enable528ColtanSpawn = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableColtanSpawning", "Enables coltan ore as a random spawn in the world. Unlike the deposit option, coltan will not just spawn in one central location.", false); - enable528BedrockDeposit = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableBedrockDepsoit", "Enables bedrock coltan ores in the coltan deposit. These ores can be drilled to extract infinite coltan, albeit slowly.", true); - enable528BedrockSpawn = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableBedrockSpawning", "Enables the bedrock coltan ores as a rare spawn. These will be rarely found anywhere in the world.", false); enable528BosniaSimulator = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableBosniaSimulator", "Enables anti tank mines spawning all over the world.", true); - enable528BedrockReplacement = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enable528BedrockReplacement", "Replaces certain bedrock ores with ones that require additional processing.", true); enable528NetherBurn = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enable528NetherBurn", "Whether players burn in the nether", true); + enable528PressurizedRecipes = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enable528PressurizedRecipes", "Sets some recipes to require pressurized input fluid", true); coltanRate = CommonConfig.createConfigInt(config, CATEGORY_528, "X528_oreColtanFrequency", "Determines how many coltan ore veins are to be expected in a chunk. These values do not affect the frequency in deposits, and only apply if random coltan spanwing is enabled.", 2); - bedrockRate = CommonConfig.createConfigInt(config, CATEGORY_528, "X528_bedrockColtanFrequency", "Determines how often (1 in X) bedrock coltan ores spawn. Applies for both the bedrock ores in the coltan deposit (if applicable) and the random bedrock ores (if applicable)", 50); - final String CATEGORY_LBSM = CommonConfig.CATEGORY_LBSM; @@ -162,9 +154,15 @@ public class GeneralConfig { enableLBSMSimpleMedicineRecipes = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_recipeSimpleMedicine", "When enabled, makes some medicine recipes (like ones that require bismuth) much more affordable", true); enableLBSMSafeCrates = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_safeCrates", "When enabled, prevents crates from becoming radioactive", true); enableLBSMSafeMEDrives = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_safeMEDrives", "When enabled, prevents ME Drives and Portable Cells from becoming radioactive", true); - enableLBSMIGen = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_iGen", "When enabled, restores the industrial generator to pre-nerf power", true); schrabRate = CommonConfig.createConfigInt(config, CATEGORY_LBSM, "LBSM_schrabOreRate", "Changes the amount of uranium ore needed on average to create one schrabidium ore using nukes. Standard mode value is 100", 20); if(enable528) enableLBSM = false; + + if(!enable528) { + enable528ReasimBoilers = false; + enable528BosniaSimulator = false; + enable528NetherBurn = false; + enable528PressurizedRecipes = false; + } } } diff --git a/src/main/java/com/hbm/config/VersatileConfig.java b/src/main/java/com/hbm/config/VersatileConfig.java index eae8519d9..ee0b4ac8d 100644 --- a/src/main/java/com/hbm/config/VersatileConfig.java +++ b/src/main/java/com/hbm/config/VersatileConfig.java @@ -12,28 +12,18 @@ import net.minecraft.potion.PotionEffect; public class VersatileConfig { public static Item getTransmutatorItem() { - - if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMFullSchrab) - return ModItems.ingot_schrabidium; - + if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMFullSchrab) return ModItems.ingot_schrabidium; return ModItems.ingot_schraranium; } public static int getSchrabOreChance() { - - if(GeneralConfig.enableLBSM) - return GeneralConfig.schrabRate; - + if(GeneralConfig.enableLBSM) return GeneralConfig.schrabRate; return 100; } public static void applyPotionSickness(EntityLivingBase entity, int duration) { - - if(PotionConfig.potionSickness == 0) - return; - - if(PotionConfig.potionSickness == 2) - duration *= 12; + if(PotionConfig.potionSickness == 0) return; + if(PotionConfig.potionSickness == 2) duration *= 12; PotionEffect eff = new PotionEffect(HbmPotion.potionsickness.id, duration * 20); eff.setCurativeItems(new ArrayList()); diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index bd15c0322..3fa693db7 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -48,7 +48,7 @@ public class RodRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.waste_zfb_mox, 2, 1), new Object[] { ModItems.rod_zirnox_zfb_mox_depleted }); //Breeding Rods - CraftingManager.addRecipeAuto(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', STEEL.plate528(), 'L', PB.plate528() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.rod_empty, 16), new Object[] { "SSS", "L L", "SSS", 'S', STEEL.plate(), 'L', PB.plate() }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_empty, 2), new Object[] { ModItems.rod_dual_empty }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_dual_empty, 1), new Object[] { ModItems.rod_empty, ModItems.rod_empty }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.rod_empty, 4), new Object[] { ModItems.rod_quad_empty }); diff --git a/src/main/java/com/hbm/crafting/ToolRecipes.java b/src/main/java/com/hbm/crafting/ToolRecipes.java index 1fd1539b2..814607a6c 100644 --- a/src/main/java/com/hbm/crafting/ToolRecipes.java +++ b/src/main/java/com/hbm/crafting/ToolRecipes.java @@ -112,10 +112,10 @@ public class ToolRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.designator_manual, 1), new Object[] { " A", "#C#", "#B#", '#', ANY_PLASTIC.ingot(), 'A', PB.plate(), 'B', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'C', ModItems.designator }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.designator_arty_range, 1), new Object[] { ModItems.rangefinder, DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), ANY_PLASTIC.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.linker, 1), new Object[] { "I I", "ICI", "GGG", 'I', IRON.plate(), 'G', GOLD.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.oil_detector, 1), new Object[] { "W I", "WCI", "PPP", 'W', GOLD.wireFine(), 'I', CU.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ANALOG), 'P', STEEL.plate528() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.oil_detector, 1), new Object[] { "W I", "WCI", "PPP", 'W', GOLD.wireFine(), 'I', CU.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ANALOG), 'P', STEEL.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.turret_chip, 1), new Object[] { "WWW", "CPC", "WWW", 'W', GOLD.wireFine(), 'P', ANY_PLASTIC.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.survey_scanner, 1), new Object[] { "SWS", " G ", "PCP", 'W', GOLD.wireFine(), 'P', ANY_PLASTIC.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'S', STEEL.plate528(), 'G', GOLD.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', GOLD.wireFine(), 'P', ANY_RUBBER.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'G', GOLD.ingot(), 'S', STEEL.plate528(), 'B', ModItems.ingot_beryllium }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.survey_scanner, 1), new Object[] { "SWS", " G ", "PCP", 'W', GOLD.wireFine(), 'P', ANY_PLASTIC.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'S', STEEL.plate(), 'G', GOLD.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', GOLD.wireFine(), 'P', ANY_RUBBER.ingot(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'G', GOLD.ingot(), 'S', STEEL.plate(), 'B', ModItems.ingot_beryllium }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.dosimeter, 1), new Object[] { "WGW", "WCW", "WBW", 'W', KEY_PLANKS, 'G', KEY_ANYPANE, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'B', BE.ingot() }); CraftingManager.addShapelessAuto(new ItemStack(ModBlocks.geiger), new Object[] { ModItems.geiger_counter }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.digamma_diagnostic), new Object[] { ModItems.geiger_counter, PO210.billet(), ASBESTOS.ingot() }); @@ -147,8 +147,8 @@ public class ToolRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.hand_drill_desh), new Object[] { " D", "S ", " S", 'D', DESH.ingot(), 'S', ANY_PLASTIC.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.chemistry_set), new Object[] { "GIG", "GCG", 'G', KEY_ANYGLASS, 'I', IRON.ingot(), 'C', CU.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.chemistry_set_boron), new Object[] { "GIG", "GCG", 'G', ModBlocks.glass_boron, 'I', STEEL.ingot(), 'C', CO.ingot() }); - CraftingManager.addRecipeAuto(ItemBlowtorch.getEmptyTool(ModItems.blowtorch), new Object[] { "CC ", " I ", "CCC", 'C', CU.plate528(), 'I', IRON.ingot() }); - CraftingManager.addRecipeAuto(ItemBlowtorch.getEmptyTool(ModItems.acetylene_torch), new Object[] { "SS ", " PS", " T ", 'S', STEEL.plate528(), 'P', ANY_PLASTIC.ingot(), 'T', ModItems.tank_steel }); + CraftingManager.addRecipeAuto(ItemBlowtorch.getEmptyTool(ModItems.blowtorch), new Object[] { "CC ", " I ", "CCC", 'C', CU.plate(), 'I', IRON.ingot() }); + CraftingManager.addRecipeAuto(ItemBlowtorch.getEmptyTool(ModItems.acetylene_torch), new Object[] { "SS ", " PS", " T ", 'S', STEEL.plate(), 'P', ANY_PLASTIC.ingot(), 'T', ModItems.tank_steel }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.boltgun), new Object[] { "DPS", " RD", " D ", 'D', DURA.ingot(), 'P', DictFrame.fromOne(ModItems.part_generic, EnumPartType.PISTON_PNEUMATIC), 'R', RUBBER.ingot(), 'S', STEEL.shell() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.rebar_placer), new Object[] { "RDR", "DWD", "RDR", 'R', ModBlocks.rebar, 'D', ModItems.ducttape, 'W', ModItems.wrench }); diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index dcbfcb5b6..8a98850ac 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -106,7 +106,7 @@ public class EntityEffectHandler { } } //only sets players on fire so mod compatibility doesnt die - if((GeneralConfig.enable528 && GeneralConfig.enable528NetherBurn) && entity instanceof EntityPlayer && !entity.isImmuneToFire() && entity.worldObj.provider.isHellWorld) { + if(GeneralConfig.enable528NetherBurn && entity instanceof EntityPlayer && !entity.isImmuneToFire() && entity.worldObj.provider.isHellWorld) { entity.setFire(5); } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 02efa0586..cb9ceba78 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -776,9 +776,6 @@ public class OreDictManager { public String grip() { return GRIP.name() + mats[0]; } public String[] all(MaterialShapes shape) { return appendToAll(shape.prefixes); } - /** Returns cast (triple) plates if 528 mode is enabled or normal plates if not */ - public String plate528() { return GeneralConfig.enable528 ? plateCast() : plate(); } - private String[] appendToAll(String... prefix) { String[] names = new String[mats.length * prefix.length]; diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 1d044fea2..99f5fec56 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -71,7 +71,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModItems.hazmat_cloth, 4), new AStack[] {new OreDictStack(PB.dust(), 4), new ComparableStack(Items.string, 8), },50); makeRecipe(new ComparableStack(ModItems.asbestos_cloth, 4), new AStack[] {new OreDictStack(ASBESTOS.ingot(), 2), new ComparableStack(Items.string, 6), new ComparableStack(Blocks.wool, 1), },50); makeRecipe(new ComparableStack(ModItems.filter_coal, 1), new AStack[] {new OreDictStack(COAL.dust(), 4), new ComparableStack(Items.string, 2), new ComparableStack(Items.paper, 1), },50); - makeRecipe(new ComparableStack(ModItems.centrifuge_element, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 4), new OreDictStack(TI.plate528(), 4), new ComparableStack(ModItems.motor, 1), }, 100); + makeRecipe(new ComparableStack(ModItems.centrifuge_element, 1), new AStack[] {new OreDictStack(STEEL.plate(), 4), new OreDictStack(TI.plate(), 4), new ComparableStack(ModItems.motor, 1), }, 100); makeRecipe(new ComparableStack(ModItems.reactor_core, 1), new AStack[] {new OreDictStack(PB.ingot(), 8), new OreDictStack(BE.ingot(), 6), new OreDictStack(STEEL.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(FIBER.ingot(), 2) },100); makeRecipe(new ComparableStack(ModItems.rtg_unit, 1), new AStack[] {new ComparableStack(ModItems.thermo_element, 2), new OreDictStack(CU.plateCast(), 1), new OreDictStack(PB.ingot(), 2), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.CAPACITOR.ordinal()), },100); makeRecipe(new ComparableStack(ModItems.drill_titanium, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(DURA.ingot(), 2), new OreDictStack(DURA.bolt(), 4), new OreDictStack(TI.plate(), 6), },100); @@ -111,33 +111,33 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.cmb_brick_reinforced, 8), new AStack[] {new ComparableStack(ModBlocks.block_magnetized_tungsten, 4), new ComparableStack(ModBlocks.brick_concrete, 4), new ComparableStack(ModBlocks.cmb_brick, 1), new OreDictStack(STEEL.plate(), 4), },200); makeRecipe(new ComparableStack(ModBlocks.seal_frame, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 3), new OreDictStack(AL.wireFine(), 4), new OreDictStack(REDSTONE.dust(), 2), new ComparableStack(ModBlocks.steel_roof, 5), },50); makeRecipe(new ComparableStack(ModBlocks.seal_controller, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 3), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(MINGRADE.ingot(), 1), new OreDictStack(REDSTONE.dust(), 4), new ComparableStack(ModBlocks.steel_roof, 5), },100); - makeRecipe(new ComparableStack(ModBlocks.machine_centrifuge, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 1), new OreDictStack(ANY_PLASTIC.ingot(), 2), new OreDictStack(STEEL.plate528(), 8), new OreDictStack(CU.plate(), 8), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG), }, 200); - makeRecipe(new ComparableStack(ModBlocks.machine_gascent, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(DESH.ingot(), 2), new OreDictStack(STEEL.plate528(), 8), new ComparableStack(ModItems.coil_tungsten, 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()) }, 300); + makeRecipe(new ComparableStack(ModBlocks.machine_centrifuge, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 1), new OreDictStack(ANY_PLASTIC.ingot(), 2), new OreDictStack(STEEL.plate(), 8), new OreDictStack(CU.plate(), 8), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG), }, 200); + makeRecipe(new ComparableStack(ModBlocks.machine_gascent, 1), new AStack[] {new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(DESH.ingot(), 2), new OreDictStack(STEEL.plate(), 8), new ComparableStack(ModItems.coil_tungsten, 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()) }, 300); makeRecipe(new ComparableStack(ModBlocks.machine_diesel, 1), new AStack[] {new OreDictStack(STEEL.shell(), 1), new ComparableStack(ModItems.piston_selenium, 1), new OreDictStack(STEEL.plateCast(), 1), new ComparableStack(ModItems.coil_copper, 4), }, 60); - makeRecipe(new ComparableStack(ModBlocks.machine_rtg_grey, 1), new AStack[] {new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(STEEL.plate528(), 4), new OreDictStack(MINGRADE.wireFine(), 4), new OreDictStack(ANY_PLASTIC.ingot(), 3), },200); + makeRecipe(new ComparableStack(ModBlocks.machine_rtg_grey, 1), new AStack[] {new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(STEEL.plate(), 4), new OreDictStack(MINGRADE.wireFine(), 4), new OreDictStack(ANY_PLASTIC.ingot(), 3), },200); makeRecipe(new ComparableStack(ModBlocks.machine_battery, 1), new AStack[] {new OreDictStack(STEEL.plateWelded(), 1), new OreDictStack(S.dust(), 12), new OreDictStack(PB.dust(), 12) },100); makeRecipe(new ComparableStack(ModBlocks.machine_lithium_battery, 1), new AStack[] {new OreDictStack(ANY_PLASTIC.ingot(), 8), new OreDictStack(CO.dust(), 12), new OreDictStack(LI.dust(), 12) },100); makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_battery, 1), new AStack[] {new OreDictStack(DESH.ingot(), 16), new OreDictStack(NP237.dust(), 12), new OreDictStack(SA326.dust(), 12) },200); makeRecipe(new ComparableStack(ModBlocks.machine_dineutronium_battery, 1), new AStack[] {new OreDictStack(DNT.ingot(), 24), new ComparableStack(ModItems.powder_spark_mix, 12), new ComparableStack(ModItems.battery_spark_cell_1000, 1), new OreDictStack(CMB.ingot(), 32) }, 300); - makeRecipe(new ComparableStack(ModBlocks.machine_shredder, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 8), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModBlocks.steel_beam, 2), new ComparableStack(Blocks.iron_bars, 2) },200); + makeRecipe(new ComparableStack(ModBlocks.machine_shredder, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModBlocks.steel_beam, 2), new ComparableStack(Blocks.iron_bars, 2) },200); makeRecipe(new ComparableStack(ModBlocks.machine_well, 1), new AStack[] {new ComparableStack(ModBlocks.steel_scaffold, 20), new ComparableStack(ModItems.tank_steel, 2), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.pipes_steel, 1), new ComparableStack(ModItems.drill_titanium, 1) }, 200); makeRecipe(new ComparableStack(ModBlocks.machine_pumpjack, 1), new AStack[] {new ComparableStack(ModBlocks.steel_scaffold, 8), new OreDictStack(STEEL.plateWelded(), 8), new ComparableStack(ModItems.pipes_steel, 4), new ComparableStack(ModItems.tank_steel, 4), new OreDictStack(STEEL.plate(), 32), new ComparableStack(ModItems.drill_titanium, 1), new ComparableStack(ModItems.motor_desh) }, 400); - makeRecipe(new ComparableStack(ModBlocks.machine_flare, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(IRON.ingot(), 12), new OreDictStack(CU.plate528(), 4), new ComparableStack(ModItems.tank_steel, 1), new OreDictStack(STEEL.pipe(), 8), new OreDictStack(STEEL.shell(), 4), new ComparableStack(ModItems.thermo_element, 3), },200); - makeRecipe(new ComparableStack(ModBlocks.machine_coker, 1), new AStack[] {!exp ? new OreDictStack(STEEL.plateWelded(), 3) : new OreDictStack(STEEL.heavyComp(), 2), new OreDictStack(IRON.ingot(), 16), new OreDictStack(CU.plate528(), 8), new OreDictStack(RUBBER.ingot(), 4), new ComparableStack(ModItems.tank_steel, 2), new ComparableStack(ModBlocks.steel_grate, 4) },200); - makeRecipe(new ComparableStack(ModBlocks.machine_refinery, 1), new AStack[] {!exp ? new OreDictStack(STEEL.plateWelded(), 3) : new OreDictStack(STEEL.heavyComp(), 1), new OreDictStack(CU.plate528(), 16), new OreDictStack(STEEL.shell(), 6), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG) },350); + makeRecipe(new ComparableStack(ModBlocks.machine_flare, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(IRON.ingot(), 12), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.tank_steel, 1), new OreDictStack(STEEL.pipe(), 8), new OreDictStack(STEEL.shell(), 4), new ComparableStack(ModItems.thermo_element, 3), },200); + makeRecipe(new ComparableStack(ModBlocks.machine_coker, 1), new AStack[] {!exp ? new OreDictStack(STEEL.plateWelded(), 3) : new OreDictStack(STEEL.heavyComp(), 2), new OreDictStack(IRON.ingot(), 16), new OreDictStack(CU.plate(), 8), new OreDictStack(RUBBER.ingot(), 4), new ComparableStack(ModItems.tank_steel, 2), new ComparableStack(ModBlocks.steel_grate, 4) },200); + makeRecipe(new ComparableStack(ModBlocks.machine_refinery, 1), new AStack[] {!exp ? new OreDictStack(STEEL.plateWelded(), 3) : new OreDictStack(STEEL.heavyComp(), 1), new OreDictStack(CU.plate(), 16), new OreDictStack(STEEL.shell(), 6), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG) },350); makeRecipe(new ComparableStack(ModBlocks.machine_epress, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(ANY_RUBBER.ingot(), 4), new ComparableStack(ModItems.part_generic, 2, EnumPartType.PISTON_HYDRAULIC.ordinal()), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC) }, 100); makeRecipe(new ComparableStack(ModBlocks.machine_chemical_plant, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 8), new OreDictStack(CU.pipe(), 2), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.coil_tungsten, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG) }, 200); makeRecipe(new ComparableStack(ModBlocks.machine_crystallizer, 1), new AStack[] {new OreDictStack(STEEL.plateWelded(), 2), new OreDictStack(TI.shell(), 3), new OreDictStack(DESH.ingot(), 4), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.BASIC), },200); - makeRecipe(new ComparableStack(ModBlocks.machine_fluidtank, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(STEEL.plate528(), 6), new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_TAR.any(), 4), },150); - makeRecipe(new ComparableStack(ModBlocks.machine_bat9000, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 16), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16), },150); + makeRecipe(new ComparableStack(ModBlocks.machine_fluidtank, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(STEEL.plate(), 6), new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_TAR.any(), 4), },150); + makeRecipe(new ComparableStack(ModBlocks.machine_bat9000, 1), new AStack[] {new OreDictStack(STEEL.plate(), 16), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16), },150); makeRecipe(new ComparableStack(ModBlocks.machine_orbus, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 8), new OreDictStack(BIGMT.plate(), 12), new ComparableStack(ModItems.coil_advanced_alloy, 12), new ComparableStack(ModItems.battery_sc_polonium, 1) }, 200); - makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), !exp ? new OreDictStack(STEEL.plate528(), 16) : new OreDictStack(STEEL.heavyComp(), 3), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 3), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.motor, 3), !exp ? new OreDictStack(DURA.ingot(), 4) : new OreDictStack(DESH.heavyComp(), 1), new OreDictStack(DURA.bolt(), 8), new ComparableStack(ModBlocks.machine_battery, 3), },400); + makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), !exp ? new OreDictStack(STEEL.plate(), 16) : new OreDictStack(STEEL.heavyComp(), 3), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 3), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.motor, 3), !exp ? new OreDictStack(DURA.ingot(), 4) : new OreDictStack(DESH.heavyComp(), 1), new OreDictStack(DURA.bolt(), 8), new ComparableStack(ModBlocks.machine_battery, 3), },400); makeRecipe(new ComparableStack(ModBlocks.machine_turbofan, 1), new AStack[] {!exp ? new OreDictStack(TI.shell(), 8) : new OreDictStack(TI.heavyComp(), 1), new OreDictStack(DURA.pipe(), 4), new OreDictStack(ANY_PLASTIC.ingot(), 12), new ComparableStack(ModItems.turbine_tungsten, 1), new OreDictStack(GOLD.wireDense(), 12), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.BASIC.ordinal()) }, 300); makeRecipe(new ComparableStack(ModBlocks.machine_turbinegas, 1), new AStack[] {!exp ? new OreDictStack(STEEL.shell(), 10) : new OreDictStack(STEEL.heavyComp(), 2), new OreDictStack(GOLD.wireDense(), 12), new OreDictStack(DURA.pipe(), 4), new ComparableStack(ModBlocks.steel_scaffold, 8), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.turbine_tungsten, 3), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.ingot_rubber, 4), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.BASIC.ordinal())}, 600); - makeRecipe(new ComparableStack(ModBlocks.machine_teleporter, 1), new AStack[] {new OreDictStack(TI.ingot(), 8), new OreDictStack(ALLOY.plate528(), 12), new OreDictStack(GOLD.wireFine(), 32), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 1) },300); + makeRecipe(new ComparableStack(ModBlocks.machine_teleporter, 1), new AStack[] {new OreDictStack(TI.ingot(), 8), new OreDictStack(ALLOY.plate(), 12), new OreDictStack(GOLD.wireFine(), 32), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 1) },300); makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_transmutator, 1), new AStack[] {new OreDictStack(MAGTUNG.ingot(), 1), !exp ? new OreDictStack(TI.ingot(), 24) : new OreDictStack(TI.heavyComp(), 2), !exp ? new OreDictStack(ALLOY.plate(), 18) : new OreDictStack(ALLOY.heavyComp(), 1), new OreDictStack(STEEL.plateWelded(), 12), new ComparableStack(ModItems.plate_desh, 6), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModBlocks.machine_battery, 5), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.ADVANCED.ordinal()), },500); makeRecipe(new ComparableStack(ModBlocks.fusion_conductor, 1), new AStack[] {new ComparableStack(ModItems.coil_advanced_alloy, 5), }, 100); - makeRecipe(new ComparableStack(ModBlocks.fusion_center, 1), new AStack[] {new OreDictStack(ANY_HARDPLASTIC.ingot(), 4), new OreDictStack(STEEL.plate528(), 6), new OreDictStack(ALLOY.wireFine(), 24), },200); + makeRecipe(new ComparableStack(ModBlocks.fusion_center, 1), new AStack[] {new OreDictStack(ANY_HARDPLASTIC.ingot(), 4), new OreDictStack(STEEL.plate(), 6), new OreDictStack(ALLOY.wireFine(), 24), },200); makeRecipe(new ComparableStack(ModBlocks.fusion_motor, 1), new AStack[] {new OreDictStack(TI.ingot(), 4), new OreDictStack(STEEL.ingot(), 2), new ComparableStack(ModItems.motor, 4), },250); makeRecipe(new ComparableStack(ModBlocks.fusion_heater, 4), new AStack[] {new OreDictStack(W.plateWelded(), 2), new OreDictStack(STEEL.plateWelded(), 2), new OreDictStack(OreDictManager.getReflector(), 2), new ComparableStack(ModItems.magnetron, 2) }, 200); makeRecipe(new ComparableStack(ModBlocks.watz_element, 3), new AStack[] {new OreDictStack(STEEL.plateCast(), 2), new OreDictStack(ZR.ingot(), 2), new OreDictStack(BIGMT.ingot(), 2), new OreDictStack(ANY_HARDPLASTIC.ingot(), 4)},200); @@ -173,26 +173,26 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModItems.explosive_lenses, 1), new AStack[] {new OreDictStack(AL.plate(), 8), new OreDictStack(MINGRADE.wireFine(), 16), new OreDictStack(ANY_PLASTICEXPLOSIVE.ingot(), 4), new OreDictStack(CU.plate(), 2), new ComparableStack(ModItems.ball_tatb, 16), new OreDictStack(RUBBER.ingot(), 2)},500); //8 HE (To use 16 PBX ingots; rubber inserts) lenses w/ improved bridge-wire detonators, thin aluminum pushers, & duraluminum shell makeRecipe(new ComparableStack(ModItems.gadget_wireing, 1), new AStack[] {new OreDictStack(IRON.plate(), 1), new OreDictStack(GOLD.wireFine(), 12), },100); makeRecipe(new ComparableStack(ModItems.gadget_core, 1), new AStack[] {new OreDictStack(PU239.nugget(), 7), new OreDictStack(U238.nugget(), 3), },200); - makeRecipe(new ComparableStack(ModItems.boy_shielding, 1), new AStack[] {new OreDictStack(OreDictManager.getReflector(), 12), new OreDictStack(STEEL.plate528(), 4), },150); + makeRecipe(new ComparableStack(ModItems.boy_shielding, 1), new AStack[] {new OreDictStack(OreDictManager.getReflector(), 12), new OreDictStack(STEEL.plate(), 4), },150); makeRecipe(new ComparableStack(ModItems.boy_target, 1), new AStack[] {new OreDictStack(U235.nugget(), 18), },200); makeRecipe(new ComparableStack(ModItems.boy_bullet, 1), new AStack[] {new OreDictStack(U235.nugget(), 9), },100); - makeRecipe(new ComparableStack(ModItems.boy_propellant, 1), new AStack[] {new ComparableStack(ModItems.cordite, 8), new OreDictStack(IRON.plate528(), 8), new OreDictStack(AL.plate528(), 4), new OreDictStack(MINGRADE.wireFine(), 4), },100); - makeRecipe(new ComparableStack(ModItems.boy_igniter, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 1), new OreDictStack(AL.plate528(), 6), new OreDictStack(STEEL.plate528(), 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 3), },150); //HE for gating purposes - makeRecipe(new ComparableStack(ModItems.man_igniter, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 6), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 9), },150); + makeRecipe(new ComparableStack(ModItems.boy_propellant, 1), new AStack[] {new ComparableStack(ModItems.cordite, 8), new OreDictStack(IRON.plate(), 8), new OreDictStack(AL.plate(), 4), new OreDictStack(MINGRADE.wireFine(), 4), },100); + makeRecipe(new ComparableStack(ModItems.boy_igniter, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 1), new OreDictStack(AL.plate(), 6), new OreDictStack(STEEL.plate(), 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 3), },150); //HE for gating purposes + makeRecipe(new ComparableStack(ModItems.man_igniter, 1), new AStack[] {new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 9), },150); makeRecipe(new ComparableStack(ModItems.man_core, 1), new AStack[] {new OreDictStack(PU239.nugget(), 8), new OreDictStack(BE.nugget(), 2), },250); makeRecipe(new ComparableStack(ModItems.mike_core, 1), new AStack[] {new OreDictStack(U238.nugget(), 24), new OreDictStack(PB.ingot(), 6), },250); - makeRecipe(new ComparableStack(ModItems.mike_deut, 1), new AStack[] {new OreDictStack(IRON.plate528(), 12), new OreDictStack(STEEL.plate528(), 16), new ComparableStack(ModItems.cell_deuterium, 10), },200); - makeRecipe(new ComparableStack(ModItems.mike_cooling_unit, 1), new AStack[] {new OreDictStack(IRON.plate528(), 8), new ComparableStack(ModItems.coil_copper, 5), new ComparableStack(ModItems.coil_tungsten, 5), new ComparableStack(ModItems.motor, 2), },200); - makeRecipe(new ComparableStack(ModItems.fleija_igniter, 1), new AStack[] {new OreDictStack(TI.plate528(), 6), new OreDictStack(SA326.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), },300); + makeRecipe(new ComparableStack(ModItems.mike_deut, 1), new AStack[] {new OreDictStack(IRON.plate(), 12), new OreDictStack(STEEL.plate(), 16), new ComparableStack(ModItems.cell_deuterium, 10), },200); + makeRecipe(new ComparableStack(ModItems.mike_cooling_unit, 1), new AStack[] {new OreDictStack(IRON.plate(), 8), new ComparableStack(ModItems.coil_copper, 5), new ComparableStack(ModItems.coil_tungsten, 5), new ComparableStack(ModItems.motor, 2), },200); + makeRecipe(new ComparableStack(ModItems.fleija_igniter, 1), new AStack[] {new OreDictStack(TI.plate(), 6), new OreDictStack(SA326.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), },300); makeRecipe(new ComparableStack(ModItems.fleija_core, 1), new AStack[] {new OreDictStack(U235.nugget(), 8), new OreDictStack(NP237.nugget(), 2), new OreDictStack(BE.nugget(), 4), new ComparableStack(ModItems.coil_copper, 2), },500); makeRecipe(new ComparableStack(ModItems.fleija_propellant, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 3), new OreDictStack(SA326.plate(), 8), },400); - makeRecipe(new ComparableStack(ModItems.solinium_igniter, 1), new AStack[] {new OreDictStack(TI.plate528(), 4), new OreDictStack(ALLOY.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new ComparableStack(ModItems.coil_gold, 1), },400); + makeRecipe(new ComparableStack(ModItems.solinium_igniter, 1), new AStack[] {new OreDictStack(TI.plate(), 4), new OreDictStack(ALLOY.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new ComparableStack(ModItems.coil_gold, 1), },400); makeRecipe(new ComparableStack(ModItems.solinium_core, 1), new AStack[] {new OreDictStack(SA327.nugget(), 9), new OreDictStack(EUPH.nugget(), 1), },400); makeRecipe(new ComparableStack(ModItems.solinium_propellant, 1), new AStack[] {new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 3), new OreDictStack(OreDictManager.getReflector(), 2), new ComparableStack(ModItems.plate_polymer, 6), new OreDictStack(W.wireFine(), 6), new ComparableStack(ModItems.biomass_compressed, 4), },350); makeRecipe(new ComparableStack(ModItems.schrabidium_hammer, 1), new AStack[] {new OreDictStack(SA326.block(), 35), new ComparableStack(ModItems.billet_yharonite, 128), new ComparableStack(Items.nether_star, 3), new ComparableStack(ModItems.fragment_meteorite, 512), },1000); - makeRecipe(new ComparableStack(ModBlocks.machine_radar, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 8), new OreDictStack(ANY_PLASTIC.ingot(), 8), new OreDictStack(ANY_RUBBER.ingot(), 8), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC.ordinal()), new ComparableStack(ModItems.coil_copper, 12), new ComparableStack(ModItems.crt_display, 4), },300); + makeRecipe(new ComparableStack(ModBlocks.machine_radar, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(ANY_PLASTIC.ingot(), 8), new OreDictStack(ANY_RUBBER.ingot(), 8), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC.ordinal()), new ComparableStack(ModItems.coil_copper, 12), new ComparableStack(ModItems.crt_display, 4), },300); makeRecipe(new ComparableStack(ModBlocks.machine_radar_large, 1), new AStack[] {new OreDictStack(STEEL.plateWelded(), 6), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(ANY_PLASTIC.ingot(), 16), new OreDictStack(ANY_RUBBER.ingot(), 16), new ComparableStack(ModItems.magnetron, 12), new ComparableStack(ModItems.motor_desh, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.ADVANCED), new ComparableStack(ModItems.coil_copper, 32), new ComparableStack(ModItems.crt_display, 4), },600); - makeRecipe(new ComparableStack(ModBlocks.machine_forcefield, 1), new AStack[] {new OreDictStack(ALLOY.plate528(), 8), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.coil_gold_torus, 6), new ComparableStack(ModItems.coil_magnetized_tungsten, 12), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.upgrade_radius, 1), new ComparableStack(ModItems.upgrade_health, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.ADVANCED), new ComparableStack(ModBlocks.machine_transformer, 1), },1000); + makeRecipe(new ComparableStack(ModBlocks.machine_forcefield, 1), new AStack[] {new OreDictStack(ALLOY.plate(), 8), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.coil_gold_torus, 6), new ComparableStack(ModItems.coil_magnetized_tungsten, 12), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.upgrade_radius, 1), new ComparableStack(ModItems.upgrade_health, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.ADVANCED), new ComparableStack(ModBlocks.machine_transformer, 1), },1000); makeRecipe(new ComparableStack(ModItems.mp_thruster_10_kerosene, 1), new AStack[] {new ComparableStack(ModItems.seg_10, 1), new OreDictStack(STEEL.pipe(), 1), new OreDictStack(W.ingot(), 4), new OreDictStack(STEEL.plate(), 4), },100); makeRecipe(new ComparableStack(ModItems.mp_thruster_10_solid, 1), new AStack[] {new ComparableStack(ModItems.seg_10, 1), new ComparableStack(ModItems.coil_tungsten, 1), new OreDictStack(DURA.ingot(), 4), new OreDictStack(STEEL.plate(), 4), },100); makeRecipe(new ComparableStack(ModItems.mp_thruster_10_xenon, 1), new AStack[] {new ComparableStack(ModItems.seg_10, 1), new OreDictStack(STEEL.plate(), 4), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.arc_electrode, 4), },100); @@ -372,7 +372,7 @@ import net.minecraft.item.ItemStack; new ComparableStack(ModItems.ingot_cft, 128) }, 1200); makeRecipe(new ComparableStack(ModBlocks.machine_combustion_engine, 1), new AStack[] { - new OreDictStack(STEEL.plate528(), 16), + new OreDictStack(STEEL.plate(), 16), new OreDictStack(CU.ingot(), 12), new OreDictStack(GOLD.wireDense(), 8), new OreDictStack(STEEL.shell(), 3), @@ -487,7 +487,7 @@ import net.minecraft.item.ItemStack; }, 100); makeRecipe(new ComparableStack(ModBlocks.machine_large_turbine, 1), new AStack[] { - !exp ? new OreDictStack(STEEL.plate528(), 12) : new OreDictStack(STEEL.heavyComp(), 1), + !exp ? new OreDictStack(STEEL.plate(), 12) : new OreDictStack(STEEL.heavyComp(), 1), new OreDictStack(RUBBER.ingot(), 4), new ComparableStack(ModItems.turbine_titanium, 3), new OreDictStack(GOLD.wireDense(), 6), @@ -498,7 +498,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_chungus, 1), new AStack[] { new OreDictStack(STEEL.shell(), 6), !exp ? new OreDictStack(STEEL.plateWelded(), 16) : new OreDictStack(STEEL.heavyComp(), 3), - !exp ? new OreDictStack(TI.plate528(), 12) : new OreDictStack(TI.heavyComp(), 1), + !exp ? new OreDictStack(TI.plate(), 12) : new OreDictStack(TI.heavyComp(), 1), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 16), new ComparableStack(ModItems.turbine_tungsten, 5), new ComparableStack(ModItems.turbine_titanium, 3), @@ -511,7 +511,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_condenser_powered, 1), new AStack[] { !exp ? new OreDictStack(STEEL.plateWelded(), 8) : new OreDictStack(STEEL.heavyComp(), 3), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 4), - !exp ? new OreDictStack(CU.plate528(), 16) : new OreDictStack(CU.heavyComp(), 3), + !exp ? new OreDictStack(CU.plate(), 16) : new OreDictStack(CU.heavyComp(), 3), new ComparableStack(ModItems.motor_desh, 3), new OreDictStack(STEEL.pipe(), 24), new OreDictStack(Fluids.LUBRICANT.getDict(1_000), 4) @@ -521,8 +521,8 @@ import net.minecraft.item.ItemStack; new ComparableStack(ModBlocks.machine_lithium_battery, 3), new OreDictStack(ND.wireDense(), 32), !exp ? new OreDictStack(STEEL.ingot(), 16) : new OreDictStack(STEEL.heavyComp(), 3), - new OreDictStack(STEEL.plate528(), 32), - new OreDictStack(AL.plate528(), 32), + new OreDictStack(STEEL.plate(), 32), + new OreDictStack(AL.plate(), 32), new OreDictStack(ANY_PLASTIC.ingot(), 24), new OreDictStack(RUBBER.ingot(), 24), new OreDictStack(CU.plateCast(), 8), @@ -772,7 +772,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.rbmk_blank, 1), new AStack[] { new ComparableStack(ModBlocks.concrete_asbestos, 4), - !exp ? new OreDictStack(STEEL.plate528(), 4) : new OreDictStack(STEEL.plateCast(), 16), + !exp ? new OreDictStack(STEEL.plate(), 4) : new OreDictStack(STEEL.plateCast(), 16), new OreDictStack(CU.ingot(), 4), new ComparableStack(ModItems.plate_polymer, 4) }, 100); @@ -793,14 +793,14 @@ import net.minecraft.item.ItemStack; new ComparableStack(ModBlocks.machine_difurnace_off, 1), new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(DESH.ingot(), 4), - new OreDictStack(PB.plate528(), 6), + new OreDictStack(PB.plate(), 6), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(CU.plate(), 12) }, 150); makeRecipe(new ComparableStack(ModBlocks.machine_vacuum_distill, 1), new AStack[] { !exp ? new OreDictStack(STEEL.plateCast(), 16) : new OreDictStack(STEEL.heavyComp(), 4), - !exp ? new OreDictStack(CU.plate528(), 16) : new OreDictStack(CU.heavyComp(), 4), + !exp ? new OreDictStack(CU.plate(), 16) : new OreDictStack(CU.heavyComp(), 4), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new ComparableStack(ModItems.sphere_steel, 1), new OreDictStack(STEEL.pipe(), 12), @@ -809,7 +809,7 @@ import net.minecraft.item.ItemStack; }, 200); makeRecipe(new ComparableStack(ModBlocks.machine_catalytic_reformer, 1), new AStack[] { !exp ? new OreDictStack(STEEL.plateCast(), 12) : new OreDictStack(STEEL.heavyComp(), 4), - !exp ? new OreDictStack(CU.plate528(), 8) : new OreDictStack(CU.heavyComp(), 2), + !exp ? new OreDictStack(CU.plate(), 8) : new OreDictStack(CU.heavyComp(), 2), new OreDictStack(NB.ingot(), 8), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(STEEL.shell(), 3), @@ -838,7 +838,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_compressor, 1), new AStack[] { new OreDictStack(STEEL.plateCast(), 8), - new OreDictStack(CU.plate528(), 4), + new OreDictStack(CU.plate(), 4), new OreDictStack(STEEL.shell(), 2), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG) @@ -853,7 +853,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_electrolyser, 1), new AStack[] { !exp ? new OreDictStack(STEEL.plateCast(), 8) : new OreDictStack(STEEL.heavyComp(), 2), - !exp ? new OreDictStack(CU.plate528(), 16) : new OreDictStack(CU.heavyComp(), 1), + !exp ? new OreDictStack(CU.plate(), 16) : new OreDictStack(CU.heavyComp(), 1), new OreDictStack(RUBBER.ingot(), 8), new OreDictStack(STEEL.shell(), 3), new ComparableStack(ModItems.ingot_firebrick, 16), @@ -1069,8 +1069,8 @@ import net.minecraft.item.ItemStack; new ComparableStack(ModBlocks.hadron_coil_neodymium, 8), new OreDictStack(ALLOY.wireFine(), 64), new OreDictStack(STEEL.ingot(), 16), - new OreDictStack(STEEL.plate528(), 32), - new OreDictStack(AL.plate528(), 32), + new OreDictStack(STEEL.plate(), 32), + new OreDictStack(AL.plate(), 32), new OreDictStack(ANY_PLASTIC.ingot(), 24), new OreDictStack(RUBBER.ingot(), 24), new OreDictStack(CU.plateCast(), 8), @@ -1080,7 +1080,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.rbmk_console, 1), new AStack[] { new OreDictStack(STEEL.ingot(), 16), - new OreDictStack(AL.plate528(), 32), + new OreDictStack(AL.plate(), 32), new OreDictStack(ANY_RUBBER.ingot(), 16), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC), new ComparableStack(ModItems.circuit, 20, EnumCircuitType.CAPACITOR_BOARD), @@ -1089,7 +1089,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.rbmk_crane_console, 1), new AStack[] { new OreDictStack(STEEL.ingot(), 16), - new OreDictStack(AL.plate528(), 8), + new OreDictStack(AL.plate(), 8), new OreDictStack(ANY_RUBBER.ingot(), 4), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC), new ComparableStack(ModItems.circuit, 10, EnumCircuitType.CAPACITOR_BOARD), @@ -1145,7 +1145,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_liquefactor), new AStack[] { new OreDictStack(STEEL.ingot(), 8), - new OreDictStack(CU.plate528(), 12), + new OreDictStack(CU.plate(), 12), new OreDictStack(ANY_TAR.any(), 8), new OreDictStack(STEEL.shell(), 3), new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CAPACITOR), @@ -1155,7 +1155,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_solidifier), new AStack[] { new OreDictStack(ANY_CONCRETE.any(), 8), - new OreDictStack(AL.plate528(), 12), + new OreDictStack(AL.plate(), 12), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(STEEL.shell(), 3), new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CAPACITOR), @@ -1166,7 +1166,7 @@ import net.minecraft.item.ItemStack; makeRecipe(new ComparableStack(ModBlocks.machine_radiolysis), new AStack[] { new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(RUBBER.ingot(), 8), - new OreDictStack(PB.plate528(), 12), + new OreDictStack(PB.plate(), 12), new OreDictStack(CU.plateCast(), 4), new OreDictStack(STEEL.shell(), 2), new ComparableStack(ModItems.thermo_element, 8) diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java index ec301f766..2daebaf5f 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java @@ -125,7 +125,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { // machine parts this.register(new GenericRecipe("ass.centrifugetower").setup(100, 100).outputItems(new ItemStack(ModItems.centrifuge_element, 1)) - .inputItems(new OreDictStack(DURA.plate528(), 4), new OreDictStack(TI.plate528(), 4), new ComparableStack(ModItems.motor, 1))); + .inputItems(new OreDictStack(DURA.plate(), 4), new OreDictStack(TI.plate(), 4), new ComparableStack(ModItems.motor, 1))); this.register(new GenericRecipe("ass.reactorcore").setup(100, 100).outputItems(new ItemStack(ModItems.reactor_core, 1)) .inputItems(new OreDictStack(PB.plateCast(), 4), new OreDictStack(BE.ingot(), 8), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(ASBESTOS.ingot(), 4))); this.register(new GenericRecipe("ass.thermoelement").setup(60, 100).outputItems(new ItemStack(ModItems.thermo_element, 1)) @@ -222,7 +222,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { // machines this.register(new GenericRecipe("ass.shredder").setup(100, 100).outputItems(new ItemStack(ModBlocks.machine_shredder, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 8), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2)) + .inputItems(new OreDictStack(STEEL.plate(), 8), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2))); this.register(new GenericRecipe("ass.assembler").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_assembly_machine, 1)) .inputItems(new OreDictStack(STEEL.ingot(), 4), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG))); @@ -235,10 +235,10 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.precass").setup(1_200, 100).outputItems(new ItemStack(ModBlocks.machine_precass, 1)) .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(ZR.ingot(), 8), new ComparableStack(ModItems.motor, 4), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.CAPACITOR_BOARD))); this.register(new GenericRecipe("ass.centrifuge").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_centrifuge, 1)) - .inputItems(new ComparableStack(ModItems.centrifuge_element, 1), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(STEEL.plate528(), 8), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)) + .inputItems(new ComparableStack(ModItems.centrifuge_element, 1), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(STEEL.plate(), 8), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)) .inputItemsEx(new ComparableStack(ModItems.centrifuge_element, 1), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.item_expensive, 3, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.plateCast(), 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG))); this.register(new GenericRecipe("ass.gascent").setup(400, 100).outputItems(new ItemStack(ModBlocks.machine_gascent, 1)) - .inputItems(new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(ANY_PLASTIC.ingot(), 8), new OreDictStack(DESH.ingot(), 2), new OreDictStack(STEEL.plate528(), 8), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal())) + .inputItems(new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(ANY_PLASTIC.ingot(), 8), new OreDictStack(DESH.ingot(), 2), new OreDictStack(STEEL.plate(), 8), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal())) .inputItemsEx(new ComparableStack(ModItems.centrifuge_element, 4), new OreDictStack(STEEL.plateWelded(), 4), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.arcfurnace").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_arc_furnace, 1)) .inputItems(new OreDictStack(ANY_CONCRETE.any(), 12), new OreDictStack(ANY_PLASTIC.ingot(), 8), new ComparableStack(ModItems.ingot_firebrick, 16),new OreDictStack(STEEL.plateCast(), 8), new ComparableStack(ModBlocks.machine_transformer, 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG.ordinal())) @@ -247,10 +247,10 @@ public class AssemblyMachineRecipes extends GenericRecipes { .inputItems(new OreDictStack(STEEL.plateWelded(), 2), new OreDictStack(TI.shell(), 3), new OreDictStack(DESH.ingot(), 4), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.BASIC)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(TI.shell(), 3), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.electrolyzer").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_electrolyser, 1)) - .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(CU.plate528(), 16), new OreDictStack(TI.shell(), 3), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModItems.ingot_firebrick, 16), new ComparableStack(ModItems.coil_copper, 16), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC)) + .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(CU.plate(), 16), new OreDictStack(TI.shell(), 3), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModItems.ingot_firebrick, 16), new ComparableStack(ModItems.coil_copper, 16), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(TI.shell(), 3), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModItems.ingot_firebrick, 16), new ComparableStack(ModItems.coil_copper, 16), new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.rtg").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_rtg_grey, 1)) - .inputItems(new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(STEEL.plate528(), 4), new OreDictStack(MINGRADE.wireFine(), 16), new OreDictStack(ANY_PLASTIC.ingot(), 4))); + .inputItems(new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(STEEL.plate(), 4), new OreDictStack(MINGRADE.wireFine(), 16), new OreDictStack(ANY_PLASTIC.ingot(), 4))); this.register(new GenericRecipe("ass.derrick").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_well, 1)) .inputItems(new OreDictStack(STEEL.plate(), 8), new OreDictStack(CU.plateCast(), 2), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.drill_titanium, 1)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.STEEL_PLATING), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.drill_titanium, 1))); @@ -261,25 +261,25 @@ public class AssemblyMachineRecipes extends GenericRecipes { .inputItems(new OreDictStack(STEEL.shell(), 24), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModBlocks.concrete_smooth, 64), new ComparableStack(ModItems.drill_titanium), new ComparableStack(ModItems.motor_desh, 2), new ComparableStack(ModItems.plate_desh, 24), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CAPACITOR)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.FERRO_PLATING), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModBlocks.concrete_smooth, 64), new ComparableStack(ModItems.drill_titanium), new ComparableStack(ModItems.motor_desh, 5), new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.flarestack").setup(100, 100).outputItems(new ItemStack(ModBlocks.machine_flare, 1)) - .inputItems(new OreDictStack(STEEL.plate(), 12), new OreDictStack(CU.plate528(), 4), new OreDictStack(STEEL.shell(), 4), new ComparableStack(ModItems.thermo_element, 3)) - .inputItemsEx(new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.plate528(), 4), new ComparableStack(ModItems.thermo_element, 3))); + .inputItems(new OreDictStack(STEEL.plate(), 12), new OreDictStack(CU.plate(), 4), new OreDictStack(STEEL.shell(), 4), new ComparableStack(ModItems.thermo_element, 3)) + .inputItemsEx(new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.thermo_element, 3))); this.register(new GenericRecipe("ass.refinery").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_refinery, 1)) - .inputItems(new OreDictStack(STEEL.plateWelded(), 3), new OreDictStack(CU.plate528(), 8), new OreDictStack(STEEL.shell(), 4), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG)) + .inputItems(new OreDictStack(STEEL.plateWelded(), 3), new OreDictStack(CU.plate(), 8), new OreDictStack(STEEL.shell(), 4), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.STEEL_PLATING), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.circuit, 5, EnumCircuitType.ANALOG))); this.register(new GenericRecipe("ass.crackingtower").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_catalytic_cracker, 1)) .inputItems(new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(STEEL.shell(), 6), new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(NB.ingot(), 2), new ComparableStack(ModItems.catalyst_clay, 12)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.STEEL_PLATING), new OreDictStack(ANY_PLASTIC.ingot(), 16), new OreDictStack(NB.ingot(), 4))); this.register(new GenericRecipe("ass.radiolysis").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_radiolysis, 1)) - .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(PB.plate528(), 12), new OreDictStack(CU.plateCast(), 4), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModItems.thermo_element, 8)) + .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(PB.plate(), 12), new OreDictStack(CU.plateCast(), 4), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModItems.thermo_element, 8)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.LEAD_PLATING), new OreDictStack(CU.plateCast(), 4), new OreDictStack(RUBBER.ingot(), 16), new ComparableStack(ModItems.thermo_element, 8))); this.register(new GenericRecipe("ass.coker").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_coker, 1)) - .inputItems(new OreDictStack(STEEL.plateWelded(), 8), new OreDictStack(STEEL.shell(), 4), new OreDictStack(CU.plate528(), 8), new OreDictStack(RUBBER.ingot(), 4), new OreDictStack(NB.ingot(), 4)) + .inputItems(new OreDictStack(STEEL.plateWelded(), 8), new OreDictStack(STEEL.shell(), 4), new OreDictStack(CU.plate(), 8), new OreDictStack(RUBBER.ingot(), 4), new OreDictStack(NB.ingot(), 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.STEEL_PLATING), new OreDictStack(RUBBER.ingot(), 16), new OreDictStack(NB.ingot(), 4))); this.register(new GenericRecipe("ass.vaccumrefinery").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_vacuum_distill, 1)) - .inputItems(new OreDictStack(STEEL.plateCast(), 16), new OreDictStack(CU.plate528(), 16), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new ComparableStack(ModItems.sphere_steel, 1), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.motor_desh, 3), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.CHIP_BISMOID)) + .inputItems(new OreDictStack(STEEL.plateCast(), 16), new OreDictStack(CU.plate(), 16), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new ComparableStack(ModItems.sphere_steel, 1), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.motor_desh, 3), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.CHIP_BISMOID)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.BRONZE_TUBES), new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.FERRO_PLATING), new OreDictStack(DURA.pipe(), 16), new ComparableStack(ModItems.motor_desh, 3), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CHIP_BISMOID), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.COMPUTER))); this.register(new GenericRecipe("ass.reformer").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_catalytic_reformer, 1)) - .inputItems(new OreDictStack(STEEL.plateCast(), 12), new OreDictStack(CU.plate528(), 8), new OreDictStack(NB.ingot(), 8), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(STEEL.shell(), 3), new OreDictStack(STEEL.pipe(), 8), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BISMOID)) + .inputItems(new OreDictStack(STEEL.plateCast(), 12), new OreDictStack(CU.plate(), 8), new OreDictStack(NB.ingot(), 8), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(STEEL.shell(), 3), new OreDictStack(STEEL.pipe(), 8), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BISMOID)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.BRONZE_TUBES), new OreDictStack(NB.ingot(), 8), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(DURA.pipe(), 16), new ComparableStack(ModItems.motor, 8), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BISMOID), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.COMPUTER))); this.register(new GenericRecipe("ass.hydrotreater").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_hydrotreater, 1)) .inputItems(new OreDictStack(STEEL.plateWelded(), 8), new OreDictStack(CU.plateCast(), 4), new OreDictStack(NB.ingot(), 8), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(STEEL.shell(), 2), new OreDictStack(STEEL.pipe(), 8), new ComparableStack(ModItems.motor_desh, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BISMOID)) @@ -288,13 +288,13 @@ public class AssemblyMachineRecipes extends GenericRecipes { .inputItems(new OreDictStack(STEEL.plateWelded(), 16), new OreDictStack(ANY_HARDPLASTIC.ingot(), 16), new ComparableStack(ModItems.ingot_cft, 4), new OreDictStack(CU.pipe(), 12), new ComparableStack(ModItems.motor_desh, 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BISMOID)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 6, EnumExpensiveType.BRONZE_TUBES), new OreDictStack(ANY_HARDPLASTIC.ingot(), 32), new ComparableStack(ModItems.ingot_cft, 4), new ComparableStack(ModItems.motor_bismuth, 4), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BISMOID), new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.COMPUTER))); this.register(new GenericRecipe("ass.liquefactor").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_liquefactor, 1)) - .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(CU.plate528(), 12), new OreDictStack(ANY_TAR.any(), 4), new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CAPACITOR), new ComparableStack(ModItems.coil_tungsten, 8)) + .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(CU.plate(), 12), new OreDictStack(ANY_TAR.any(), 4), new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CAPACITOR), new ComparableStack(ModItems.coil_tungsten, 8)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(ANY_TAR.any(), 16), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CAPACITOR))); this.register(new GenericRecipe("ass.solidifier").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_solidifier, 1)) - .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(AL.plate528(), 12), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CAPACITOR), new ComparableStack(ModItems.coil_copper, 4)) + .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(AL.plate(), 12), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CAPACITOR), new ComparableStack(ModItems.coil_copper, 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(ANY_PLASTIC.ingot(), 16), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CAPACITOR))); this.register(new GenericRecipe("ass.compressor").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_compressor, 1)) - .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(CU.plate528(), 4), new OreDictStack(STEEL.shell(), 2), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)) + .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(CU.plate(), 4), new OreDictStack(STEEL.shell(), 2), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 3, EnumExpensiveType.STEEL_PLATING), new OreDictStack(STEEL.shell(), 4), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG))); this.register(new GenericRecipe("ass.compactcompressor").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_compressor_compact, 1)) .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(TI.shell(), 4), new OreDictStack(CU.pipe(), 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC)) @@ -333,20 +333,20 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.slopper").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_ore_slopper, 1)) .inputItems(new OreDictStack(STEEL.plateCast(), 6), new OreDictStack(TI.plate(), 8), new OreDictStack(CU.pipe(), 3), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG))); this.register(new GenericRecipe("ass.mininglaser").setup(400, 100).outputItems(new ItemStack(ModBlocks.machine_mining_laser, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 16), new OreDictStack(TI.shell(), 4), new OreDictStack(DURA.plate(), 4), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 3), new OreDictStack(ANY_PLASTIC.ingot(), 8), new ComparableStack(ModItems.motor, 3)) + .inputItems(new OreDictStack(STEEL.plate(), 16), new OreDictStack(TI.shell(), 4), new OreDictStack(DURA.plate(), 4), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 3), new OreDictStack(ANY_PLASTIC.ingot(), 8), new ComparableStack(ModItems.motor, 3)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(DURA.plate(), 4), new ComparableStack(ModItems.crystal_redstone, 12), new OreDictStack(ANY_PLASTIC.ingot(), 16), new ComparableStack(ModItems.motor_desh, 3))); this.register(new GenericRecipe("ass.teleporter").setup(100, 100).outputItems(new ItemStack(ModBlocks.machine_teleporter, 1)) - .inputItems(new OreDictStack(TI.plate(), 12), new OreDictStack(ALLOY.plate528(), 12), new OreDictStack(GOLD.wireFine(), 32), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 1))); + .inputItems(new OreDictStack(TI.plate(), 12), new OreDictStack(ALLOY.plate(), 12), new OreDictStack(GOLD.wireFine(), 32), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 1))); this.register(new GenericRecipe("ass.radar").setup(300, 100).outputItems(new ItemStack(ModBlocks.machine_radar, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 12), new OreDictStack(ANY_RUBBER.ingot(), 12), new ComparableStack(ModItems.magnetron, 5), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC.ordinal()), new ComparableStack(ModItems.crt_display, 4)) + .inputItems(new OreDictStack(STEEL.plate(), 12), new OreDictStack(ANY_RUBBER.ingot(), 12), new ComparableStack(ModItems.magnetron, 5), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.BASIC.ordinal()), new ComparableStack(ModItems.crt_display, 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.magnetron, 16), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.CIRCUIT), new ComparableStack(ModItems.crt_display, 4))); this.register(new GenericRecipe("ass.radarlarge").setup(400, 100).outputItems(new ItemStack(ModBlocks.machine_radar_large, 1)) .inputItems(new OreDictStack(STEEL.plateWelded(), 6), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(ANY_RUBBER.ingot(), 24), new ComparableStack(ModItems.magnetron, 16), new ComparableStack(ModItems.motor_desh, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.ADVANCED), new ComparableStack(ModItems.crt_display, 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 8), new OreDictStack(ANY_RUBBER.ingot(), 24), new ComparableStack(ModItems.magnetron, 16), new ComparableStack(ModItems.motor_desh, 3), new ComparableStack(ModItems.item_expensive, 6, EnumExpensiveType.CIRCUIT), new ComparableStack(ModItems.crt_display, 4))); this.register(new GenericRecipe("ass.forcefield").setup(600, 100).outputItems(new ItemStack(ModBlocks.machine_forcefield, 1)) - .inputItems(new OreDictStack(ALLOY.plate528(), 8), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.coil_gold_torus, 6), new ComparableStack(ModItems.coil_magnetized_tungsten, 12), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.upgrade_radius, 1), new ComparableStack(ModItems.upgrade_health, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.ADVANCED), new ComparableStack(ModBlocks.machine_transformer, 1))); + .inputItems(new OreDictStack(ALLOY.plate(), 8), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.coil_gold_torus, 6), new ComparableStack(ModItems.coil_magnetized_tungsten, 12), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.upgrade_radius, 1), new ComparableStack(ModItems.upgrade_health, 1), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.ADVANCED), new ComparableStack(ModBlocks.machine_transformer, 1))); this.register(new GenericRecipe("ass.difurnacertg").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_difurnace_rtg_off, 1)) - .inputItems(new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(DESH.ingot(), 4), new OreDictStack(PB.plate528(), 6), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(CU.plate(), 12))); + .inputItems(new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(DESH.ingot(), 4), new OreDictStack(PB.plate(), 6), new OreDictStack(OreDictManager.getReflector(), 8), new OreDictStack(CU.plate(), 12))); this.register(new GenericRecipe("ass.strandcaster").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_strand_caster, 1)) .inputItems(new ComparableStack(ModItems.ingot_firebrick, 16), new OreDictStack(STEEL.plateCast(), 6), new OreDictStack(CU.plateWelded(), 2), new OreDictStack(STEEL.shell(), 2), new OreDictStack(ANY_CONCRETE.any(), 8)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.ingot_firebrick, 16), new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_CONCRETE.any(), 8))); @@ -362,7 +362,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { .inputItems(new OreDictStack(STEEL.shell(), 1), new OreDictStack(CU.plateCast(), 2), new ComparableStack(ModItems.coil_copper, 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.STEEL_PLATING), new OreDictStack(CU.pipe(), 2), new ComparableStack(ModItems.coil_copper, 4))); this.register(new GenericRecipe("ass.combustiongen").setup(300, 100).outputItems(new ItemStack(ModBlocks.machine_combustion_engine, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 16), new OreDictStack(CU.ingot(), 12), new OreDictStack(GOLD.wireDense(), 8), new ComparableStack(ModItems.canister_empty, 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC)) + .inputItems(new OreDictStack(STEEL.plate(), 16), new OreDictStack(CU.ingot(), 12), new OreDictStack(GOLD.wireDense(), 8), new ComparableStack(ModItems.canister_empty, 4), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(GOLD.wireDense(), 16), new ComparableStack(ModItems.canister_empty, 4), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.pistonsetsteel").setup(200, 100).outputItems(new ItemStack(ModItems.piston_set, 1, EnumPistonType.STEEL.ordinal())) .inputItems(new OreDictStack(STEEL.plate(), 16), new OreDictStack(CU.plate(), 4), new OreDictStack(W.ingot(), 8), new OreDictStack(W.bolt(), 16))); @@ -382,10 +382,10 @@ public class AssemblyMachineRecipes extends GenericRecipes { .inputItems(new OreDictStack(STEEL.pipe(), 12), new OreDictStack(STEEL.ingot(), 24), new OreDictStack(CU.plate(), 24), new OreDictStack(NB.ingot(), 4), new OreDictStack(RUBBER.ingot(), 12), new ComparableStack(ModBlocks.glass_quartz, 16)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.HEAVY_FRAME), new OreDictStack(NB.ingot(), 16), new OreDictStack(RUBBER.ingot(), 16), new ComparableStack(ModBlocks.glass_quartz, 16))); this.register(new GenericRecipe("ass.iturbine").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_large_turbine, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 12), new OreDictStack(RUBBER.ingot(), 4), new ComparableStack(ModItems.turbine_titanium, 3), new OreDictStack(GOLD.wireDense(), 6), new OreDictStack(DURA.pipe(), 3), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC)) + .inputItems(new OreDictStack(STEEL.plate(), 12), new OreDictStack(RUBBER.ingot(), 4), new ComparableStack(ModItems.turbine_titanium, 3), new OreDictStack(GOLD.wireDense(), 6), new OreDictStack(DURA.pipe(), 3), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BASIC)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.turbine_titanium, 3), new OreDictStack(GOLD.wireDense(), 16), new OreDictStack(DURA.pipe(), 16), new ComparableStack(ModItems.item_expensive, 3, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.leviturbine").setup(600, 100).outputItems(new ItemStack(ModBlocks.machine_chungus, 1)) - .inputItems(new OreDictStack(STEEL.shell(), 6), new OreDictStack(STEEL.plateWelded(), 16), new OreDictStack(TI.plate528(), 12), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 16), new ComparableStack(ModItems.turbine_tungsten, 5), new ComparableStack(ModItems.turbine_titanium, 3), new ComparableStack(ModItems.flywheel_beryllium, 1), new OreDictStack(GOLD.wireDense(), 48), new OreDictStack(DURA.pipe(), 16), new OreDictStack(STEEL.pipe(), 16)) + .inputItems(new OreDictStack(STEEL.shell(), 6), new OreDictStack(STEEL.plateWelded(), 16), new OreDictStack(TI.plate(), 12), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 16), new ComparableStack(ModItems.turbine_tungsten, 5), new ComparableStack(ModItems.turbine_titanium, 3), new ComparableStack(ModItems.flywheel_beryllium, 1), new OreDictStack(GOLD.wireDense(), 48), new OreDictStack(DURA.pipe(), 16), new OreDictStack(STEEL.pipe(), 16)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModItems.turbine_tungsten, 5), new ComparableStack(ModItems.turbine_titanium, 12), new ComparableStack(ModItems.flywheel_beryllium, 1), new OreDictStack(GOLD.wireDense(), 64))); this.register(new GenericRecipe("ass.radgen").setup(400, 100).outputItems(new ItemStack(ModBlocks.machine_radgen, 1)).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + "radgen") .inputItems(new OreDictStack(STEEL.ingot(), 8), new OreDictStack(STEEL.plate(), 32), new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new OreDictStack(MAGTUNG.wireFine(), 24), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BASIC), new ComparableStack(ModItems.reactor_core, 3), new OreDictStack(STAR.ingot(), 1), new OreDictStack(KEY_RED, 1)) @@ -393,7 +393,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { // condensers this.register(new GenericRecipe("ass.hpcondenser").setup(600, 100).outputItems(new ItemStack(ModBlocks.machine_condenser_powered, 1)) - .inputItems(new OreDictStack(STEEL.plateWelded(), 8), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 4), new OreDictStack(CU.plate528(), 16), new ComparableStack(ModItems.motor_desh, 3), new OreDictStack(STEEL.pipe(), 24), new OreDictStack(Fluids.LUBRICANT.getDict(1_000), 4)) + .inputItems(new OreDictStack(STEEL.plateWelded(), 8), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 4), new OreDictStack(CU.plate(), 16), new ComparableStack(ModItems.motor_desh, 3), new OreDictStack(STEEL.pipe(), 24), new OreDictStack(Fluids.LUBRICANT.getDict(1_000), 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModItems.motor_desh, 5), new OreDictStack(STEEL.pipe(), 24), new OreDictStack(Fluids.LUBRICANT.getDict(1_000), 16))); // batteries @@ -433,10 +433,10 @@ public class AssemblyMachineRecipes extends GenericRecipes { // fluid tanks this.register(new GenericRecipe("ass.tank").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_fluidtank, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 8), new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_TAR.any(), 4)) + .inputItems(new OreDictStack(STEEL.plate(), 8), new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_TAR.any(), 4)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.STEEL_PLATING), new OreDictStack(ANY_TAR.any(), 4))); this.register(new GenericRecipe("ass.bat9k").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_bat9000, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 16), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16)) + .inputItems(new OreDictStack(STEEL.plate(), 16), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16))); this.register(new GenericRecipe("ass.orbus").setup(300, 100).outputItems(new ItemStack(ModBlocks.machine_orbus, 1)) .inputItems(new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 8), new OreDictStack(BIGMT.plateCast(), 4), new ComparableStack(ModItems.coil_advanced_alloy, 12), new ComparableStack(ModItems.battery_sc_polonium, 1)) @@ -444,7 +444,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { // accelerators this.register(new GenericRecipe("ass.cyclotron").setup(600, 100).outputItems(new ItemStack(ModBlocks.machine_cyclotron, 1)) - .inputItems(new ComparableStack(ModBlocks.machine_lithium_battery, 3), new OreDictStack(ND.wireDense(), 32), new OreDictStack(STEEL.ingot(), 16), new OreDictStack(STEEL.plate528(), 32), new OreDictStack(AL.plate528(), 32), new OreDictStack(ANY_PLASTIC.ingot(), 24), new OreDictStack(RUBBER.ingot(), 24), new OreDictStack(CU.plateCast(), 8), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BASIC)) + .inputItems(new ComparableStack(ModBlocks.machine_lithium_battery, 3), new OreDictStack(ND.wireDense(), 32), new OreDictStack(STEEL.ingot(), 16), new OreDictStack(STEEL.plate(), 32), new OreDictStack(AL.plate(), 32), new OreDictStack(ANY_PLASTIC.ingot(), 24), new OreDictStack(RUBBER.ingot(), 24), new OreDictStack(CU.plateCast(), 8), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BASIC)) .inputItemsEx(new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.FERRO_PLATING), new OreDictStack(ND.wireDense(), 32), new OreDictStack(AL.plateWelded(), 16), new OreDictStack(RUBBER.ingot(), 32), new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.CIRCUIT))); this.register(new GenericRecipe("ass.beamline").setup(200, 100).outputItems(new ItemStack(ModBlocks.pa_beamline, 1)) .inputItems(new OreDictStack(STEEL.plateCast(), 8), new OreDictStack(CU.plate(), 16), new OreDictStack(GOLD.wireDense(), 4)) @@ -677,34 +677,34 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.core1").setup(1_200, 100).outputItems(new ItemStack(ModItems.gadget_core, 1)) .inputItems(new OreDictStack(PU239.nugget(), 7), new OreDictStack(U238.nugget(), 3))); this.register(new GenericRecipe("ass.boyshield").setup(200, 100).outputItems(new ItemStack(ModItems.boy_shielding, 1)) - .inputItems(new OreDictStack(OreDictManager.getReflector(), 12), new OreDictStack(STEEL.plate528(), 4))); + .inputItems(new OreDictStack(OreDictManager.getReflector(), 12), new OreDictStack(STEEL.plate(), 4))); this.register(new GenericRecipe("ass.boytarget").setup(200, 100).outputItems(new ItemStack(ModItems.boy_target, 1)) .inputItems(new OreDictStack(U235.nugget(), 18))); this.register(new GenericRecipe("ass.boybullet").setup(200, 100).outputItems(new ItemStack(ModItems.boy_bullet, 1)) .inputItems(new OreDictStack(U235.nugget(), 9))); this.register(new GenericRecipe("ass.boypropellant").setup(200, 100).outputItems(new ItemStack(ModItems.boy_propellant, 1)) - .inputItems(new ComparableStack(ModItems.cordite, 8), new OreDictStack(IRON.plate528(), 8), new OreDictStack(AL.plate528(), 4), new OreDictStack(MINGRADE.wireFine(), 4))); + .inputItems(new ComparableStack(ModItems.cordite, 8), new OreDictStack(IRON.plate(), 8), new OreDictStack(AL.plate(), 4), new OreDictStack(MINGRADE.wireFine(), 4))); this.register(new GenericRecipe("ass.boyigniter").setup(200, 100).outputItems(new ItemStack(ModItems.boy_igniter, 1)) .inputItems(new OreDictStack(AL.shell(), 3), new OreDictStack(DURA.plateCast(), 1), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 16))); this.register(new GenericRecipe("ass.manigniter").setup(200, 100).outputItems(new ItemStack(ModItems.man_igniter, 1)) - .inputItems(new OreDictStack(STEEL.plate528(), 6), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 9))); + .inputItems(new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new OreDictStack(MINGRADE.wireFine(), 9))); this.register(new GenericRecipe("ass.mancore").setup(1_200, 100).outputItems(new ItemStack(ModItems.man_core, 1)) .inputItems(new OreDictStack(PU239.nugget(), 8), new OreDictStack(BE.nugget(), 2))); this.register(new GenericRecipe("ass.mikecore").setup(1_200, 100).outputItems(new ItemStack(ModItems.mike_core, 1)) .inputItems(new OreDictStack(U238.nugget(), 24), new OreDictStack(PB.ingot(), 6))); this.register(new GenericRecipe("ass.mikedeut").setup(600, 100).outputItems(new ItemStack(ModItems.mike_deut, 1)) - .inputItems(new OreDictStack(IRON.plate528(), 12), new OreDictStack(STEEL.plate528(), 16)) + .inputItems(new OreDictStack(IRON.plate(), 12), new OreDictStack(STEEL.plate(), 16)) .inputFluids(new FluidStack(Fluids.DEUTERIUM, 10_000))); this.register(new GenericRecipe("ass.mikecooler").setup(300, 100).outputItems(new ItemStack(ModItems.mike_cooling_unit, 1)) - .inputItems(new OreDictStack(IRON.plate528(), 8), new ComparableStack(ModItems.coil_copper, 5), new ComparableStack(ModItems.coil_tungsten, 5), new ComparableStack(ModItems.motor, 2))); + .inputItems(new OreDictStack(IRON.plate(), 8), new ComparableStack(ModItems.coil_copper, 5), new ComparableStack(ModItems.coil_tungsten, 5), new ComparableStack(ModItems.motor, 2))); this.register(new GenericRecipe("ass.fleijaigniter").setup(200, 100).outputItems(new ItemStack(ModItems.fleija_igniter, 1)) - .inputItems(new OreDictStack(TI.plate528(), 6), new OreDictStack(SA326.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()))); + .inputItems(new OreDictStack(TI.plate(), 6), new OreDictStack(SA326.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()))); this.register(new GenericRecipe("ass.fleijacore").setup(600, 100).outputItems(new ItemStack(ModItems.fleija_core, 1)) .inputItems(new OreDictStack(U235.nugget(), 8), new OreDictStack(NP237.nugget(), 2), new OreDictStack(BE.nugget(), 4), new ComparableStack(ModItems.coil_copper, 2))); this.register(new GenericRecipe("ass.fleijacharge").setup(300, 100).outputItems(new ItemStack(ModItems.fleija_propellant, 1)) .inputItems(new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 3), new OreDictStack(SA326.plate(), 8))); this.register(new GenericRecipe("ass.soliniumigniter").setup(200, 100).outputItems(new ItemStack(ModItems.solinium_igniter, 1)) - .inputItems(new OreDictStack(TI.plate528(), 4), new OreDictStack(ALLOY.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new ComparableStack(ModItems.coil_gold, 1))); + .inputItems(new OreDictStack(TI.plate(), 4), new OreDictStack(ALLOY.wireFine(), 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED.ordinal()), new ComparableStack(ModItems.coil_gold, 1))); this.register(new GenericRecipe("ass.soliniumcore").setup(600, 100).outputItems(new ItemStack(ModItems.solinium_core, 1)) .inputItems(new OreDictStack(SA327.nugget(), 9), new OreDictStack(EUPH.nugget(), 1))); this.register(new GenericRecipe("ass.soliniumcharge").setup(300, 100).outputItems(new ItemStack(ModItems.solinium_propellant, 1)) diff --git a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java index d557b8f4d..610a20f5a 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java @@ -165,29 +165,29 @@ public class ChemicalPlantRecipes extends GenericRecipes { this.register(new GenericRecipe("chem.polymer").setup(100, 100) .inputItems(new OreDictStack(COAL.dust(), 2), new OreDictStack(F.dust())) - .inputFluids(new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ingot_polymer))); this.register(new GenericRecipe("chem.bakelite").setup(100, 100) - .inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528 ? 1 : 0), new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0), new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ingot_bakelite))); this.register(new GenericRecipe("chem.rubber").setup(100, 200) .inputItems(new OreDictStack(S.dust())) - .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528 ? 2 : 0)) + .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528PressurizedRecipes ? 2 : 0)) .outputItems(new ItemStack(ModItems.ingot_rubber))); this.register(new GenericRecipe("chem.hardplastic").setup(100, 1_000) - .inputFluids(new FluidStack(Fluids.XYLENE, 500, GeneralConfig.enable528 ? 2 : 0), new FluidStack(Fluids.PHOSGENE, 500, GeneralConfig.enable528 ? 2 : 0)) + .inputFluids(new FluidStack(Fluids.XYLENE, 500, GeneralConfig.enable528PressurizedRecipes ? 2 : 0), new FluidStack(Fluids.PHOSGENE, 500, GeneralConfig.enable528PressurizedRecipes ? 2 : 0)) .outputItems(new ItemStack(ModItems.ingot_pc))); this.register(new GenericRecipe("chem.pvc").setup(100, 1_000) .inputItems(new OreDictStack(CD.dust())) - .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 250, GeneralConfig.enable528 ? 2 : 0), new FluidStack(Fluids.CHLORINE, 250, GeneralConfig.enable528 ? 2 : 0)) + .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 250, GeneralConfig.enable528PressurizedRecipes ? 2 : 0), new FluidStack(Fluids.CHLORINE, 250, GeneralConfig.enable528PressurizedRecipes ? 2 : 0)) .outputItems(new ItemStack(ModItems.ingot_pvc, 2))); this.register(new GenericRecipe("chem.kevlar").setup(60, 300) - .inputFluids(new FluidStack(Fluids.AROMATICS, 200), new FluidStack(Fluids.NITRIC_ACID, 100), new FluidStack(GeneralConfig.enable528 ? Fluids.PHOSGENE : Fluids.CHLORINE, 100)) + .inputFluids(new FluidStack(Fluids.AROMATICS, 200), new FluidStack(Fluids.NITRIC_ACID, 100), new FluidStack(GeneralConfig.enable528PressurizedRecipes ? Fluids.PHOSGENE : Fluids.CHLORINE, 100)) .outputItems(new ItemStack(ModItems.plate_kevlar, 4))); this.register(new GenericRecipe("chem.meth").setup(60, 300) @@ -282,7 +282,7 @@ public class ChemicalPlantRecipes extends GenericRecipes { this.register(new GenericRecipe("chem.rocketfuel").setup(200, 100) .inputItems(new ComparableStack(ModItems.solid_fuel, 2)) - .inputFluids(new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528 ? 1 : 0), new FluidStack(Fluids.NITRIC_ACID, 100)) + .inputFluids(new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528PressurizedRecipes ? 1 : 0), new FluidStack(Fluids.NITRIC_ACID, 100)) .outputItems(new ItemStack(ModItems.rocket_fuel, 4))); this.register(new GenericRecipe("chem.dynamite").setup(50, 100) @@ -291,7 +291,7 @@ public class ChemicalPlantRecipes extends GenericRecipes { this.register(new GenericRecipe("chem.tnt").setup(100, 1_000) .inputItems(new OreDictStack(KNO.dust())) - .inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ball_tnt, 4))); this.register(new GenericRecipe("chem.tatb").setup(50, 5_000) @@ -301,7 +301,7 @@ public class ChemicalPlantRecipes extends GenericRecipes { this.register(new GenericRecipe("chem.c4").setup(100, 1_000) .inputItems(new OreDictStack(KNO.dust())) - .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ingot_c4, 4))); /// GLASS /// diff --git a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java index 6cbb878dc..ceb841bf0 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java @@ -28,20 +28,12 @@ import net.minecraft.item.ItemStack; @Deprecated public class ChemplantRecipes extends SerializableRecipe { - /** - * Nice order: The order in which the ChemRecipe are added to the recipes list - * Meta order: Fixed using the id param, saved in indexMapping - */ - public static HashMap indexMapping = new HashMap(); public static List recipes = new ArrayList(); @Override public void registerDefaults() { - //6-30, formerly oil cracking, coal liquefaction and solidification - registerOtherOil(); - recipes.add(new ChemRecipe(36, "COOLANT", 50) .inputItems(new OreDictStack(KNO.dust())) .inputFluids(new FluidStack(Fluids.WATER, 1800)) @@ -83,25 +75,17 @@ public class ChemplantRecipes extends SerializableRecipe { .inputItems( new OreDictStack(COAL.dust(), 2), new OreDictStack(F.dust())) - .inputFluids(new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ingot_polymer))); recipes.add(new ChemRecipe(81, "BAKELITE", 100) .inputFluids( - new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528 ? 1 : 0), - new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528 ? 1 : 0)) + new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0), + new FluidStack(Fluids.PETROLEUM, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ingot_bakelite))); recipes.add(new ChemRecipe(82, "RUBBER", 100) .inputItems(new OreDictStack(S.dust())) - .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528 ? 2 : 0)) + .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528PressurizedRecipes ? 2 : 0)) .outputItems(new ItemStack(ModItems.ingot_rubber))); - /*recipes.add(new ChemRecipe(94, "PET", 100) - .inputItems(new OreDictStack(AL.dust())) - .inputFluids( - new FluidStack(Fluids.XYLENE, 500), - new FluidStack(Fluids.OXYGEN, 100)) - .outputItems(new ItemStack(ModItems.ingot_pet)));*/ - - //Laminate Glass going here recipes.add(new ChemRecipe(97, "LAMINATE", 100) .inputFluids( new FluidStack(Fluids.XYLENE, 250), @@ -112,14 +96,14 @@ public class ChemplantRecipes extends SerializableRecipe { .outputItems(new ItemStack(com.hbm.blocks.ModBlocks.reinforced_laminate))); recipes.add(new ChemRecipe(94, "PC", 100) .inputFluids( - new FluidStack(Fluids.XYLENE, 500, GeneralConfig.enable528 ? 2 : 0), - new FluidStack(Fluids.PHOSGENE, 500, GeneralConfig.enable528 ? 2 : 0)) + new FluidStack(Fluids.XYLENE, 500, GeneralConfig.enable528PressurizedRecipes ? 2 : 0), + new FluidStack(Fluids.PHOSGENE, 500, GeneralConfig.enable528PressurizedRecipes ? 2 : 0)) .outputItems(new ItemStack(ModItems.ingot_pc))); recipes.add(new ChemRecipe(96, "PVC", 100) .inputItems(new OreDictStack(CD.dust())) .inputFluids( - new FluidStack(Fluids.UNSATURATEDS, 250, GeneralConfig.enable528 ? 2 : 0), - new FluidStack(Fluids.CHLORINE, 250, GeneralConfig.enable528 ? 2 : 0)) + new FluidStack(Fluids.UNSATURATEDS, 250, GeneralConfig.enable528PressurizedRecipes ? 2 : 0), + new FluidStack(Fluids.CHLORINE, 250, GeneralConfig.enable528PressurizedRecipes ? 2 : 0)) .outputItems(new ItemStack(ModItems.ingot_pvc, 2))); recipes.add(new ChemRecipe(89, "DYNAMITE", 50) .inputItems( @@ -129,7 +113,7 @@ public class ChemplantRecipes extends SerializableRecipe { .outputItems(new ItemStack(ModItems.ball_dynamite, 2))); recipes.add(new ChemRecipe(83, "TNT", 150) .inputItems(new OreDictStack(KNO.dust())) - .inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.AROMATICS, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ball_tnt, 4))); recipes.add(new ChemRecipe(95, "TATB", 50) .inputItems(new ComparableStack(ModItems.ball_tnt)) @@ -137,10 +121,8 @@ public class ChemplantRecipes extends SerializableRecipe { .outputItems(new ItemStack(ModItems.ball_tatb))); recipes.add(new ChemRecipe(84, "C4", 150) .inputItems(new OreDictStack(KNO.dust())) - .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528 ? 1 : 0)) + .inputFluids(new FluidStack(Fluids.UNSATURATEDS, 500, GeneralConfig.enable528PressurizedRecipes ? 1 : 0)) .outputItems(new ItemStack(ModItems.ingot_c4, 4))); - //44, formerly deuterium - //45, formerly steam recipes.add(new ChemRecipe(46, "YELLOWCAKE", 250) .inputItems( new OreDictStack(U.billet(), 2), //12 nuggets: the numbers do match up :) @@ -211,7 +193,7 @@ public class ChemplantRecipes extends SerializableRecipe { recipes.add(new ChemRecipe(57, "SOLID_FUEL", 200) .inputItems(new ComparableStack(ModItems.solid_fuel, 2)) .inputFluids( - new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528 ? 1 : 0), + new FluidStack(Fluids.PETROLEUM, 200, GeneralConfig.enable528PressurizedRecipes ? 1 : 0), new FluidStack(Fluids.NITRIC_ACID, 100)) .outputItems(new ItemStack(ModItems.rocket_fuel, 4))); recipes.add(new ChemRecipe(58, "ELECTROLYSIS", 150) @@ -242,34 +224,6 @@ public class ChemplantRecipes extends SerializableRecipe { .inputItems(new OreDictStack(IRON.dust())) .inputFluids(new FluidStack(Fluids.SCHRABIDIC, 250)) .outputItems(new ItemStack(ModItems.powder_schrabidate))); - recipes.add(new ChemRecipe(65, "COLTAN_CLEANING", 60) - .inputItems( - new OreDictStack(COLTAN.dust(), 2), - new OreDictStack(COAL.dust())) - .inputFluids( - new FluidStack(Fluids.PEROXIDE, 250), - new FluidStack(Fluids.HYDROGEN, 500)) - .outputItems( - new ItemStack(ModItems.powder_coltan), - new ItemStack(ModItems.powder_niobium), - new ItemStack(ModItems.dust)) - .outputFluids(new FluidStack(Fluids.WATER, 500))); - recipes.add(new ChemRecipe(66, "COLTAN_PAIN", 120) - .inputItems( - new ComparableStack(ModItems.powder_coltan), - new OreDictStack(F.dust())) - .inputFluids( - new FluidStack(Fluids.GAS, 1000), - new FluidStack(Fluids.OXYGEN, 500)) - .outputFluids(new FluidStack(Fluids.PAIN, 1000))); - recipes.add(new ChemRecipe(67, "COLTAN_CRYSTAL", 80) - .inputFluids( - new FluidStack(Fluids.PAIN, 1000), - new FluidStack(Fluids.PEROXIDE, 500)) - .outputItems( - new ItemStack(ModItems.gem_tantalium), - new ItemStack(ModItems.dust, 3)) - .outputFluids(new FluidStack(Fluids.WATER, 250))); recipes.add(new ChemRecipe(88, "LUBRICANT", 20) .inputFluids( new FluidStack(Fluids.HEATINGOIL, 500), @@ -366,9 +320,6 @@ public class ChemplantRecipes extends SerializableRecipe { new OreDictStack(ANY_PLASTIC.ingot(), 1)) .inputFluids(new FluidStack(Fluids.MUSTARDGAS, 4000)) .outputItems(new ItemStack(ModItems.ammo_arty, 1, 11))); - recipes.add(new ChemRecipe(101, "CC_CENTRIFUGE", 200) - .inputFluids(new FluidStack(Fluids.CHLOROCALCITE_CLEANED, 500), new FluidStack(Fluids.SULFURIC_ACID, 8_000)) - .outputFluids(new FluidStack(Fluids.POTASSIUM_CHLORIDE, 250), new FluidStack(Fluids.CALCIUM_CHLORIDE, 250))); recipes.add(new ChemRecipe(102, "THORIUM_SALT", 60) .inputFluids(new FluidStack(Fluids.THORIUM_SALT_DEPLETED, 16_000)) @@ -391,27 +342,6 @@ public class ChemplantRecipes extends SerializableRecipe { .outputItems(new ItemStack(ModBlocks.deco_rusty_steel, 8))); } - public static void registerOtherOil() { - recipes.add(new ChemRecipe(31, "BP_BIOGAS", 60) - .inputItems(new ComparableStack(ModItems.biomass, 16)) //if we assume 1B BF = 500k and translate that to 2B BG = 500k, then each biomass is worth ~31k or roughly 1.5 furnace operations - .inputFluids(new FluidStack(Fluids.AIR, 4000)) - .outputFluids(new FluidStack(2000, Fluids.BIOGAS))); - recipes.add(new ChemRecipe(32, "BP_BIOFUEL", 60) - .inputFluids(new FluidStack(1500, Fluids.BIOGAS), new FluidStack(250, Fluids.ETHANOL)) - .outputFluids(new FluidStack(1000, Fluids.BIOFUEL))); - recipes.add(new ChemRecipe(33, "LPG", 100) - .inputFluids(new FluidStack(2000, Fluids.PETROLEUM)) - .outputFluids(new FluidStack(1000, Fluids.LPG))); - recipes.add(new ChemRecipe(34, "OIL_SAND", 200) - .inputItems(new ComparableStack(ModBlocks.ore_oil_sand, 16), new OreDictStack(ANY_TAR.any(), 1)) - .outputItems(new ItemStack(Blocks.sand, 16)) - .outputFluids(new FluidStack(1000, Fluids.BITUMEN))); - recipes.add(new ChemRecipe(35, "ASPHALT", 100) - .inputItems(new ComparableStack(Blocks.gravel, 2), new ComparableStack(Blocks.sand, 6)) - .inputFluids(new FluidStack(1000, Fluids.BITUMEN)) - .outputItems(new ItemStack(ModBlocks.asphalt, 16))); - } - @Deprecated public static class ChemRecipe { public int listing; diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 50a661b44..467ec2c29 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -259,7 +259,7 @@ public class AnvilRecipes extends SerializableRecipe { constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(ModItems.ingot_firebrick, 16), - new OreDictStack(STEEL.plate528(), 4), + new OreDictStack(STEEL.plate(), 4), new OreDictStack(CU.ingot(), 8) }, new AnvilOutput(new ItemStack(ModBlocks.heater_oven))).setTier(2)); @@ -282,7 +282,7 @@ public class AnvilRecipes extends SerializableRecipe { new AStack[] { new OreDictStack(ANY_PLASTIC.ingot(), 4), new OreDictStack(CU.ingot(), 8), - new OreDictStack(STEEL.plate528(), 8), + new OreDictStack(STEEL.plate(), 8), new ComparableStack(ModItems.coil_tungsten, 8), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC.ordinal()) }, new AnvilOutput(new ItemStack(ModBlocks.heater_electric))).setTier(3)); @@ -291,7 +291,7 @@ public class AnvilRecipes extends SerializableRecipe { new AStack[] { new OreDictStack(RUBBER.ingot(), 4), new OreDictStack(CU.ingot(), 16), - new OreDictStack(STEEL.plate528(), 16), + new OreDictStack(STEEL.plate(), 16), new OreDictStack(STEEL.pipe(), 3), }, new AnvilOutput(new ItemStack(ModBlocks.heater_heatex))).setTier(3)); @@ -366,7 +366,7 @@ public class AnvilRecipes extends SerializableRecipe { constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new OreDictStack(STEEL.ingot(), 4), - new OreDictStack(CU.plate528(), 16), + new OreDictStack(CU.plate(), 16), new ComparableStack(ModItems.plate_polymer, 8) }, new AnvilOutput(new ItemStack(ModBlocks.machine_boiler))).setTier(2)); @@ -405,7 +405,7 @@ public class AnvilRecipes extends SerializableRecipe { /*constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new OreDictStack(STEEL.ingot(), 6), - new OreDictStack(IRON.plate528(), 8), + new OreDictStack(IRON.plate(), 8), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.generator_steel, 2), new ComparableStack(ModItems.turbine_titanium, 1), @@ -492,13 +492,13 @@ public class AnvilRecipes extends SerializableRecipe { constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(ModItems.tank_steel, 1), - new OreDictStack(PB.plate528(), 2), + new OreDictStack(PB.plate(), 2), new ComparableStack(ModItems.nuclear_waste, 10) }, new AnvilOutput(new ItemStack(ModBlocks.yellow_barrel))).setTier(3)); constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(ModItems.tank_steel, 1), - new OreDictStack(PB.plate528(), 2), + new OreDictStack(PB.plate(), 2), new ComparableStack(ModItems.nuclear_waste_vitrified, 10) }, new AnvilOutput(new ItemStack(ModBlocks.vitrified_barrel))).setTier(3)); diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java index a61fc2efd..ef67a0bff 100644 --- a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java +++ b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java @@ -129,8 +129,8 @@ public class ItemBedrockOreNew extends Item { public static enum BedrockOreType { // primary sulfuric solvent radsolvent - LIGHT_METAL( 0xFFFFFF, 0x353535, "light", o(MAT_IRON, 9), o(MAT_COPPER, 9), o(MAT_TITANIUM, 6), o(MAT_BAUXITE, 9), o(MAT_CRYOLITE, 3), o(MAT_CHLOROCALCITE, 5), o(MAT_LITHIUM, 5), o(MAT_SODIUM, 3), o(MAT_CHLOROCALCITE, 6), o(MAT_LITHIUM, 6), o(MAT_SODIUM, 6)), - HEAVY_METAL( 0x868686, 0x000000, "heavy", o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 2), o(MAT_GOLD, 2), o(MAT_BERYLLIUM, 3), o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 5), o(MAT_BISMUTH, 1), o(MAT_BISMUTH, 1), o(MAT_GOLD, 6)), + LIGHT_METAL( 0xFFFFFF, 0x353535, "light", o(MAT_IRON, 9), o(MAT_COPPER, 9), o(MAT_TITANIUM, 6), o(MAT_BAUXITE, 9), o(MAT_CRYOLITE, 3), o(MAT_CHLOROCALCITE, 5), o(MAT_LITHIUM, 5), o(MAT_SODIUM, 3), o(MAT_CHLOROCALCITE, 6), o(MAT_LITHIUM, 6), o(MAT_SODIUM, 6)), + HEAVY_METAL( 0x868686, 0x000000, "heavy", o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 2), o(MAT_GOLD, 2), o(MAT_BERYLLIUM, 3), o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 5), o(MAT_BISMUTH, 1), o(MAT_TANTALIUM, 1), o(MAT_GOLD, 6)), RARE_EARTH( 0xE6E6B6, 0x1C1C00, "rare", o(MAT_COBALT, 5), o(MAT_RAREEARTH, 5),o(MAT_BORON, 5), o(MAT_LANTHANIUM, 3), o(MAT_NIOBIUM, 4), o(MAT_NEODYMIUM, 3), o(MAT_STRONTIUM, 3), o(MAT_ZIRCONIUM, 3), o(MAT_NIOBIUM, 5), o(MAT_NEODYMIUM, 5), o(MAT_STRONTIUM, 3)), ACTINIDE( 0xC1C7BD, 0x2B3227, "actinide", o(MAT_URANIUM, 4), o(MAT_THORIUM, 4), o(MAT_RADIUM, 2), o(MAT_RADIUM, 2), o(MAT_POLONIUM, 2), o(MAT_RADIUM, 2), o(MAT_RADIUM, 2), o(MAT_POLONIUM, 2), o(MAT_TECHNETIUM, 1), o(MAT_TECHNETIUM, 1), o(MAT_U238, 1)), NON_METAL( 0xAFAFAF, 0x0F0F0F, "nonmetal", o(MAT_COAL, 9), o(MAT_SULFUR, 9), o(MAT_LIGNITE, 9), o(MAT_KNO, 6), o(MAT_FLUORITE, 6), o(MAT_PHOSPHORUS, 5), o(MAT_FLUORITE, 6), o(MAT_SULFUR, 6), o(MAT_CHLOROCALCITE, 6), o(MAT_SILICON, 2), o(MAT_SILICON, 2)), diff --git a/src/main/java/com/hbm/items/tool/ItemWandS.java b/src/main/java/com/hbm/items/tool/ItemWandS.java index 0a98cde19..0323fca25 100644 --- a/src/main/java/com/hbm/items/tool/ItemWandS.java +++ b/src/main/java/com/hbm/items/tool/ItemWandS.java @@ -3,8 +3,6 @@ package com.hbm.items.tool; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.BlockWandStructure.TileEntityWandStructure; @@ -23,8 +21,6 @@ import net.minecraft.world.World; public class ItemWandS extends Item { - private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss"); - @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { list.add("Creative-only item"); diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index a77d4a15c..9f0510e48 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -155,11 +155,6 @@ public class HbmWorldGen implements IWorldGenerator { WeightedRandomGeneric item = (WeightedRandomGeneric) WeightedRandom.getRandomItem(rand, BedrockOre.weightedOres); BedrockOreDefinition def = item.get(); - if(GeneralConfig.enable528 && GeneralConfig.enable528BedrockReplacement) { - BedrockOreDefinition replacement = BedrockOre.replacements.get(def.id); - if(replacement != null) def = replacement; - } - int randPosX = i + rand.nextInt(2) + 8; int randPosZ = j + rand.nextInt(2) + 8; BedrockOre.generate(world, randPosX, randPosZ, def.stack, def.acid, def.color, def.tier); @@ -175,15 +170,6 @@ public class HbmWorldGen implements IWorldGenerator { int colZ = (int) (colRand.nextGaussian() * 1500); int colRange = 750; - if((GeneralConfig.enable528BedrockSpawn || GeneralConfig.enable528BedrockDeposit) && rand.nextInt(GeneralConfig.bedrockRate) == 0) { - int x = i + rand.nextInt(16) + 8; - int z = j + rand.nextInt(16) + 8; - - if(GeneralConfig.enable528BedrockSpawn || (GeneralConfig.enable528BedrockDeposit && x <= colX + colRange && x >= colX - colRange && z <= colZ + colRange && z >= colZ - colRange)) { - BedrockOre.generate(world, x, z, new ItemStack(ModItems.fragment_coltan), null, 0xA78D7A, 1); - } - } - if(GeneralConfig.enable528ColtanDeposit) { for(int k = 0; k < 2; k++) { @@ -350,7 +336,7 @@ public class HbmWorldGen implements IWorldGenerator { } } - if(GeneralConfig.enable528 && GeneralConfig.enable528BosniaSimulator && rand.nextInt(16) == 0) { + if(GeneralConfig.enable528BosniaSimulator && rand.nextInt(16) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 7920e59c5..e0efb97a8 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -261,7 +261,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.capacitor_niobium, 1), new Object[] { "PPP", "ICI", "WWW", 'P', STEEL.plate(), 'I', RUBBER.ingot(), 'C', NB.block(), 'W', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.capacitor_tantalium, 1), new Object[] { "PPP", "ICI", "WWW", 'P', STEEL.plate(), 'I', ANY_RESISTANTALLOY.ingot(), 'C', TA.block(), 'W', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.capacitor_schrabidate, 1), new Object[] { "PPP", "ICI", "WWW", 'P', STEEL.plate(), 'I', ANY_RESISTANTALLOY.ingot(), 'C', SBD.block(), 'W', STEEL.ingot() }); - addRecipeAuto(new ItemStack(ModBlocks.machine_wood_burner, 1), new Object[] { "PPP", "CFC", "I I" , 'P', STEEL.plate528(), 'C', ModItems.coil_copper, 'I', IRON.ingot(), 'F', Blocks.furnace}); + addRecipeAuto(new ItemStack(ModBlocks.machine_wood_burner, 1), new Object[] { "PPP", "CFC", "I I" , 'P', STEEL.plate(), 'C', ModItems.coil_copper, 'I', IRON.ingot(), 'F', Blocks.furnace}); addRecipeAuto(new ItemStack(ModBlocks.machine_turbine, 1), new Object[] { "SMS", "PTP", "SMS", 'S', STEEL.ingot(), 'T', ModItems.turbine_titanium, 'M', ModItems.coil_copper, 'P', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_converter_he_rf, 1), new Object[] { "RRR", "WWW", "III", 'R', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR), 'W', REDSTONE.dust(), 'I', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_converter_rf_he, 1), new Object[] { "RRR", "WWW", "III", 'R', REDSTONE.dust(), 'W', MINGRADE.wireFine(), 'I', STEEL.ingot() }); diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java index 85b3834e8..ab08afd1a 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/RBMKDials.java @@ -103,7 +103,7 @@ public class RBMKDials { gameRules.get(RBMKKeys.KEY_REASIM_RANGE).add(new Tuple.Pair<>(world, GameRuleHelper.getClampedInt(world, RBMKKeys.KEY_REASIM_RANGE, 1, 100))); gameRules.get(RBMKKeys.KEY_REASIM_COUNT).add(new Tuple.Pair<>(world, GameRuleHelper.getClampedInt(world, RBMKKeys.KEY_REASIM_COUNT, 1, 24))); gameRules.get(RBMKKeys.KEY_REASIM_MOD).add(new Tuple.Pair<>(world, GameRuleHelper.getDoubleMinimum(world, RBMKKeys.KEY_REASIM_MOD, 0.0D))); - gameRules.get(RBMKKeys.KEY_REASIM_BOILERS).add(new Tuple.Pair<>(world, world.getGameRules().getGameRuleBooleanValue(RBMKKeys.KEY_REASIM_BOILERS.keyString) || (GeneralConfig.enable528 && GeneralConfig.enable528ReasimBoilers))); + gameRules.get(RBMKKeys.KEY_REASIM_BOILERS).add(new Tuple.Pair<>(world, world.getGameRules().getGameRuleBooleanValue(RBMKKeys.KEY_REASIM_BOILERS.keyString) || GeneralConfig.enable528ReasimBoilers)); gameRules.get(RBMKKeys.KEY_REASIM_BOILER_SPEED).add(new Tuple.Pair<>(world, GameRuleHelper.getClampedDouble(world, RBMKKeys.KEY_REASIM_BOILER_SPEED, 0.0D, 1.0D))); gameRules.get(RBMKKeys.KEY_DISABLE_MELTDOWNS).add(new Tuple.Pair<>(world, world.getGameRules().getGameRuleBooleanValue(RBMKKeys.KEY_DISABLE_MELTDOWNS.keyString))); gameRules.get(RBMKKeys.KEY_ENABLE_MELTDOWN_OVERPRESSURE).add(new Tuple.Pair<>(world, world.getGameRules().getGameRuleBooleanValue(RBMKKeys.KEY_ENABLE_MELTDOWN_OVERPRESSURE.keyString))); diff --git a/src/main/java/com/hbm/world/feature/BedrockOre.java b/src/main/java/com/hbm/world/feature/BedrockOre.java index f4586c795..629658a85 100644 --- a/src/main/java/com/hbm/world/feature/BedrockOre.java +++ b/src/main/java/com/hbm/world/feature/BedrockOre.java @@ -1,7 +1,6 @@ package com.hbm.world.feature; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import com.hbm.blocks.BlockEnums.EnumStoneType; @@ -27,8 +26,6 @@ public class BedrockOre { public static List> weightedOres = new ArrayList(); public static List> weightedOresNether = new ArrayList(); - public static HashMap replacements = new HashMap(); - public static void init() { registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.IRON, 1), WorldConfig.bedrockIronSpawn); registerBedrockOre(weightedOres, new BedrockOreDefinition(EnumBedrockOre.COPPER, 1), WorldConfig.bedrockCopperSpawn); @@ -53,9 +50,6 @@ public class BedrockOre { registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.glowstone_dust, 4), 1, 0xF9FF4D), WorldConfig.bedrockGlowstoneSpawn); registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(ModItems.powder_fire, 4), 1, 0xD7341F), WorldConfig.bedrockPhosphorusSpawn); registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.quartz, 4), 1, 0xF0EFDD), WorldConfig.bedrockQuartzSpawn); - - replacements.put("ore" + EnumBedrockOre.IRON.oreName, new BedrockOreDefinition(EnumBedrockOre.HEMATITE, 1)); - replacements.put("ore" + EnumBedrockOre.COPPER.oreName, new BedrockOreDefinition(EnumBedrockOre.MALACHITE, 1)); } public static void registerBedrockOre(List list, BedrockOreDefinition def, int weight) { diff --git a/src/main/resources/assets/hbm/textures/misc/player.png b/src/main/resources/assets/hbm/textures/misc/player.png deleted file mode 100644 index 1f8e0e129dc7dbc9de124835c04b267dbd2a763e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8708 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 JrT5K3{|k2?eog=Y diff --git a/src/main/resources/assets/hbm/textures/player/player.png b/src/main/resources/assets/hbm/textures/player/player.png new file mode 100644 index 0000000000000000000000000000000000000000..cb243856dc98d0a58f741be163e783bb52586a4f GIT binary patch literal 4788 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/player/player_carousel.png b/src/main/resources/assets/hbm/textures/player/player_carousel.png new file mode 100644 index 0000000000000000000000000000000000000000..6042cac3fa507a9458836268ede17b2488b6e8e1 GIT binary patch literal 5286 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/player/player_cf.png b/src/main/resources/assets/hbm/textures/player/player_cf.png new file mode 100644 index 0000000000000000000000000000000000000000..40143904e6564a48d62fcd2ddf38910526ee75de GIT binary patch literal 12762 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 Ga_WCI6Qqy; literal 0 HcmV?d00001