diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
4 files changed, 155 insertions, 305 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index cfa436ceb7..fb58096a9a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -101,227 +101,23 @@ public class RECIPES_GREGTECH { private static void blastSmelterRecipes() { - /*// Black Bronze - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(13), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), }, - FluidUtils.getFluidStack("molten.blackbronze", 5 * 144), 0, MathUtils.findPercentageOfInt(200 * 20, 80), - !CORE.GTNH ? 120 : 480); - - // Black Steel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 15), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3) }, - FluidUtils.getFluidStack("molten.blacksteel", 25 * 144), 0, MathUtils.findPercentageOfInt(60 * 20, 80), - !CORE.GTNH ? 120 : 480); - - // Red Steel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(6), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustBismuth", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 10), - ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 20) }, - FluidUtils.getFluidStack("molten.redsteel", 40 * 144), 0, MathUtils.findPercentageOfInt(65 * 20, 80), - !CORE.GTNH ? 120 : 480); - - // Blue Steel - CORE.RA.addBlastSmelterRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 12), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 18), - ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 30), - ItemUtils.getItemStackOfAmountFromOreDict("dustBlackSteel", 60) - - }, FluidUtils.getFluidStack("molten.bluesteel", 125 * 144), 0, MathUtils.findPercentageOfInt(70 * 20, 80), !CORE.GTNH ? 120 : 480); - - // Stainless Steel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) }, - FluidUtils.getFluidStack("molten.stainlesssteel", 9 * 144), 0, - MathUtils.findPercentageOfInt(85 * 20, 80), !CORE.GTNH ? 120 : 480); - - // Eglin - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(7), - ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 23), - ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 12) }, - FluidUtils.getFluidStack("molten.eglinsteel", 48 * 144), 0, MathUtils.findPercentageOfInt(30 * 20, 80), - 120); - if (!CORE.GTNH) { - - // TungstenSteel - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("ingotTungsten", 1), - ItemUtils.getItemStackOfAmountFromOreDict("ingotSteel", 1) }, - FluidUtils.getFluidStack("molten.tungstensteel", 2 * 144), 0, - MathUtils.findPercentageOfInt(75 * 20, 80), 480); - - // HSS-G - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("dustTungstenSteel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 1) }, - FluidUtils.getFluidStack("molten.hssg", 9 * 144), 0, MathUtils.findPercentageOfInt(450 * 20, 80), - 120); - - // HSS-G - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2) }, - FluidUtils.getFluidStack("molten.hssg", 18 * 144), 0, MathUtils.findPercentageOfInt(900 * 20, 80), - 120); - - // HSS-E - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustCobalt", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustManganese", 1) }, - FluidUtils.getFluidStack("molten.hsse", 9 * 144), 0, MathUtils.findPercentageOfInt(540 * 20, 80), - 120); - - // HSS-S - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(3), - ItemUtils.getItemStackOfAmountFromOreDict("dustHSSG", 6), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 2) }, - FluidUtils.getFluidStack("molten.hsss", 9 * 144), 0, MathUtils.findPercentageOfInt(810 * 20, 80), - 120); - - // Osmiridium - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmium", 1) }, - Materials.Helium.getGas(1000), FluidUtils.getFluidStack("molten.osmiridium", 4 * 144), 0, - MathUtils.findPercentageOfInt(500 * 20, 80), 1920); - - // Naq Alloy + if (!CORE.GTNH) { + // Trinium CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustOsmiridium", 1) }, - Materials.Argon.getGas(1000), FluidUtils.getFluidStack("molten.naquadahalloy", 2 * 144), 0, - MathUtils.findPercentageOfInt(500 * 20, 80), 30720); - - // Nickel-Zinc-Ferrite - if (Materials.get("NickelZincFerrite") != null) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustFerriteMixture", 6) }, - Materials.Oxygen.getGas(2000), FluidUtils.getFluidStack("molten.nickelzincferrite", 2 * 144), 0, - MathUtils.findPercentageOfInt(600 * 20, 80), 120); - } - - // Gallium-Arsenide - if (Materials.get("GalliumArsenide") != null) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustArsenic", 1) }, - FluidUtils.getFluidStack("molten.galliumarsenide", 2 * 144), 0, - MathUtils.findPercentageOfInt(600 * 20, 80), 120); - } - - // TungstenCarbide - if (Materials.get("TungstenCarbide") != null) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1) }, - FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), 0, - MathUtils.findPercentageOfInt( - (int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) - * Materials.get("TungstenCarbide").mBlastFurnaceTemp, - 80), - 480); - } - - // Vanadium-Gallium - if (Materials.get("VanadiumGallium") != null) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustGallium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 3) }, - FluidUtils.getFluidStack("molten.vanadiumgallium", 4 * 144), 0, - MathUtils.findPercentageOfInt((int) Math.max(Materials.VanadiumGallium.getMass() / 40L, 1L) - * Materials.VanadiumGallium.mBlastFurnaceTemp, 80), - 480); - } - - // EIO - // Dark Steel - if (ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1) != ItemUtils - .getSimpleStack(ModItems.AAA_Broken)) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustElectricalSteel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustObsidian", 1) }, - FluidUtils.getFluidStack("molten.darksteel", 2 * 144), 0, - MathUtils.findPercentageOfInt(200 * 20, 80), 120); - } - - // Pulsating Iron - if (ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1) != ItemUtils - .getSimpleStack(ModItems.AAA_Broken)) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getSimpleStack(Items.ender_pearl) }, - FluidUtils.getFluidStack("molten.pulsatingiron", 2 * 144), 0, - MathUtils.findPercentageOfInt(8 * 20, 80), 120); - } - - // Energetic Alloy - if (ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1) != ItemUtils - .getSimpleStack(ModItems.AAA_Broken)) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getSimpleStack(Items.glowstone_dust) }, - FluidUtils.getFluidStack("molten.redstone", 144), - FluidUtils.getFluidStack("molten.energeticalloy", 144), 0, - MathUtils.findPercentageOfInt(9 * 20, 80), 120); - } - - // Vibrant Alloy - if (ItemUtils.getItemStackOfAmountFromOreDict("dustVibrantAlloy", 1) != ItemUtils - .getSimpleStack(ModItems.AAA_Broken)) { - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(12), - ItemUtils.getItemStackOfAmountFromOreDict("dustEnergeticAlloy", 1), - ItemUtils.getSimpleStack(Items.ender_pearl) }, - FluidUtils.getFluidStack("molten.vibrantalloy", 144), 0, - MathUtils.findPercentageOfInt(16 * 20, 80), 480); - } - }*/ + new ItemStack[] { + ItemUtils.getGregtechCircuit(8), + ELEMENT.getInstance().BISMUTH.getDust(8), + ELEMENT.getInstance().IRON.getDust(64), + ELEMENT.getInstance().CARBON.getDust(16), + ELEMENT.getInstance().GOLD.getDust(16), + ELEMENT.getInstance().SILVER.getDust(16), + ELEMENT.getInstance().OSMIUM.getDust(4), + ELEMENT.getInstance().IRIDIUM.getDust(4), + ELEMENT.getInstance().CERIUM.getDust(8) + }, + FluidUtils.getFluidStack("molten.trinium", 136 * 144), 0, 20 * 3000, + 2040); + } } private static void fluidcannerRecipes() { @@ -898,15 +694,15 @@ public class RECIPES_GREGTECH { // FluidStacks // 7LiF - BeF2 - ZrF4 - UF4 - 650C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6500), // Input + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 650), // Input // A - FluidUtils.getFluidStack(BerylliumFluoride, 2500), // Input + FluidUtils.getFluidStack(BerylliumFluoride, 250), // Input // B - FluidUtils.getFluidStack(ZirconiumFluoride, 800), // Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input + FluidUtils.getFluidStack(ZirconiumFluoride, 80), // Input C + FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input // D null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 10000), // Output + FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 1000), // Output // Fluid // 1 null, // Output Fluid 2 @@ -914,14 +710,14 @@ public class RECIPES_GREGTECH { 500); // 7LiF - BeF2 - ZrF4 - U235 - 590C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 5500), // Input + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 550), // Input // A - FluidUtils.getFluidStack(BerylliumFluoride, 1500), // Input + FluidUtils.getFluidStack(BerylliumFluoride, 150), // Input // B - FluidUtils.getFluidStack(ZirconiumFluoride, 600), // Input C - FluidUtils.getFluidStack(Uranium235, 2400), // Input D + FluidUtils.getFluidStack(ZirconiumFluoride, 60), // Input C + FluidUtils.getFluidStack(Uranium235, 240), // Input D null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 10000), // Output + FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 1000), // Output // Fluid // 1 null, // Output Fluid 2 @@ -929,15 +725,15 @@ public class RECIPES_GREGTECH { 500); // 7liF - BeF2 - ThF4 - UF4 - 566C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6200), // Input + CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 620), // Input // A - FluidUtils.getFluidStack(BerylliumFluoride, 2800), // Input + FluidUtils.getFluidStack(BerylliumFluoride, 280), // Input // B - FluidUtils.getFluidStack(ThoriumFluoride, 700), // Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input + FluidUtils.getFluidStack(ThoriumFluoride, 70), // Input C + FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input // D null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 10000), // Output + FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 1000), // Output // Fluid // 1 null, // Output Fluid 2 @@ -975,23 +771,23 @@ public class RECIPES_GREGTECH { addAR(T1, ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4), FluidUtils.getFluidStack("nitrogen", 2000), - T2, 128, 2000); + T2, 120, 2000); addAR(T2, ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4), FluidUtils.getFluidStack("helium", 2000), - T3, 256, 8000); + T3, 250, 8000); addAR(T3, ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4), FluidUtils.getFluidStack("argon", 4000), - T4, 512, 32000); + T4, 500, 32000); addAR(T4, ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4), FluidUtils.getFluidStack("radon", 4000), - T5, 1024, 128000); + T5, 1000, 128000); addAR(T5, ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4), - FluidUtils.getFluidStack("krypton", 500), - T6, 2048, 512000); + FluidUtils.getFluidStack("molten.krypton", 500), + T6, 2000, 512000); /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, @@ -1089,8 +885,12 @@ public class RECIPES_GREGTECH { } private static void fluidExtractorRecipes() { + //Ender Fluid GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), null, - FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); + FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); + //FLiBe fuel + GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1), null, + FluidUtils.getFluidStack("molten.li2bef4", 144), 10000, 100, 500); } private static void chemicalBathRecipes() { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 7b9769ea02..bb1753d29d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -13,6 +13,7 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -212,48 +213,41 @@ public class RECIPES_Machines { } if (LoadedMods.Gregtech){ - - - //Lava Boiler boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); //IV MACHINES - if (!CORE.GTNH){ - EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1); - EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1); - EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1); - HV_MACHINE_Macerator= ItemList.Machine_HV_Macerator.get(1); - EV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); - EV_MACHINE_MassFabricator= ItemList.Machine_EV_Massfab.get(1); - EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1); - EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1); - EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1); - EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1); - EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1); - EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1); - EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1); + EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1); + EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1); + EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1); + HV_MACHINE_Macerator= ItemList.Machine_HV_Macerator.get(1); + EV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); + EV_MACHINE_MassFabricator= ItemList.Machine_EV_Massfab.get(1); + EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1); + EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1); + EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1); + EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1); + EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1); + EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1); + EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1); } - //Balance or some shit + //Balanced opposites else { - EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); - EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); - EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); - HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); - EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); - EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1); - EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); - EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); - EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); - EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1); - EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); - EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); - EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); + EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1); + EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1); + EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1); + HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1); + EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1); + EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1); + EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1); + EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1); + EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1); + EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1); + EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1); + EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1); + EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); } - - - } if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven){ if(LoadedMods.Railcraft){ @@ -286,22 +280,6 @@ public class RECIPES_Machines { "circuitMaster",ItemList.Cover_Screen.get(1),CI.getDataOrb(), GregtechItemList.Gregtech_Computer_Cube.get(1)); - /*RecipeUtils.addShapedGregtechRecipe( - CI.electricPiston_EV, OrePrefixes.circuit.get(Materials.Ultimate), CI.electricPiston_EV, - CI.electricMotor_EV, CI.machineCasing_EV, CI.electricMotor_EV, - "gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium", - ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 793, 1)); - RecipeUtils.addShapedGregtechRecipe( - CI.electricPiston_IV, OrePrefixes.circuit.get(Materials.Superconductor), CI.electricPiston_IV, - CI.electricMotor_IV, CI.machineCasing_IV, CI.electricMotor_IV, - "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", - ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); - RecipeUtils.addShapedGregtechRecipe( - CI.electricPiston_LuV, OrePrefixes.circuit.get(Materials.Infinite), CI.electricPiston_LuV, - CI.electricMotor_LuV, CI.machineCasing_LuV, CI.electricMotor_LuV, - "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", - ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 795, 1));*/ - //Buffer Core RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[1], cableTier1, CI.component_Plate[1], @@ -879,7 +857,14 @@ public class RECIPES_Machines { CI.component_Plate[2], CI.electricMotor_ULV, CI.component_Plate[2], CI.getTieredCircuit(1), CI.machineHull_LV, CI.getTieredCircuit(0), GregtechItemList.Pollution_Detector.get(1)); - + + //Air Intake Hatch + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6], + CI.component_Plate[6], ItemList.FluidRegulator_IV.get(1), CI.component_Plate[6], + CI.getTieredCircuit(5), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(5), + GregtechItemList.Hatch_Air_Intake.get(1)); + //ULV RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[0], ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), CI.component_Plate[0], @@ -1197,8 +1182,79 @@ public class RECIPES_Machines { GregtechItemList.Industrial_FishingPond.get(1)); } + if (true) { + //Advanced Vacuum Freezer + ItemStack plate = ALLOY.HG1223.getPlateDouble(1); + ItemStack gear = ALLOY.INCOLOY_MA956.getGear(1); + ItemStack frame = ALLOY.INCOLOY_DS.getFrameBox(1); + ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); + ItemStack cell2 = ItemList.Reactor_Coolant_NaK_6.get(1); + RecipeUtils.recipeBuilder( + plate, gear, plate, + cell1, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_AdvancedVacuum.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.electricPiston_IV, GregtechItemList.Casing_AdvancedVacuum.get(1), CI.electricPiston_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Industrial_Cryogenic_Freezer.get(1)); + + //Advanced Blast Furnace + plate = ALLOY.HASTELLOY_N.getPlateDouble(1); + gear = ALLOY.HASTELLOY_W.getGear(1); + frame = ALLOY.HASTELLOY_X.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + ItemStack cell3 = ItemUtils.simpleMetaStack("IC2:reactorVentDiamond:1:1", 1, 1); + + RecipeUtils.recipeBuilder( + plate, cell1, plate, + cell3, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_Adv_BlastFurnace.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.robotArm_IV, GregtechItemList.Casing_Adv_BlastFurnace.get(1), CI.robotArm_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Machine_Adv_BlastFurnace.get(1)); + + //Advanced Implosion Compressor + plate = ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 1); + gear = ALLOY.LEAGRISIUM.getGear(1); + frame = ALLOY.HG1223.getFrameBox(1); + cell1 = ItemUtils.simpleMetaStack("IC2:reactorHeatSwitchDiamond:1", 1, 1); + cell2 = ItemUtils.simpleMetaStack("IC2:reactorVentGold:1", 1, 1); + RecipeUtils.recipeBuilder( + gear,CI.getTieredCircuit(6),gear, + CI.fieldGenerator_IV, CI.machineHull_ZPM, CI.robotArm_IV, + plate, GregtechItemList.Gregtech_Computer_Cube.get(1), plate, + GregtechItemList.Machine_Adv_ImplosionCompressor.get(1)); + + + + //Supply Depot + plate = ALLOY.TUNGSTEN_CARBIDE.getPlateDouble(1); + gear = ALLOY.TRINIUM_TITANIUM.getRing(1); + frame = ALLOY.TUNGSTEN_CARBIDE.getFrameBox(1); + cell1 = CI.conveyorModule_EV; + cell2 = CI.electricMotor_IV; + ItemStack casingAmazon = GregtechItemList.Casing_AmazonWarehouse.get(1); + + RecipeUtils.recipeBuilder( + plate, ItemUtils.getItemStackOfAmountFromOreDict("cableGt12VanadiumGallium", 1), plate, + cell1, frame, cell2, + plate, gear, plate, + GregtechItemList.Casing_AmazonWarehouse.get(Casing_Amount)); + RecipeUtils.recipeBuilder( + casingAmazon, CI.getTieredCircuit(7), casingAmazon, + CI.robotArm_LuV, ItemList.Machine_LuV_Unboxinator.get(1), CI.robotArm_LuV, + CI.conveyorModule_LuV, GregtechItemList.Gregtech_Computer_Cube.get(1), CI.conveyorModule_LuV, + GregtechItemList.Amazon_Warehouse_Controller.get(1)); + + } if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine){ ItemStack plate = ALLOY.STABALLOY.getPlate(1); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index ddce7aec5b..dbdf6b1437 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -97,7 +97,6 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { } public static boolean handleCircuits(){ - hideCircuitsNEI(); addCircuitRecipes(); removeNewCircuits(); @@ -120,10 +119,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { boolean newVersion = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() >= 30; setItemList(ItemList.Circuit_Primitive, GregtechItemList.Old_Circuit_Primitive); - setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); - if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New - } + setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic); setItemList(ItemList.Circuit_Good, GregtechItemList.Old_Circuit_Good); setItemList(ItemList.Circuit_Advanced, GregtechItemList.Old_Circuit_Advanced); //ItemList.Circuit_Data, GregtechItemList.Old_Circuit_Data); @@ -141,7 +137,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { } //Good if (newVersion) { - setItemList(ItemList.valueOf("Circuit_Integrated"), GregtechItemList.Old_Circuit_Good); + setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New } //Advanced if (newVersion) { @@ -310,7 +306,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { //remove a few recipes - GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); + /*GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32070", 32070, 1)); GT_ModHandler.removeRecipeByOutput(ItemUtils.simpleMetaStack("gregtech:gt.metaitem.03:32069", 32069, 1)); if (LoadedMods.Extra_Utils){ ItemStack EQU = ItemUtils.simpleMetaStack("ExtraUtilities:enderQuarryUpgrade", 0, 1); @@ -345,7 +341,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { 80*20, 2); } - } + }*/ return true; } diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index c6dd1bfeb5..7ad7820985 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.recipe.common; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -19,6 +18,7 @@ import gtPlusPlus.core.recipe.LOADER_Machine_Components; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import ic2.core.Ic2Items; public class CI { @@ -179,9 +179,7 @@ public class CI { public static ItemStack explosiveITNT; public static void preInit(){ - //Put these here, because we need them for everything. - new MetaGeneratedGregtechItems(); - + //Tiered Components component_Plate = new String[]{ getTieredComponent(OrePrefixes.plate, 0), |