diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader')
5 files changed, 230 insertions, 254 deletions
diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 2a1981b201..7a4f913521 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -2,6 +2,7 @@ package goodgenerator.loader; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; +import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; @@ -86,7 +87,7 @@ public class FuelRecipeLoader { new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), }, new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), - GT_ModHandler.getModItem("miscutils", "itemDustChromaticGlass", 9), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustChromaticGlass", 9), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1), }, MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200), 2100000, diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 30ca824dc0..3ecaf74c23 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -1,7 +1,6 @@ package goodgenerator.loader; import static goodgenerator.util.DescTextLocalization.addText; -import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -302,16 +301,12 @@ public class Loaders { IDOffset + 20, "LargeFusionComputer3", "Compact Fusion Computer MK-III").getStackForm(1L); - if (GTPlusPlus.isModLoaded()) { - Loaders.LFC[3] = new LargeFusionComputer4( - IDOffset + 21, - "LargeFusionComputer4", - "Compact Fusion Computer MK-IV Prototype").getStackForm(1L); - Loaders.LFC[4] = new LargeFusionComputer5( - IDOffset + 22, - "LargeFusionComputer5", - "Compact Fusion Computer MK-V").getStackForm(1L); - } + Loaders.LFC[3] = new LargeFusionComputer4( + IDOffset + 21, + "LargeFusionComputer4", + "Compact Fusion Computer MK-IV Prototype").getStackForm(1L); + Loaders.LFC[4] = new LargeFusionComputer5(IDOffset + 22, "LargeFusionComputer5", "Compact Fusion Computer MK-V") + .getStackForm(1L); Loaders.Generator_Diesel[0] = new DieselGenerator( 1113, "basicgenerator.diesel.tier.04", diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index ad51d7a99d..9b28bb91fe 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -34,7 +34,6 @@ import static goodgenerator.items.MyMaterial.towEthyl1Hexanol; import static goodgenerator.items.MyMaterial.triniumSulphate; import static goodgenerator.items.MyMaterial.wasteLiquid; import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; @@ -100,76 +99,72 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; - if (GTPlusPlus.isModLoaded()) { - try { - // Naquadah (UEV) - CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64), - Materials.Carbon.getDust(1), GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) }, - new FluidStack[] { Materials.Hydrogen.getGas(64000L), Materials.Fluorine.getGas(64000L), - Materials.Oxygen.getGas(100L) }, - new FluidStack[] {}, - new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64), - Materials.Adamantium.getDust(64), Materials.Gallium.getDust(64) }, - new int[] { 2500, 2500, 2500, 2500 }, - 10 * 20, - (int) GT_Values.VP[10], - 2); - // Enriched Naquadah (UIV) - CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64), - Materials.Carbon.getDust(1), GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L) }, - new FluidStack[] { wasteLiquid.getFluidOrGas(32000) }, - new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64), }, - new int[] { 3300, 3300, 3300 }, - 10 * 20, - (int) GT_Values.VP[11], - 2); - // Naquadria (UMV) - CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64), - GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst) }, - new FluidStack[] { Materials.PhosphoricAcid.getFluid(16000), Materials.SulfuricAcid.getFluid(16000), - Materials.Oxygen.getGas(100L) }, - new FluidStack[] {}, - new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64), - Materials.Indium.getDust(64), ItemList.NaquadriaSupersolid.get(1) }, - new int[] { 2500, 2500, 2500, 2500 }, - 5 * 20, - (int) GT_Values.VP[12], - 3); - // Activate Them - MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] { Materials.Nickel.getPlasma(144 * 16) }, - new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 64), - inertNaquadah.get(OrePrefixes.dust, 32) }, - new FluidStack[] { Materials.Naquadah.getMolten(144 * 9216) }, - new ItemStack[] { Materials.Nickel.getDust(16) }, - 2000, - 600, - 500); - MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] { Materials.Titanium.getPlasma(16 * 144) }, - new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 64), - inertEnrichedNaquadah.get(OrePrefixes.dust, 32) }, - new FluidStack[] { Materials.NaquadahEnriched.getMolten(144 * 9216) }, - new ItemStack[] { Materials.Titanium.getDust(16) }, - 2000, - 900, - 850); - MyRecipeAdder.instance.addNeutronActivatorRecipe( - new FluidStack[] { Materials.Americium.getPlasma(144 * 16) }, - new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 64), - inertNaquadria.get(OrePrefixes.dust, 32) }, - new FluidStack[] { Materials.Naquadria.getMolten(144 * 9216) }, - new ItemStack[] { Materials.Americium.getDust(16) }, - 2000, - 1100, - 1080); - } catch (Throwable t) { - // Cry about it - } + try { + // Naquadah (UEV) + CORE.RA.addQuantumTransformerRecipe( + new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64), + Materials.Carbon.getDust(1), GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) }, + new FluidStack[] { Materials.Hydrogen.getGas(64000L), Materials.Fluorine.getGas(64000L), + Materials.Oxygen.getGas(100L) }, + new FluidStack[] {}, + new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64), + Materials.Adamantium.getDust(64), Materials.Gallium.getDust(64) }, + new int[] { 2500, 2500, 2500, 2500 }, + 10 * 20, + (int) GT_Values.VP[10], + 2); + // Enriched Naquadah (UIV) + CORE.RA.addQuantumTransformerRecipe( + new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64), + Materials.Carbon.getDust(1), GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst) }, + new FluidStack[] { Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L) }, + new FluidStack[] { wasteLiquid.getFluidOrGas(32000) }, + new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64), }, + new int[] { 3300, 3300, 3300 }, + 10 * 20, + (int) GT_Values.VP[11], + 2); + // Naquadria (UMV) + CORE.RA.addQuantumTransformerRecipe( + new ItemStack[] { naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64), + GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst) }, + new FluidStack[] { Materials.PhosphoricAcid.getFluid(16000), Materials.SulfuricAcid.getFluid(16000), + Materials.Oxygen.getGas(100L) }, + new FluidStack[] {}, + new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64), + Materials.Indium.getDust(64), ItemList.NaquadriaSupersolid.get(1) }, + new int[] { 2500, 2500, 2500, 2500 }, + 5 * 20, + (int) GT_Values.VP[12], + 3); + // Activate Them + MyRecipeAdder.instance.addNeutronActivatorRecipe( + new FluidStack[] { Materials.Nickel.getPlasma(144 * 16) }, + new ItemStack[] { inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32) }, + new FluidStack[] { Materials.Naquadah.getMolten(144 * 9216) }, + new ItemStack[] { Materials.Nickel.getDust(16) }, + 2000, + 600, + 500); + MyRecipeAdder.instance.addNeutronActivatorRecipe( + new FluidStack[] { Materials.Titanium.getPlasma(16 * 144) }, + new ItemStack[] { inertEnrichedNaquadah.get(OrePrefixes.dust, 64), + inertEnrichedNaquadah.get(OrePrefixes.dust, 32) }, + new FluidStack[] { Materials.NaquadahEnriched.getMolten(144 * 9216) }, + new ItemStack[] { Materials.Titanium.getDust(16) }, + 2000, + 900, + 850); + MyRecipeAdder.instance.addNeutronActivatorRecipe( + new FluidStack[] { Materials.Americium.getPlasma(144 * 16) }, + new ItemStack[] { inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32) }, + new FluidStack[] { Materials.Naquadria.getMolten(144 * 9216) }, + new ItemStack[] { Materials.Americium.getDust(16) }, + 2000, + 1100, + 1080); + } catch (Throwable t) { + // Cry about it } // Fix shit @@ -1152,68 +1147,64 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Multi Chemical Reactor done!\n"); - if (GTPlusPlus.isModLoaded()) { - // For Gt++ Multi Centrifuge - // Apparently NEI will break down if one modifies the hash list directly. - // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); - // RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( - // RecipeMaps.centrifugeRecipes, - // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); - // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); - - // For Simple Washer - for (GT_Recipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) { - ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { - int[] oreDict = OreDictionary.getOreIDs(input); - for (int oreDictID : oreDict) { - if (OreDictionary.getOreName(oreDictID) - .startsWith("dustImpureNaq") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureNaq")) { - GT_Recipe tRecipe = recipe.copy(); - boolean modified = false; - for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; - if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - naquadahEarth.get(OrePrefixes.dust, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - naquadriaEarth.get(OrePrefixes.dust, 1)); - modified = true; - } - } - if (modified) { - reAdd.add(tRecipe); - remove.add(recipe); + // For Gt++ Multi Centrifuge + // Apparently NEI will break down if one modifies the hash list directly. + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); + // RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( + // RecipeMaps.centrifugeRecipes, + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); + // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); + + // For Simple Washer + for (GT_Recipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) { + ItemStack input = recipe.mInputs[0]; + if (GT_Utility.isStackValid(input)) { + int[] oreDict = OreDictionary.getOreIDs(input); + for (int oreDictID : oreDict) { + if (OreDictionary.getOreName(oreDictID) + .startsWith("dustImpureNaq") + || OreDictionary.getOreName(oreDictID) + .startsWith("dustPureNaq")) { + GT_Recipe tRecipe = recipe.copy(); + boolean modified = false; + for (int i = 0; i < tRecipe.mOutputs.length; i++) { + if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility + .copyAmount(tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); + modified = true; + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility + .copyAmount(tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); + modified = true; } - break; } + if (modified) { + reAdd.add(tRecipe); + remove.add(recipe); + } + break; } } } - GTPPRecipeMaps.simpleWasherRecipes.getBackend() - .removeRecipes(remove); - reAdd.forEach(GTPPRecipeMaps.simpleWasherRecipes::add); - GTPPRecipeMaps.simpleWasherRecipes.getBackend() - .reInit(); + } + GTPPRecipeMaps.simpleWasherRecipes.getBackend() + .removeRecipes(remove); + reAdd.forEach(GTPPRecipeMaps.simpleWasherRecipes::add); + GTPPRecipeMaps.simpleWasherRecipes.getBackend() + .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); - remove.clear(); - reAdd.clear(); + remove.clear(); + reAdd.clear(); - GT_Log.out.print("Simple Washer done!\n"); - } + GT_Log.out.print("Simple Washer done!\n"); // For Cauldron Wash registerCauldronCleaningFor(Materials.Naquadah, naquadahEarth.getBridgeMaterial()); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 0c7ae0e60f..9360eac50c 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1,6 +1,5 @@ package goodgenerator.loader; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -899,28 +898,26 @@ public class RecipeLoader { .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - if (GTPlusPlus.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2)) - .fluidInputs( - FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), - Materials.NitrogenDioxide.getGas(1000)) - .fluidOutputs(FluidRegistry.getFluidStack("combustionpromotor", 2000)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2)) - .fluidInputs( - FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), - Materials.NitrogenDioxide.getGas(1000)) - .fluidOutputs(FluidRegistry.getFluidStack("combustionpromotor", 2000)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(multiblockChemicalReactorRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2)) + .fluidInputs( + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000)) + .fluidOutputs(FluidRegistry.getFluidStack("combustionpromotor", 2000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2)) + .fluidInputs( + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000)) + .fluidOutputs(FluidRegistry.getFluidStack("combustionpromotor", 2000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(multiblockChemicalReactorRecipes); GT_ModHandler.addCraftingRecipe( ItemRefer.Universal_Chemical_Fuel_Engine.get(1), diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 70517fe781..51c8f5a641 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -864,15 +864,13 @@ public class RecipeLoader_02 { .addTo(fluidExtractionRecipes); } - if (GTPlusPlus.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) - .fluidInputs(FluidRegistry.getFluidStack("fluid.coaltaroil", 100)) - .fluidOutputs(MyMaterial.cyclopentadiene.getFluidOrGas(30)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(distilleryRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .fluidInputs(FluidRegistry.getFluidStack("fluid.coaltaroil", 100)) + .fluidOutputs(MyMaterial.cyclopentadiene.getFluidOrGas(30)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(distilleryRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.getIntegratedCircuit(24)) @@ -947,18 +945,16 @@ public class RecipeLoader_02 { 30 * SECONDS, TierEU.RECIPE_MV); - if (GTPlusPlus.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ferrocene.get(OrePrefixes.dust, 4), Materials.SodiumHydroxide.getDust(8)) - .fluidInputs( - FluidRegistry.getFluidStack("fluid.kerosene", 40000), - Materials.Naphtha.getFluid(3000), - MyMaterial.diethylamine.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.ironedKerosene.getFluidOrGas(44000)) - .duration(2 * MINUTES) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(MyMaterial.ferrocene.get(OrePrefixes.dust, 4), Materials.SodiumHydroxide.getDust(8)) + .fluidInputs( + FluidRegistry.getFluidStack("fluid.kerosene", 40000), + Materials.Naphtha.getFluid(3000), + MyMaterial.diethylamine.getFluidOrGas(1000)) + .fluidOutputs(MyMaterial.ironedKerosene.getFluidOrGas(44000)) + .duration(2 * MINUTES) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); GT_Values.RA.stdBuilder() .itemInputs(MyMaterial.ferrocene.get(OrePrefixes.dust, 4)) @@ -1408,82 +1404,78 @@ public class RecipeLoader_02 { .addTo(AssemblyLine); // Compact MK4 Fusion Coil - if (GTPlusPlus.isModLoaded()) { - MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13), - ItemRefer.HiC_T5.get(1), GT_ModHandler.getModItem("miscutils", "item.itemBufferCore4", 1), }, - new FluidStack[] { FluidRegistry.getFluidStack("molten.energycrystal", 1152), - FluidRegistry.getFluidStack("molten.laurenium", 144) }, - ItemRefer.Compact_Fusion_Coil_T3.get(1), - 520000, - 2000, - 3); + MyRecipeAdder.instance.addPreciseAssemblerRecipe( + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "gtplusplus.blockcasings.3", 3, 13), + ItemRefer.HiC_T5.get(1), GT_ModHandler.getModItem(GTPlusPlus.ID, "item.itemBufferCore4", 1), }, + new FluidStack[] { FluidRegistry.getFluidStack("molten.energycrystal", 1152), + FluidRegistry.getFluidStack("molten.laurenium", 144) }, + ItemRefer.Compact_Fusion_Coil_T3.get(1), + 520000, + 2000, + 3); - // Compact MK4 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() - .itemInputs(ItemRefer.Compact_Fusion_Coil_T3.get(1)) - .itemOutputs(GregtechItemList.Casing_Fusion_Internal.get(3)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_UEV) - .addTo(assemblerRecipes); + // Compact MK4 Fusion Disassembly Recipe + GT_Values.RA.stdBuilder() + .itemInputs(ItemRefer.Compact_Fusion_Coil_T3.get(1)) + .itemOutputs(GregtechItemList.Casing_Fusion_Internal.get(3)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .addTo(assemblerRecipes); - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemRefer.Compact_Fusion_MK3.get(1), - 2_560_000, - 4_096, - (int) TierEU.RECIPE_UHV, - 256, - new Object[] { GregtechItemList.FusionComputer_UV2.get(48), new Object[] { "circuitInfinite", 1 }, - new Object[] { "circuitInfinite", 1 }, new Object[] { "circuitInfinite", 1 }, - new Object[] { "circuitInfinite", 1 }, ItemList.Circuit_Wafer_PPIC.get(64), - ItemList.UHV_Coil.get(16), ALLOY.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8), - ItemList.Field_Generator_UHV.get(8), - MyMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) }, - new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), MyMaterial.dalisenite.getMolten(1152), - ALLOY.BOTMIUM.getFluidStack(288) }, - ItemRefer.Compact_Fusion_MK4.get(1), - 6000, - (int) TierEU.RECIPE_UV); - - // Compact MK5 Fusion Coil - MyRecipeAdder.instance.addPreciseAssemblerRecipe( - new ItemStack[] { GregtechItemList.Casing_Fusion_Internal2.get(3), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), ItemRefer.HiC_T5.get(4), - CI.getEnergyCore(5, 1), }, - new FluidStack[] { ALLOY.BLACK_TITANIUM.getFluidStack(1152), - MyMaterial.metastableOganesson.getMolten(576) }, - ItemRefer.Compact_Fusion_Coil_T4.get(1), - (int) TierEU.RECIPE_UHV, - 2000, - 3); + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemRefer.Compact_Fusion_MK3.get(1), + 2_560_000, + 4_096, + (int) TierEU.RECIPE_UHV, + 256, + new Object[] { GregtechItemList.FusionComputer_UV2.get(48), new Object[] { "circuitInfinite", 1 }, + new Object[] { "circuitInfinite", 1 }, new Object[] { "circuitInfinite", 1 }, + new Object[] { "circuitInfinite", 1 }, ItemList.Circuit_Wafer_PPIC.get(64), ItemList.UHV_Coil.get(16), + ALLOY.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8), ItemList.Field_Generator_UHV.get(8), + MyMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) }, + new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), MyMaterial.dalisenite.getMolten(1152), + ALLOY.BOTMIUM.getFluidStack(288) }, + ItemRefer.Compact_Fusion_MK4.get(1), + 6000, + (int) TierEU.RECIPE_UV); + + // Compact MK5 Fusion Coil + MyRecipeAdder.instance.addPreciseAssemblerRecipe( + new ItemStack[] { GregtechItemList.Casing_Fusion_Internal2.get(3), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), ItemRefer.HiC_T5.get(4), + CI.getEnergyCore(5, 1), }, + new FluidStack[] { ALLOY.BLACK_TITANIUM.getFluidStack(1152), + MyMaterial.metastableOganesson.getMolten(576) }, + ItemRefer.Compact_Fusion_Coil_T4.get(1), + (int) TierEU.RECIPE_UHV, + 2000, + 3); - // Compact MK5 Computer - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemRefer.Compact_Fusion_MK4.get(1), - 10_240_000, - 16_384, - (int) TierEU.RECIPE_UEV, - 256, - new Object[] { GregtechItemList.FusionComputer_UV3.get(48), new Object[] { "circuitBio", 1 }, - new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 }, - new Object[] { "circuitBio", 1 }, ItemList.Circuit_Wafer_QPIC.get(64), ItemList.UHV_Coil.get(64), - ELEMENT.STANDALONE.HYPOGEN.getPlateDense(8), ItemRefer.HiC_T5.get(8), - ItemList.Field_Generator_UEV.get(8), - MyMaterial.metastableOganesson.get(OrePrefixes.gearGtSmall, 64) }, - new FluidStack[] { MyMaterial.tairitsu.getMolten(2304), ALLOY.OCTIRON.getFluidStack(1152), - ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288) }, - ItemRefer.Compact_Fusion_MK5.get(1), - 6000, - (int) TierEU.RECIPE_UHV); - - // Compact MK5 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() - .itemInputs(ItemRefer.Compact_Fusion_Coil_T4.get(1)) - .itemOutputs(GregtechItemList.Casing_Fusion_Internal2.get(3)) - .duration(1 * MINUTES) - .eut(TierEU.RECIPE_UIV) - .addTo(assemblerRecipes); - } + // Compact MK5 Computer + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemRefer.Compact_Fusion_MK4.get(1), + 10_240_000, + 16_384, + (int) TierEU.RECIPE_UEV, + 256, + new Object[] { GregtechItemList.FusionComputer_UV3.get(48), new Object[] { "circuitBio", 1 }, + new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 }, + ItemList.Circuit_Wafer_QPIC.get(64), ItemList.UHV_Coil.get(64), + ELEMENT.STANDALONE.HYPOGEN.getPlateDense(8), ItemRefer.HiC_T5.get(8), + ItemList.Field_Generator_UEV.get(8), MyMaterial.metastableOganesson.get(OrePrefixes.gearGtSmall, 64) }, + new FluidStack[] { MyMaterial.tairitsu.getMolten(2304), ALLOY.OCTIRON.getFluidStack(1152), + ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288) }, + ItemRefer.Compact_Fusion_MK5.get(1), + 6000, + (int) TierEU.RECIPE_UHV); + + // Compact MK5 Fusion Disassembly Recipe + GT_Values.RA.stdBuilder() + .itemInputs(ItemRefer.Compact_Fusion_Coil_T4.get(1)) + .itemOutputs(GregtechItemList.Casing_Fusion_Internal2.get(3)) + .duration(1 * MINUTES) + .eut(TierEU.RECIPE_UIV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(Materials.Antimony.getDust(8), GT_Utility.getIntegratedCircuit(24)) |