diff options
47 files changed, 1807 insertions, 2012 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java index 4ca2eb36f6..d48a65c79d 100644 --- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java +++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java @@ -1,5 +1,7 @@ package bloodasp.galacticgreg; +import static gregtech.api.enums.Mods.AppliedEnergistics2; + import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -13,7 +15,6 @@ import bloodasp.galacticgreg.command.AEStorageCommand; import bloodasp.galacticgreg.command.ProfilingCommand; import bloodasp.galacticgreg.registry.GalacticGregRegistry; import bloodasp.galacticgreg.schematics.SpaceSchematicHandler; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -90,26 +91,21 @@ public class GalacticGreg { // new WorldGenGaGT().run(); DO NOT UNCOMMENT, was moved to gregtech.loaders.postload.GT_Worldgenloader - if (Loader.isModLoaded("bartworks")) { - for (int f = 0, - j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomLargeVeinSlots", 0); f - < j; f++) { - new BW_Worldgen_Ore_Layer_Space( - "mix.custom." + (f < 10 ? "0" : "") + f, - GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + "mix.custom." + (f < 10 ? "0" : "") + f, "Enabled", false)); - } + for (int f = 0, + j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomLargeVeinSlots", 0); f + < j; f++) { + new BW_Worldgen_Ore_Layer_Space( + "mix.custom." + (f < 10 ? "0" : "") + f, + GregTech_API.sWorldgenFile + .get("worldgen.GaGregBartworks." + "mix.custom." + (f < 10 ? "0" : "") + f, "Enabled", false)); + } - for (int f = 0, - j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomSmallSlots", 0); f - < j; f++) { - new BW_Worldgen_Ore_SmallOre_Space( - "small.custom." + (f < 10 ? "0" : "") + f, - GregTech_API.sWorldgenFile.get( - "worldgen.GaGregBartworks." + "small.custom." + (f < 10 ? "0" : "") + f, - "Enabled", - false)); - } + for (int f = 0, j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomSmallSlots", 0); f + < j; f++) { + new BW_Worldgen_Ore_SmallOre_Space( + "small.custom." + (f < 10 ? "0" : "") + f, + GregTech_API.sWorldgenFile + .get("worldgen.GaGregBartworks." + "small.custom." + (f < 10 ? "0" : "") + f, "Enabled", false)); } for (Runnable r : ADDITIONALVEINREGISTER) { @@ -136,7 +132,7 @@ public class GalacticGreg { if (GalacticConfig.ProfileOreGen) pEvent.registerServerCommand(new ProfilingCommand()); - if (Loader.isModLoaded("appliedenergistics2") && GalacticConfig.EnableAEExportCommand + if (AppliedEnergistics2.isModLoaded() && GalacticConfig.EnableAEExportCommand && GalacticConfig.SchematicsEnabled) pEvent.registerServerCommand(new AEStorageCommand()); Logger.trace("Leaving SERVERLOAD"); diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index d5c7d63f8d..7997865ebe 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -54,7 +54,6 @@ import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.MyMaterial; import gregtech.api.enums.GT_Values; @@ -3454,105 +3453,103 @@ public class RecipeLoader { GT_Log.out.print("Electrolyzer (PA) done!\n"); - if (Loader.isModLoaded("miscutils")) { - // For Simple Washer - for (GT_Recipe recipe : 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("dustImpureCerium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustImpureSamarium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureSamarium") - || OreDictionary.getOreName(oreDictID) - .startsWith("dustPureCerium")) { - GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; - if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); - } - } - if (!tRecipe.equals(recipe)) { - reAdd.add(tRecipe); - remove.add(recipe); + // For Simple Washer + for (GT_Recipe recipe : 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("dustImpureCerium") + || OreDictionary.getOreName(oreDictID) + .startsWith("dustImpureSamarium") + || OreDictionary.getOreName(oreDictID) + .startsWith("dustPureSamarium") + || OreDictionary.getOreName(oreDictID) + .startsWith("dustPureCerium")) { + GT_Recipe tRecipe = recipe.copy(); + for (int i = 0; i < tRecipe.mOutputs.length; i++) { + if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); + } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); } - break; } + if (!tRecipe.equals(recipe)) { + reAdd.add(tRecipe); + remove.add(recipe); + } + break; } } } - simpleWasherRecipes.getBackend() - .removeRecipes(remove); - reAdd.forEach(simpleWasherRecipes::add); - simpleWasherRecipes.getBackend() - .reInit(); + } + simpleWasherRecipes.getBackend() + .removeRecipes(remove); + reAdd.forEach(simpleWasherRecipes::add); + simpleWasherRecipes.getBackend() + .reInit(); - GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); + GT_Log.out.print(Tags.MODID + ": 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"); - // Dehydrator - for (GT_Recipe recipe : chemicalDehydratorRecipes.getAllRecipes()) { - if (recipe.mInputs.length == 0) { - continue; - } - ItemStack input = recipe.mInputs[0]; + // Dehydrator + for (GT_Recipe recipe : chemicalDehydratorRecipes.getAllRecipes()) { + if (recipe.mInputs.length == 0) { + continue; + } + ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { - int[] oreDict = OreDictionary.getOreIDs(input); - for (int oreDictID : oreDict) { - String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") - || oreName.equals("dustZirkelite") - || oreName.equals("dustGadoliniteCe") - || oreName.equals("dustGadoliniteY") - || oreName.equals("dustPolycrase") - || oreName.equals("dustBastnasite")) { - GT_Recipe tRecipe = recipe.copy(); - for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; - if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); - } - } - if (!tRecipe.equals(recipe)) { - reAdd.add(tRecipe); - remove.add(recipe); + if (GT_Utility.isStackValid(input)) { + int[] oreDict = OreDictionary.getOreIDs(input); + for (int oreDictID : oreDict) { + String oreName = OreDictionary.getOreName(oreDictID); + if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") + || oreName.equals("dustZirkelite") + || oreName.equals("dustGadoliniteCe") + || oreName.equals("dustGadoliniteY") + || oreName.equals("dustPolycrase") + || oreName.equals("dustBastnasite")) { + GT_Recipe tRecipe = recipe.copy(); + for (int i = 0; i < tRecipe.mOutputs.length; i++) { + if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (tRecipe.mOutputs[i].isItemEqual(Materials.Cerium.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); } - break; } + if (!tRecipe.equals(recipe)) { + reAdd.add(tRecipe); + remove.add(recipe); + } + break; } } } + } - chemicalDehydratorRecipes.getBackend() - .removeRecipes(remove); - reAdd.forEach(chemicalDehydratorRecipes::add); - chemicalDehydratorRecipes.getBackend() - .reInit(); + chemicalDehydratorRecipes.getBackend() + .removeRecipes(remove); + reAdd.forEach(chemicalDehydratorRecipes::add); + chemicalDehydratorRecipes.getBackend() + .reInit(); - GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); + GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); - remove.clear(); - reAdd.clear(); + remove.clear(); + reAdd.clear(); - GT_Log.out.print("Dehydrator done!\n"); - } + GT_Log.out.print("Dehydrator done!\n"); /* * DOES NOT WORK, something to do with load times for sifter recipes or some shit //Sifter for (GT_Recipe recipe diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index f8e4bbfe7b..415b5af36c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -17,7 +17,6 @@ import static com.github.bartimaeusnek.bartworks.common.loaders.BioRecipeLoader. import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.removeIC2Recipes; import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTPlusPlus; import java.io.IOException; import java.util.Map; @@ -113,9 +112,7 @@ public final class MainMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent preinit) { - if (GTPlusPlus.isModLoaded()) { - MainMod.LOGGER.info("Found GT++, continuing"); - } + MainMod.LOGGER.info("Found GT++, continuing"); if (API_ConfigValues.debugLog) { try { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java index 329d73023f..977ebf19e0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java @@ -128,9 +128,7 @@ public class GTNHBlocks { } } - if (TecTech.isModLoaded()) { - BioVatLogicAdder.BioVatGlass.addCustomGlass(TecTech.ID, "tile.quantumGlass", 0, 8); - } + BioVatLogicAdder.BioVatGlass.addCustomGlass(TecTech.ID, "tile.quantumGlass", 0, 8); if (Witchery.isModLoaded()) { for (int i = 0; i < 16; i++) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index 499686e6e0..1a655ab4fa 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -16,7 +16,6 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static com.github.bartimaeusnek.bartworks.MainMod.BWT; import static com.github.bartimaeusnek.bartworks.MainMod.GT2; import static gregtech.api.enums.Mods.GalactiGreg; -import static gregtech.api.enums.Mods.TecTech; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -409,44 +408,42 @@ public class ItemRegistry { "VoidMiner1", "Void Miner I").getStackForm(1L); } - if (TecTech.isModLoaded()) { - TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, - "pipe.lowpowerlaser", - "Low Power Laser Pipe").getStackForm(1L); - int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; - for (int amps = 32; amps <= 128; amps += 32) { - for (int tier = 4; tier < 8; tier++) { - TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( - startID, - GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", - tier, - amps).getStackForm(1L); - startID++; - } + TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, + "pipe.lowpowerlaser", + "Low Power Laser Pipe").getStackForm(1L); + int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; + for (int amps = 32; amps <= 128; amps += 32) { + for (int tier = 4; tier < 8; tier++) { + TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( + startID, + GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", + tier, + amps).getStackForm(1L); + startID++; } - for (int amps = 32; amps <= 128; amps += 32) { - for (int tier = 4; tier < 8; tier++) { - TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( - startID, - GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", - tier, - amps).getStackForm(1L); - startID++; - } + } + for (int amps = 32; amps <= 128; amps += 32) { + for (int tier = 4; tier < 8; tier++) { + TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( + startID, + GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", + tier, + amps).getStackForm(1L); + startID++; } - for (int amps = 32; amps <= 128; amps += 32) { - for (int tier = 4; tier < 8; tier++) { - TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( - startID, - GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", - tier, - amps).getStackForm(1L); - startID++; - } + } + for (int amps = 32; amps <= 128; amps += 32) { + for (int tier = 4; tier < 8; tier++) { + TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( + startID, + GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", + tier, + amps).getStackForm(1L); + startID++; } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java index ba08d083c2..85f66beec6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java @@ -976,7 +976,7 @@ public class PlatinumSludgeOverHaul { if (obj instanceof ShapedRecipes || obj instanceof ShapelessRecipes) { inputName = "recipeOutput"; inputItemName = "recipeItems"; - } else if (GTPlusPlus.isModLoaded()) { + } else { try { if (Class.forName("gtPlusPlus.api.objects.minecraft.ShapedRecipe") .isAssignableFrom(obj.getClass())) @@ -1109,33 +1109,33 @@ public class PlatinumSludgeOverHaul { } } - if (GTPlusPlus.isModLoaded()) { - try { - if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent") - .isAssignableFrom( - stack.getItem() - .getClass()) - && !stack.getUnlocalizedName() - .contains("dust") - && !stack.getUnlocalizedName() - .contains("Dust")) - return true; - if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular") - .isAssignableFrom( - Block.getBlockFromItem(stack.getItem()) - .getClass())) - return true; - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L) - .getItem()) { + try { + if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent") + .isAssignableFrom( + stack.getItem() + .getClass()) + && !stack.getUnlocalizedName() + .contains("dust") + && !stack.getUnlocalizedName() + .contains("Dust")) { return true; } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L) - .getItem()) { + if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular") + .isAssignableFrom( + Block.getBlockFromItem(stack.getItem()) + .getClass())) { return true; } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L) + .getItem()) { + return true; + } + if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L) + .getItem()) { + return true; } if (GalaxySpace.isModLoaded()) { if (stack.getItem() == GT_ModHandler.getModItem(GalaxySpace.ID, "metalsblock", 1L, 7) diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java index 0502c121fd..704b4ed8cb 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java @@ -13,9 +13,7 @@ package com.github.bartimaeusnek.crossmod; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalacticraftCore; -import static gregtech.api.enums.Mods.TecTech; import java.io.StringReader; @@ -79,20 +77,14 @@ public class BartWorksCrossmod { if (GalacticraftCore.isModLoaded()) { GalacticraftProxy.postInit(init); } - if (GTPlusPlus.isModLoaded()) { - RadioHatchCompat.run(); - } - if (TecTech.isModLoaded()) { - TecTechResearchLoader.runResearches(); - } + RadioHatchCompat.run(); + TecTechResearchLoader.runResearches(); } @Mod.EventHandler public void onFMLServerStart(FMLServerStartingEvent event) { - if (GTPlusPlus.isModLoaded()) { - for (Object s : RadioHatchCompat.TranslateSet) { - StringTranslate.inject(new ReaderInputStream(new StringReader((String) s))); - } + for (Object s : RadioHatchCompat.TranslateSet) { + StringTranslate.inject(new ReaderInputStream(new StringReader((String) s))); } } } diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index 7467343599..8ead1ca4b0 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -890,85 +890,82 @@ public class Assembler implements Runnable { } // Buck Converter IV-UIV - if (BartWorks.isModLoaded()) { - // Buck Converter IV - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2) }, - Materials.TungstenSteel.getMolten(288), - CustomItemList.Machine_BuckConverter_IV.get(1), - 100, - 7680); + // Buck Converter IV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), + getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2) }, + Materials.TungstenSteel.getMolten(288), + CustomItemList.Machine_BuckConverter_IV.get(1), + 100, + 7680); - // Buck Converter LuV - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator - .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 3) }, - new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), - CustomItemList.Machine_BuckConverter_LuV.get(1), - 100, - 30720); + // Buck Converter LuV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator + .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), + getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 3) }, + new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), + CustomItemList.Machine_BuckConverter_LuV.get(1), + 100, + 30720); - // Buck Converter ZPM - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4) }, - Materials.Iridium.getMolten(288), - CustomItemList.Machine_BuckConverter_ZPM.get(1), - 100, - 122880); + // Buck Converter ZPM + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), + getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4) }, + Materials.Iridium.getMolten(288), + CustomItemList.Machine_BuckConverter_ZPM.get(1), + 100, + 122880); - // Buck Converter UV - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5) }, - Materials.Osmium.getMolten(288), - CustomItemList.Machine_BuckConverter_UV.get(1), - 100, - 500000); - - // Buck Converter UHV - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5) }, - Materials.Neutronium.getMolten(288), - CustomItemList.Machine_BuckConverter_UHV.get(1), - 100, - 2000000); - - // Buck Converter UEV - GT_Values.RA - .addAssemblerRecipe( - new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1), - getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2), - GT_OreDictUnificator - .get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), - getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5) }, - getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288), - CustomItemList.Machine_BuckConverter_UEV.get(1), - 100, - 8000000); + // Buck Converter UV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), + getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5) }, + Materials.Osmium.getMolten(288), + CustomItemList.Machine_BuckConverter_UV.get(1), + 100, + 500000); - // Buck Converter UIV - GT_Values.RA.addAssemblerRecipe( + // Buck Converter UHV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), + getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5) }, + Materials.Neutronium.getMolten(288), + CustomItemList.Machine_BuckConverter_UHV.get(1), + 100, + 2000000); + + // Buck Converter UEV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { getItemContainer("Transformer_UIV_UEV").get(1), getItemContainer("Display").get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), + getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5) }, + getOrDefault("Bedrockium", Materials.Neutronium).getMolten(288), + CustomItemList.Machine_BuckConverter_UEV.get(1), + 100, + 8000000); + + // Buck Converter UIV + GT_Values.RA + .addAssemblerRecipe( new ItemStack[] { getItemContainer("Transformer_UMV_UIV").get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Optical, 2), GT_OreDictUnificator @@ -979,7 +976,6 @@ public class Assembler implements Runnable { CustomItemList.Machine_BuckConverter_UIV.get(1), 200, 8000000); - } // Laser Dynamo { diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java b/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java index 4df4e4f209..f2d5a65926 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Godforge.java @@ -1,7 +1,6 @@ package com.github.technus.tectech.loader.recipe; import static com.github.technus.tectech.util.GodforgeMath.getRandomIntInRange; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import java.util.ArrayList; @@ -36,281 +35,271 @@ public class Godforge implements Runnable { @Override public void run() { - if (GTPlusPlus.isModLoaded()) { - // Solid to plasma recipes + // Solid to plasma recipes + { + // Fusion tier 1-3 { - // Fusion tier 1-3 - { - // Single step - ItemStack[] solids_t0_1step = { Materials.Aluminium.getDust(1), Materials.Iron.getDust(1), - Materials.Calcium.getDust(1), Materials.Sulfur.getDust(1), Materials.Zinc.getDust(1), - Materials.Niobium.getDust(1), Materials.Tin.getDust(1), Materials.Titanium.getDust(1), - Materials.Nickel.getDust(1), Materials.Silver.getDust(1), Materials.Americium.getDust(1), - Materials.Antimony.getDust(1), Materials.Ardite.getDust(1), Materials.Arsenic.getDust(1), - Materials.Barium.getDust(1), Materials.Beryllium.getDust(1), Materials.Caesium.getDust(1), - Materials.Cadmium.getDust(1), Materials.Carbon.getDust(1), Materials.Cerium.getDust(1), - Materials.Cobalt.getDust(1), Materials.Copper.getDust(1), Materials.Desh.getDust(1), - Materials.Dysprosium.getDust(1), Materials.Erbium.getDust(1), Materials.Europium.getDust(1), - Materials.Gadolinium.getDust(1), Materials.Gallium.getDust(1), Materials.Gold.getDust(1), - Materials.Holmium.getDust(1), Materials.Indium.getDust(1), Materials.Lanthanum.getDust(1), - Materials.Lithium.getDust(1), Materials.Lutetium.getDust(1), Materials.Magnesium.getDust(1), - Materials.Manganese.getDust(1), Materials.MeteoricIron.getDust(1), - Materials.Molybdenum.getDust(1), Materials.Neodymium.getDust(1), - Materials.Oriharukon.getDust(1), Materials.Palladium.getDust(1), - Materials.Phosphorus.getDust(1), Materials.Potassium.getDust(1), - Materials.Praseodymium.getDust(1), Materials.Promethium.getDust(1), - Materials.Rubidium.getDust(1), Materials.Samarium.getDust(1), Materials.Silicon.getDust(1), - Materials.Sodium.getDust(1), Materials.Strontium.getDust(1), Materials.Tantalum.getDust(1), - Materials.Tellurium.getDust(1), Materials.Terbium.getDust(1), Materials.Thulium.getDust(1), - Materials.Tungsten.getDust(1), Materials.Uranium.getDust(1), Materials.Uranium235.getDust(1), - Materials.Vanadium.getDust(1), Materials.Ytterbium.getDust(1), Materials.Yttrium.getDust(1), - ELEMENT.getInstance().ZIRCONIUM.getDust(1), ELEMENT.getInstance().THORIUM232.getDust(1), - ELEMENT.getInstance().GERMANIUM.getDust(1), ELEMENT.getInstance().THALLIUM.getDust(1), - ELEMENT.getInstance().RUTHENIUM.getDust(1), ELEMENT.getInstance().RHENIUM.getDust(1), - ELEMENT.getInstance().RHODIUM.getDust(1), ELEMENT.getInstance().IODINE.getDust(1), - ELEMENT.getInstance().HAFNIUM.getDust(1), ELEMENT.getInstance().CURIUM.getDust(1) }; - FluidStack[] solid_plasmas_t0_1step = { Materials.Aluminium.getPlasma(144), - Materials.Iron.getPlasma(144), Materials.Calcium.getPlasma(144), - Materials.Sulfur.getPlasma(144), Materials.Zinc.getPlasma(144), - Materials.Niobium.getPlasma(144), Materials.Tin.getPlasma(144), - Materials.Titanium.getPlasma(144), Materials.Nickel.getPlasma(144), - Materials.Silver.getPlasma(144), Materials.Americium.getPlasma(144), - Materials.Antimony.getPlasma(144), Materials.Ardite.getPlasma(144), - Materials.Arsenic.getPlasma(144), Materials.Barium.getPlasma(144), - Materials.Beryllium.getPlasma(144), Materials.Caesium.getPlasma(144), - Materials.Cadmium.getPlasma(144), Materials.Carbon.getPlasma(144), - Materials.Cerium.getPlasma(144), Materials.Cobalt.getPlasma(144), - Materials.Copper.getPlasma(144), Materials.Desh.getPlasma(144), - Materials.Dysprosium.getPlasma(144), Materials.Erbium.getPlasma(144), - Materials.Europium.getPlasma(144), Materials.Gadolinium.getPlasma(144), - Materials.Gallium.getPlasma(144), Materials.Gold.getPlasma(144), - Materials.Holmium.getPlasma(144), Materials.Indium.getPlasma(144), - Materials.Lanthanum.getPlasma(144), Materials.Lithium.getPlasma(144), - Materials.Lutetium.getPlasma(144), Materials.Magnesium.getPlasma(144), - Materials.Manganese.getPlasma(144), Materials.MeteoricIron.getPlasma(144), - Materials.Molybdenum.getPlasma(144), Materials.Neodymium.getPlasma(144), - Materials.Oriharukon.getPlasma(144), Materials.Palladium.getPlasma(144), - Materials.Phosphorus.getPlasma(144), Materials.Potassium.getPlasma(144), - Materials.Praseodymium.getPlasma(144), Materials.Promethium.getPlasma(144), - Materials.Rubidium.getPlasma(144), Materials.Samarium.getPlasma(144), - Materials.Silicon.getPlasma(144), Materials.Sodium.getPlasma(144), - Materials.Strontium.getPlasma(144), Materials.Tantalum.getPlasma(144), - Materials.Tellurium.getPlasma(144), Materials.Terbium.getPlasma(144), - Materials.Thulium.getPlasma(144), Materials.Tungsten.getPlasma(144), - Materials.Uranium.getPlasma(144), Materials.Uranium235.getPlasma(144), - Materials.Vanadium.getPlasma(144), Materials.Ytterbium.getPlasma(144), - Materials.Yttrium.getPlasma(144), - new FluidStack(ELEMENT.getInstance().ZIRCONIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().THORIUM232.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().GERMANIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().THALLIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().RUTHENIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().RHENIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().RHODIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().IODINE.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().HAFNIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().CURIUM.getPlasma(), 144) }; - - for (int i = 0; i < solids_t0_1step.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new ItemStack[] { solids_t0_1step[i] }, - new FluidStack[] { solid_plasmas_t0_1step[i] }, - 1 * SECONDS, - (int) TierEU.RECIPE_MAX, - false, - 0); - } - - // Multi-step - ItemStack[] solids_t0_xstep = { Materials.Force.getDust(1), Materials.Bismuth.getDust(1), - ELEMENT.STANDALONE.ADVANCED_NITINOL.getDust(1), Materials.Boron.getDust(1), - ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1), ELEMENT.STANDALONE.RUNITE.getDust(1), - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1), Materials.Iridium.getDust(1), - Materials.Naquadah.getDust(1), Materials.Osmium.getDust(1), Materials.Platinum.getDust(1), - Materials.Plutonium.getDust(1), ELEMENT.getInstance().CALIFORNIUM.getDust(1), - Materials.Chrome.getDust(1) }; - FluidStack[] solid_plasmas_t0_xstep = { new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 144), - Materials.Bismuth.getPlasma(144), - new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 144), - Materials.Boron.getPlasma(144), - new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 144), - new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 144), - new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 144), - Materials.Iridium.getPlasma(144), Materials.Naquadah.getPlasma(144), - Materials.Osmium.getPlasma(144), Materials.Platinum.getPlasma(144), - Materials.Plutonium.getPlasma(144), - new FluidStack(ELEMENT.getInstance().CALIFORNIUM.getPlasma(), 144), - Materials.Chrome.getPlasma(144), }; - - for (int i = 0; i < solids_t0_xstep.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new ItemStack[] { solids_t0_xstep[i] }, - new FluidStack[] { solid_plasmas_t0_xstep[i] }, - 3 * SECONDS, - (int) TierEU.RECIPE_MAX, - true, - 0); - } + // Single step + ItemStack[] solids_t0_1step = { Materials.Aluminium.getDust(1), Materials.Iron.getDust(1), + Materials.Calcium.getDust(1), Materials.Sulfur.getDust(1), Materials.Zinc.getDust(1), + Materials.Niobium.getDust(1), Materials.Tin.getDust(1), Materials.Titanium.getDust(1), + Materials.Nickel.getDust(1), Materials.Silver.getDust(1), Materials.Americium.getDust(1), + Materials.Antimony.getDust(1), Materials.Ardite.getDust(1), Materials.Arsenic.getDust(1), + Materials.Barium.getDust(1), Materials.Beryllium.getDust(1), Materials.Caesium.getDust(1), + Materials.Cadmium.getDust(1), Materials.Carbon.getDust(1), Materials.Cerium.getDust(1), + Materials.Cobalt.getDust(1), Materials.Copper.getDust(1), Materials.Desh.getDust(1), + Materials.Dysprosium.getDust(1), Materials.Erbium.getDust(1), Materials.Europium.getDust(1), + Materials.Gadolinium.getDust(1), Materials.Gallium.getDust(1), Materials.Gold.getDust(1), + Materials.Holmium.getDust(1), Materials.Indium.getDust(1), Materials.Lanthanum.getDust(1), + Materials.Lithium.getDust(1), Materials.Lutetium.getDust(1), Materials.Magnesium.getDust(1), + Materials.Manganese.getDust(1), Materials.MeteoricIron.getDust(1), Materials.Molybdenum.getDust(1), + Materials.Neodymium.getDust(1), Materials.Oriharukon.getDust(1), Materials.Palladium.getDust(1), + Materials.Phosphorus.getDust(1), Materials.Potassium.getDust(1), Materials.Praseodymium.getDust(1), + Materials.Promethium.getDust(1), Materials.Rubidium.getDust(1), Materials.Samarium.getDust(1), + Materials.Silicon.getDust(1), Materials.Sodium.getDust(1), Materials.Strontium.getDust(1), + Materials.Tantalum.getDust(1), Materials.Tellurium.getDust(1), Materials.Terbium.getDust(1), + Materials.Thulium.getDust(1), Materials.Tungsten.getDust(1), Materials.Uranium.getDust(1), + Materials.Uranium235.getDust(1), Materials.Vanadium.getDust(1), Materials.Ytterbium.getDust(1), + Materials.Yttrium.getDust(1), ELEMENT.getInstance().ZIRCONIUM.getDust(1), + ELEMENT.getInstance().THORIUM232.getDust(1), ELEMENT.getInstance().GERMANIUM.getDust(1), + ELEMENT.getInstance().THALLIUM.getDust(1), ELEMENT.getInstance().RUTHENIUM.getDust(1), + ELEMENT.getInstance().RHENIUM.getDust(1), ELEMENT.getInstance().RHODIUM.getDust(1), + ELEMENT.getInstance().IODINE.getDust(1), ELEMENT.getInstance().HAFNIUM.getDust(1), + ELEMENT.getInstance().CURIUM.getDust(1) }; + FluidStack[] solid_plasmas_t0_1step = { Materials.Aluminium.getPlasma(144), + Materials.Iron.getPlasma(144), Materials.Calcium.getPlasma(144), Materials.Sulfur.getPlasma(144), + Materials.Zinc.getPlasma(144), Materials.Niobium.getPlasma(144), Materials.Tin.getPlasma(144), + Materials.Titanium.getPlasma(144), Materials.Nickel.getPlasma(144), Materials.Silver.getPlasma(144), + Materials.Americium.getPlasma(144), Materials.Antimony.getPlasma(144), + Materials.Ardite.getPlasma(144), Materials.Arsenic.getPlasma(144), Materials.Barium.getPlasma(144), + Materials.Beryllium.getPlasma(144), Materials.Caesium.getPlasma(144), + Materials.Cadmium.getPlasma(144), Materials.Carbon.getPlasma(144), Materials.Cerium.getPlasma(144), + Materials.Cobalt.getPlasma(144), Materials.Copper.getPlasma(144), Materials.Desh.getPlasma(144), + Materials.Dysprosium.getPlasma(144), Materials.Erbium.getPlasma(144), + Materials.Europium.getPlasma(144), Materials.Gadolinium.getPlasma(144), + Materials.Gallium.getPlasma(144), Materials.Gold.getPlasma(144), Materials.Holmium.getPlasma(144), + Materials.Indium.getPlasma(144), Materials.Lanthanum.getPlasma(144), + Materials.Lithium.getPlasma(144), Materials.Lutetium.getPlasma(144), + Materials.Magnesium.getPlasma(144), Materials.Manganese.getPlasma(144), + Materials.MeteoricIron.getPlasma(144), Materials.Molybdenum.getPlasma(144), + Materials.Neodymium.getPlasma(144), Materials.Oriharukon.getPlasma(144), + Materials.Palladium.getPlasma(144), Materials.Phosphorus.getPlasma(144), + Materials.Potassium.getPlasma(144), Materials.Praseodymium.getPlasma(144), + Materials.Promethium.getPlasma(144), Materials.Rubidium.getPlasma(144), + Materials.Samarium.getPlasma(144), Materials.Silicon.getPlasma(144), + Materials.Sodium.getPlasma(144), Materials.Strontium.getPlasma(144), + Materials.Tantalum.getPlasma(144), Materials.Tellurium.getPlasma(144), + Materials.Terbium.getPlasma(144), Materials.Thulium.getPlasma(144), + Materials.Tungsten.getPlasma(144), Materials.Uranium.getPlasma(144), + Materials.Uranium235.getPlasma(144), Materials.Vanadium.getPlasma(144), + Materials.Ytterbium.getPlasma(144), Materials.Yttrium.getPlasma(144), + new FluidStack(ELEMENT.getInstance().ZIRCONIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().THORIUM232.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().GERMANIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().THALLIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().RUTHENIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().RHENIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().RHODIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().IODINE.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().HAFNIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().CURIUM.getPlasma(), 144) }; + + for (int i = 0; i < solids_t0_1step.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new ItemStack[] { solids_t0_1step[i] }, + new FluidStack[] { solid_plasmas_t0_1step[i] }, + 1 * SECONDS, + (int) TierEU.RECIPE_MAX, + false, + 0); } - // Fusion tier 4-5 - { - // Single step - ItemStack[] solids_t1_1step = { Materials.Lead.getDust(1), Materials.Plutonium241.getDust(1), - Materials.Thorium.getDust(1) }; - FluidStack[] solid_plasmas_t1_1step = { Materials.Lead.getPlasma(144), - Materials.Plutonium241.getPlasma(144), Materials.Thorium.getPlasma(144) }; - - for (int i = 0; i < solids_t1_1step.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new ItemStack[] { solids_t1_1step[i] }, - new FluidStack[] { solid_plasmas_t1_1step[i] }, - 5 * SECONDS, - (int) TierEU.RECIPE_MAX, - false, - 1); - } - - // Multi-step - ItemStack[] solids_t1_xstep = { ELEMENT.getInstance().NEPTUNIUM.getDust(1), - ELEMENT.getInstance().FERMIUM.getDust(1) }; - FluidStack[] solid_plasmas_t1_xstep = { - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 144), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 144) }; - - for (int i = 0; i < solids_t1_xstep.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new ItemStack[] { solids_t1_xstep[i] }, - new FluidStack[] { solid_plasmas_t1_xstep[i] }, - 7 * SECONDS, - (int) TierEU.RECIPE_MAX, - true, - 1); - } + + // Multi-step + ItemStack[] solids_t0_xstep = { Materials.Force.getDust(1), Materials.Bismuth.getDust(1), + ELEMENT.STANDALONE.ADVANCED_NITINOL.getDust(1), Materials.Boron.getDust(1), + ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1), ELEMENT.STANDALONE.RUNITE.getDust(1), + ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1), Materials.Iridium.getDust(1), + Materials.Naquadah.getDust(1), Materials.Osmium.getDust(1), Materials.Platinum.getDust(1), + Materials.Plutonium.getDust(1), ELEMENT.getInstance().CALIFORNIUM.getDust(1), + Materials.Chrome.getDust(1) }; + FluidStack[] solid_plasmas_t0_xstep = { new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 144), + Materials.Bismuth.getPlasma(144), + new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 144), + Materials.Boron.getPlasma(144), new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 144), + Materials.Iridium.getPlasma(144), Materials.Naquadah.getPlasma(144), + Materials.Osmium.getPlasma(144), Materials.Platinum.getPlasma(144), + Materials.Plutonium.getPlasma(144), + new FluidStack(ELEMENT.getInstance().CALIFORNIUM.getPlasma(), 144), + Materials.Chrome.getPlasma(144), }; + + for (int i = 0; i < solids_t0_xstep.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new ItemStack[] { solids_t0_xstep[i] }, + new FluidStack[] { solid_plasmas_t0_xstep[i] }, + 3 * SECONDS, + (int) TierEU.RECIPE_MAX, + true, + 0); + } + } + // Fusion tier 4-5 + { + // Single step + ItemStack[] solids_t1_1step = { Materials.Lead.getDust(1), Materials.Plutonium241.getDust(1), + Materials.Thorium.getDust(1) }; + FluidStack[] solid_plasmas_t1_1step = { Materials.Lead.getPlasma(144), + Materials.Plutonium241.getPlasma(144), Materials.Thorium.getPlasma(144) }; + + for (int i = 0; i < solids_t1_1step.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new ItemStack[] { solids_t1_1step[i] }, + new FluidStack[] { solid_plasmas_t1_1step[i] }, + 5 * SECONDS, + (int) TierEU.RECIPE_MAX, + false, + 1); + } + + // Multi-step + ItemStack[] solids_t1_xstep = { ELEMENT.getInstance().NEPTUNIUM.getDust(1), + ELEMENT.getInstance().FERMIUM.getDust(1) }; + FluidStack[] solid_plasmas_t1_xstep = { + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 144), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 144) }; + + for (int i = 0; i < solids_t1_xstep.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new ItemStack[] { solids_t1_xstep[i] }, + new FluidStack[] { solid_plasmas_t1_xstep[i] }, + 7 * SECONDS, + (int) TierEU.RECIPE_MAX, + true, + 1); + } + } + // Exotic Plasmas + { + // Single step + ItemStack[] solids_t2_1step = { ELEMENT.STANDALONE.RHUGNOR.getDust(1), + ELEMENT.STANDALONE.DRAGON_METAL.getDust(1), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1), + Materials.CosmicNeutronium.getDust(1), Materials.Draconium.getDust(1), + Materials.DraconiumAwakened.getDust(1), Materials.Ichorium.getDust(1) }; + FluidStack[] solid_plasmas_t2_1step = { new FluidStack(ELEMENT.STANDALONE.RHUGNOR.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.DRAGON_METAL.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlasma(), 144), + Materials.CosmicNeutronium.getPlasma(144), Materials.Draconium.getPlasma(144), + Materials.DraconiumAwakened.getPlasma(144), Materials.Ichorium.getPlasma(144) }; + + for (int i = 0; i < solids_t2_1step.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new ItemStack[] { solids_t2_1step[i] }, + new FluidStack[] { solid_plasmas_t2_1step[i] }, + 15 * SECONDS, + (int) TierEU.RECIPE_MAX, + false, + 2); } - // Exotic Plasmas - { - // Single step - ItemStack[] solids_t2_1step = { ELEMENT.STANDALONE.RHUGNOR.getDust(1), - ELEMENT.STANDALONE.DRAGON_METAL.getDust(1), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1), - Materials.CosmicNeutronium.getDust(1), Materials.Draconium.getDust(1), - Materials.DraconiumAwakened.getDust(1), Materials.Ichorium.getDust(1) }; - FluidStack[] solid_plasmas_t2_1step = { new FluidStack(ELEMENT.STANDALONE.RHUGNOR.getPlasma(), 144), - new FluidStack(ELEMENT.STANDALONE.DRAGON_METAL.getPlasma(), 144), - new FluidStack(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlasma(), 144), - Materials.CosmicNeutronium.getPlasma(144), Materials.Draconium.getPlasma(144), - Materials.DraconiumAwakened.getPlasma(144), Materials.Ichorium.getPlasma(144) }; - - for (int i = 0; i < solids_t2_1step.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new ItemStack[] { solids_t2_1step[i] }, - new FluidStack[] { solid_plasmas_t2_1step[i] }, - 15 * SECONDS, - (int) TierEU.RECIPE_MAX, - false, - 2); - } - - // Multi-step - ItemStack[] solids_t2_xstep = { ELEMENT.STANDALONE.HYPOGEN.getDust(1), - Materials.Tritanium.getDust(1), Materials.Flerovium.getDust(1), - Materials.Neutronium.getDust(1), }; - FluidStack[] solid_plasmas_t2_xstep = { new FluidStack(ELEMENT.STANDALONE.HYPOGEN.getPlasma(), 144), - Materials.Tritanium.getPlasma(144), Materials.Flerovium.getPlasma(144), - Materials.Neutronium.getPlasma(144), }; - - for (int i = 0; i < solids_t2_xstep.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new ItemStack[] { solids_t2_xstep[i] }, - new FluidStack[] { solid_plasmas_t2_xstep[i] }, - 25 * SECONDS, - (int) TierEU.RECIPE_MAX, - true, - 2); - } + // Multi-step + ItemStack[] solids_t2_xstep = { ELEMENT.STANDALONE.HYPOGEN.getDust(1), Materials.Tritanium.getDust(1), + Materials.Flerovium.getDust(1), Materials.Neutronium.getDust(1), }; + FluidStack[] solid_plasmas_t2_xstep = { new FluidStack(ELEMENT.STANDALONE.HYPOGEN.getPlasma(), 144), + Materials.Tritanium.getPlasma(144), Materials.Flerovium.getPlasma(144), + Materials.Neutronium.getPlasma(144), }; + + for (int i = 0; i < solids_t2_xstep.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new ItemStack[] { solids_t2_xstep[i] }, + new FluidStack[] { solid_plasmas_t2_xstep[i] }, + 25 * SECONDS, + (int) TierEU.RECIPE_MAX, + true, + 2); } } - // Fluid to plasma recipes + } + + // Fluid to plasma recipes + { + // Fusion tier 1-3 { - // Fusion tier 1-3 - { - // Single step - FluidStack[] fluids_t0_1step = { Materials.Helium.getGas(1000), Materials.Nitrogen.getGas(1000), - Materials.Argon.getGas(1000), Materials.Chlorine.getGas(1000), Materials.Deuterium.getGas(1000), - Materials.Fluorine.getGas(1000), Materials.Hydrogen.getGas(1000), Materials.Radon.getGas(1000), - Materials.Tritium.getGas(1000), Materials.Mercury.getFluid(1000) }; - FluidStack[] fluid_plasmas_t0_1step = { Materials.Helium.getPlasma(1000), - Materials.Nitrogen.getPlasma(1000), Materials.Argon.getPlasma(1000), - Materials.Chlorine.getPlasma(1000), Materials.Deuterium.getPlasma(1000), - Materials.Fluorine.getPlasma(1000), Materials.Hydrogen.getPlasma(1000), - Materials.Radon.getPlasma(1000), Materials.Tritium.getPlasma(1000), - Materials.Mercury.getPlasma(1000) }; - - for (int i = 0; i < fluids_t0_1step.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new FluidStack[] { fluids_t0_1step[i] }, - new FluidStack[] { fluid_plasmas_t0_1step[i] }, - 1 * SECONDS, - (int) TierEU.RECIPE_MAX, - false, - 0); - } - - // Multi-step - FluidStack[] fluids_t0_xstep = { ELEMENT.getInstance().NEON.getFluidStack(1000), - Materials.Oxygen.getGas(1000), ELEMENT.getInstance().KRYPTON.getFluidStack(1000), - ELEMENT.getInstance().XENON.getFluidStack(1000) }; - FluidStack[] fluid_plasmas_t0_xstep = { - new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 1000), Materials.Oxygen.getPlasma(1000), - new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 1000), - new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 1000) }; - - for (int i = 0; i < fluids_t0_xstep.length; i++) { - TT_recipeAdder.addFOGPlasmaRecipe( - new FluidStack[] { fluids_t0_xstep[i] }, - new FluidStack[] { fluid_plasmas_t0_xstep[i] }, - 3 * SECONDS, - (int) TierEU.RECIPE_MAX, - true, - 0); - } + // Single step + FluidStack[] fluids_t0_1step = { Materials.Helium.getGas(1000), Materials.Nitrogen.getGas(1000), + Materials.Argon.getGas(1000), Materials.Chlorine.getGas(1000), Materials.Deuterium.getGas(1000), + Materials.Fluorine.getGas(1000), Materials.Hydrogen.getGas(1000), Materials.Radon.getGas(1000), + Materials.Tritium.getGas(1000), Materials.Mercury.getFluid(1000) }; + FluidStack[] fluid_plasmas_t0_1step = { Materials.Helium.getPlasma(1000), + Materials.Nitrogen.getPlasma(1000), Materials.Argon.getPlasma(1000), + Materials.Chlorine.getPlasma(1000), Materials.Deuterium.getPlasma(1000), + Materials.Fluorine.getPlasma(1000), Materials.Hydrogen.getPlasma(1000), + Materials.Radon.getPlasma(1000), Materials.Tritium.getPlasma(1000), + Materials.Mercury.getPlasma(1000) }; + + for (int i = 0; i < fluids_t0_1step.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new FluidStack[] { fluids_t0_1step[i] }, + new FluidStack[] { fluid_plasmas_t0_1step[i] }, + 1 * SECONDS, + (int) TierEU.RECIPE_MAX, + false, + 0); } - // Fusion tier 4-5 - { - // Single step - // None yet - // Multi-step - // None yet - } - // Exotic - { - // None yet + // Multi-step + FluidStack[] fluids_t0_xstep = { ELEMENT.getInstance().NEON.getFluidStack(1000), + Materials.Oxygen.getGas(1000), ELEMENT.getInstance().KRYPTON.getFluidStack(1000), + ELEMENT.getInstance().XENON.getFluidStack(1000) }; + FluidStack[] fluid_plasmas_t0_xstep = { new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 1000), + Materials.Oxygen.getPlasma(1000), new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 1000), + new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 1000) }; + + for (int i = 0; i < fluids_t0_xstep.length; i++) { + TT_recipeAdder.addFOGPlasmaRecipe( + new FluidStack[] { fluids_t0_xstep[i] }, + new FluidStack[] { fluid_plasmas_t0_xstep[i] }, + 3 * SECONDS, + (int) TierEU.RECIPE_MAX, + true, + 0); } } + // Fusion tier 4-5 + { + // Single step + // None yet - // Exotic module fake recipes + // Multi-step + // None yet + } + // Exotic { - TT_recipeAdder.addFOGExoticFakeRecipe( - new ItemStack[] { Materials.Iron.getDust(1) }, - new FluidStack[] { Materials.Iron.getMolten(1) }, - new FluidStack[] { MaterialsUEVplus.QuarkGluonPlasma.getFluid(1000) }, - 10 * SECONDS, - (int) TierEU.RECIPE_MAX, - 1); - - TT_recipeAdder.addFOGExoticFakeRecipe( - new ItemStack[] { Materials.Iron.getDust(1) }, - new FluidStack[] { Materials.Iron.getMolten(1), Materials.Bismuth.getMolten(1) }, - new FluidStack[] { MaterialsUEVplus.MagMatter.getMolten(144) }, - 10 * SECONDS, - (int) TierEU.RECIPE_MAX, - 1); + // None yet } } + // Exotic module fake recipes + { + TT_recipeAdder.addFOGExoticFakeRecipe( + new ItemStack[] { Materials.Iron.getDust(1) }, + new FluidStack[] { Materials.Iron.getMolten(1) }, + new FluidStack[] { MaterialsUEVplus.QuarkGluonPlasma.getFluid(1000) }, + 10 * SECONDS, + (int) TierEU.RECIPE_MAX, + 1); + + TT_recipeAdder.addFOGExoticFakeRecipe( + new ItemStack[] { Materials.Iron.getDust(1) }, + new FluidStack[] { Materials.Iron.getMolten(1), Materials.Bismuth.getMolten(1) }, + new FluidStack[] { MaterialsUEVplus.MagMatter.getMolten(144) }, + 10 * SECONDS, + (int) TierEU.RECIPE_MAX, + 1); + } + // Exotic module plasma material maps // GT materials plasmaGTMaterialList.addAll( @@ -482,30 +471,28 @@ public class Godforge implements Runnable { 6000 /* Zinc */)); // GT++ materials - if (GTPlusPlus.isModLoaded()) { - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().ZIRCONIUM.getTinyDust(1), 6000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().THORIUM232.getTinyDust(1), 6000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().GERMANIUM.getTinyDust(1), 2000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().THALLIUM.getTinyDust(1), 2000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().RUTHENIUM.getTinyDust(1), 6000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().RHENIUM.getTinyDust(1), 2000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().RHODIUM.getTinyDust(1), 6000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().IODINE.getTinyDust(1), 6000); - exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getTinyDust(1), 8000); - exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.ADVANCED_NITINOL.getTinyDust(1), 8000); - exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.FORCE.getTinyDust(1), 8000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().HAFNIUM.getTinyDust(1), 6000); - exoticModulePlasmaItemMap.put(ELEMENT.getInstance().CALIFORNIUM.getTinyDust(1), 1000); - exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.RUNITE.getTinyDust(1), 8000); - - exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().XENON.getFluid(), 1), 8000); - exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().KRYPTON.getFluid(), 1), 8000); - exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().NEON.getFluid(), 1), 8000); - // These are here because they cant be solidified - exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().CURIUM.getFluid(), 1), 10000); - exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getFluid(), 1), 800); - exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().FERMIUM.getFluid(), 1), 800); - } + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().ZIRCONIUM.getTinyDust(1), 6000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().THORIUM232.getTinyDust(1), 6000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().GERMANIUM.getTinyDust(1), 2000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().THALLIUM.getTinyDust(1), 2000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().RUTHENIUM.getTinyDust(1), 6000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().RHENIUM.getTinyDust(1), 2000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().RHODIUM.getTinyDust(1), 6000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().IODINE.getTinyDust(1), 6000); + exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getTinyDust(1), 8000); + exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.ADVANCED_NITINOL.getTinyDust(1), 8000); + exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.FORCE.getTinyDust(1), 8000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().HAFNIUM.getTinyDust(1), 6000); + exoticModulePlasmaItemMap.put(ELEMENT.getInstance().CALIFORNIUM.getTinyDust(1), 1000); + exoticModulePlasmaItemMap.put(ELEMENT.STANDALONE.RUNITE.getTinyDust(1), 8000); + + exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().XENON.getFluid(), 1), 8000); + exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().KRYPTON.getFluid(), 1), 8000); + exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().NEON.getFluid(), 1), 8000); + // These are here because they cant be solidified + exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().CURIUM.getFluid(), 1), 10000); + exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getFluid(), 1), 800); + exoticModulePlasmaFluidMap.put(new FluidStack(ELEMENT.getInstance().FERMIUM.getFluid(), 1), 800); // Mercury is weird, it has neither dust nor gas, so it needs to be added separately exoticModulePlasmaFluidMap.put(Materials.Mercury.getFluid(1), 6000); @@ -535,13 +522,11 @@ public class Godforge implements Runnable { exoticModuleMagmatterItemMap.put(Materials.Flerovium.getDustTiny(1), 100000); // GT++ materials - if (GTPlusPlus.isModLoaded()) { - exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getTinyDust(1), 100000); - exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.HYPOGEN.getTinyDust(1), 100000); - exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.RHUGNOR.getTinyDust(1), 100000); - exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getTinyDust(1), 100000); - exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.DRAGON_METAL.getTinyDust(1), 100000); - } + exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getTinyDust(1), 100000); + exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.HYPOGEN.getTinyDust(1), 100000); + exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.RHUGNOR.getTinyDust(1), 100000); + exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getTinyDust(1), 100000); + exoticModuleMagmatterItemMap.put(ELEMENT.STANDALONE.DRAGON_METAL.getTinyDust(1), 100000); // For NEI for (FluidStack fluid : exoticModulePlasmaFluidMap.keySet()) { diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 63885b5b7d..2a0e7edc0d 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -67,8 +67,7 @@ public class ResearchStationAssemblyLine implements Runnable { itemPartsUXVAsslineRecipes(); addWirelessEnergyRecipes(); - if (TinkersGregworks.isModLoaded() && GoodGenerator.isModLoaded() // Shirabon - && Avaritia.isModLoaded() // Infinity, Cosmic Neutronium + if (TinkersGregworks.isModLoaded() && Avaritia.isModLoaded() // Infinity, Cosmic Neutronium && ExtraUtilities.isModLoaded() // Bedrockium ) { addEOHRecipes(); @@ -118,47 +117,44 @@ public class ResearchStationAssemblyLine implements Runnable { 60 * 20, 8_000_000); - if (GTPlusPlus.isModLoaded()) { - // Hypogen Coil - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Casing_Coil_Infinity.get(1), - 16_777_216 * 2, - 2048 * 2, - 32_000_000, - 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - GT_OreDictUnificator.get("wireGt02Hypogen", 8L), - getModItem(GTPlusPlus.ID, "itemScrewHypogen", 8, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), }, - new FluidStack[] { Materials.Infinity.getMolten(576), }, - ItemList.Casing_Coil_Hypogen.get(1), - 60 * 20, - 8000000 * 4); - - // Eternal coil - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Casing_Coil_Hypogen.get(1), - 16_777_216 * 4, - 8_192, - 128_000_000, - 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - GT_OreDictUnificator.get(OrePrefixes.wireGt02, MaterialsUEVplus.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 8), - getModItem(EternalSingularity.ID, "eternal_singularity", 1L), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), - getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), }, - new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), }, - ItemList.Casing_Coil_Eternal.get(1), - 60 * 20, - 8_000_000 * 16); - } + // Hypogen Coil + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Casing_Coil_Infinity.get(1), + 16_777_216 * 2, + 2048 * 2, + 32_000_000, + 1, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + GT_OreDictUnificator.get("wireGt02Hypogen", 8L), getModItem(GTPlusPlus.ID, "itemScrewHypogen", 8, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), }, + new FluidStack[] { Materials.Infinity.getMolten(576), }, + ItemList.Casing_Coil_Hypogen.get(1), + 60 * 20, + 8000000 * 4); + + // Eternal coil + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Casing_Coil_Hypogen.get(1), + 16_777_216 * 4, + 8_192, + 128_000_000, + 1, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + GT_OreDictUnificator.get(OrePrefixes.wireGt02, MaterialsUEVplus.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 8), + getModItem(EternalSingularity.ID, "eternal_singularity", 1L), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), + getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 576), }, + ItemList.Casing_Coil_Eternal.get(1), + 60 * 20, + 8_000_000 * 16); // UHV-UMV Energy Hatch & Dynamo { @@ -818,28 +814,26 @@ public class ResearchStationAssemblyLine implements Runnable { } // Deep Dark Portal - if (BartWorks.isModLoaded()) { - TT_recipeAdder.addResearchableAssemblylineRecipe( - getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier8", 1, 0), - 16_777_216, - 2048, - 2_000_000, - 64, - new Object[] { getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 7), - getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UMV.get(4), - ItemList.Emitter_UMV.get(4), ItemList.Sensor_UMV.get(4), }, - new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 50000), - Materials.Infinity.getMolten(144L * 512), Materials.Cheese.getMolten(232000L), }, - ItemList.Block_BedrockiumCompressed.get(1), - 10000, - 5000000); - } + TT_recipeAdder.addResearchableAssemblylineRecipe( + getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier8", 1, 0), + 16_777_216, + 2048, + 2_000_000, + 64, + new Object[] { getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 7), + getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UMV.get(4), + ItemList.Emitter_UMV.get(4), ItemList.Sensor_UMV.get(4), }, + new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 50000), + Materials.Infinity.getMolten(144L * 512), Materials.Cheese.getMolten(232000L), }, + ItemList.Block_BedrockiumCompressed.get(1), + 10000, + 5000000); // Batteries { @@ -965,127 +959,125 @@ public class ResearchStationAssemblyLine implements Runnable { } } - if (GTPlusPlus.isModLoaded()) { - // MK4 Computer - TT_recipeAdder.addResearchableAssemblylineRecipe( - GregtechItemList.Compressed_Fusion_Reactor.get(1), - 320000, - 512, - 2000000, - 1, - new Object[] { GregtechItemList.Casing_Fusion_Internal.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), - ItemList.Field_Generator_UHV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, - new FluidStack[] { Materials.UUMatter.getFluid(50000), ALLOY.CINOBITE.getFluidStack(9216), - ALLOY.OCTIRON.getFluidStack(9216), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(9216), }, - GregtechItemList.FusionComputer_UV2.get(1), - 6000, - 2000000); + // MK4 Computer + TT_recipeAdder.addResearchableAssemblylineRecipe( + GregtechItemList.Compressed_Fusion_Reactor.get(1), + 320000, + 512, + 2000000, + 1, + new Object[] { GregtechItemList.Casing_Fusion_Internal.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), + ItemList.Field_Generator_UHV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, + new FluidStack[] { Materials.UUMatter.getFluid(50000), ALLOY.CINOBITE.getFluidStack(9216), + ALLOY.OCTIRON.getFluidStack(9216), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(9216), }, + GregtechItemList.FusionComputer_UV2.get(1), + 6000, + 2000000); - // MK4 Coils - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Casing_Fusion_Coil.get(1L), - 160000, - 512, - 2000000, - 1, - new Object[] { ItemList.Energy_LapotronicOrb2.get(16L), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8L }, - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Emitter_UHV.get(1), - ItemList.Sensor_UHV.get(1), ItemList.Casing_Fusion_Coil.get(1L), }, - new FluidStack[] { Materials.UUMatter.getFluid(8000L), ALLOY.CINOBITE.getFluidStack(2304), - ALLOY.OCTIRON.getFluidStack(2304), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(2304), }, - GregtechItemList.Casing_Fusion_Internal.get(1), - 1200, - 2000000); - - // MK4 Casing - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Casing_Fusion2.get(1L), - 80000, - 512, - 2000000, - 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Data), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8L }, - GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenCarbide, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), - ItemList.Electric_Motor_UHV.get(2), ItemList.Electric_Piston_UHV.get(1), - ItemList.Casing_Fusion2.get(1L), }, - new FluidStack[] { Materials.UUMatter.getFluid(1000L), ALLOY.CINOBITE.getFluidStack(576), - ALLOY.OCTIRON.getFluidStack(576), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(576), }, - GregtechItemList.Casing_Fusion_External.get(1), - 300, - 2000000); - - // MK5 Computer - TT_recipeAdder.addResearchableAssemblylineRecipe( - GregtechItemList.FusionComputer_UV2.get(1), - 2560000, - 4096, - (int) TierEU.RECIPE_UEV, - 8, - new Object[] { GregtechItemList.Casing_Fusion_Internal2.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - GT_OreDictUnificator.get("plateDenseMetastableOganesson", 4), ItemList.Field_Generator_UEV.get(2), - getItemContainer("PicoWafer").get(64L), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 32) }, - new FluidStack[] { ELEMENT.getInstance().CURIUM.getFluidStack(9216), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(9216), ALLOY.ABYSSAL.getFluidStack(9216), - ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(9216) }, - GregtechItemList.FusionComputer_UV3.get(1), - 6000, - (int) TierEU.RECIPE_UEV); + // MK4 Coils + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Casing_Fusion_Coil.get(1L), + 160000, + 512, + 2000000, + 1, + new Object[] { ItemList.Energy_LapotronicOrb2.get(16L), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8L }, + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Emitter_UHV.get(1), + ItemList.Sensor_UHV.get(1), ItemList.Casing_Fusion_Coil.get(1L), }, + new FluidStack[] { Materials.UUMatter.getFluid(8000L), ALLOY.CINOBITE.getFluidStack(2304), + ALLOY.OCTIRON.getFluidStack(2304), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(2304), }, + GregtechItemList.Casing_Fusion_Internal.get(1), + 1200, + 2000000); - // MK5 Coils - TT_recipeAdder.addResearchableAssemblylineRecipe( - GregtechItemList.Casing_Fusion_Internal.get(1), - 2560000, - 4096, - (int) TierEU.RECIPE_UEV, - 8, - new Object[] { ItemList.Energy_Module.get(16), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L }, - ELEMENT.STANDALONE.RHUGNOR.getPlate(8), ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1), - getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2) }, - new FluidStack[] { ELEMENT.getInstance().NEPTUNIUM.getFluidStack(2304), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(2304), ALLOY.ABYSSAL.getFluidStack(2304), - ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(2304) }, - GregtechItemList.Casing_Fusion_Internal2.get(1), - 1200, - (int) TierEU.RECIPE_UEV); - - // MK5 Casing - TT_recipeAdder.addResearchableAssemblylineRecipe( - GregtechItemList.Casing_Fusion_External.get(1L), - 2560000, - 4096, - (int) TierEU.RECIPE_UEV, - 8, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Elite), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.Master), 8L }, - GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 8), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(8), ItemList.Electric_Motor_UEV.get(2), - ItemList.Electric_Piston_UEV.get(1), GregtechItemList.Casing_Fusion_External.get(1L) }, - new FluidStack[] { ELEMENT.getInstance().FERMIUM.getFluidStack(1152), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(1152), ALLOY.ABYSSAL.getFluidStack(1152), - ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(1152) }, - GregtechItemList.Casing_Fusion_External2.get(1), - 300, - (int) TierEU.RECIPE_UEV); - } + // MK4 Casing + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Casing_Fusion2.get(1L), + 80000, + 512, + 2000000, + 1, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Data), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8L }, + GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenCarbide, 8), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), + ItemList.Electric_Motor_UHV.get(2), ItemList.Electric_Piston_UHV.get(1), + ItemList.Casing_Fusion2.get(1L), }, + new FluidStack[] { Materials.UUMatter.getFluid(1000L), ALLOY.CINOBITE.getFluidStack(576), + ALLOY.OCTIRON.getFluidStack(576), ELEMENT.STANDALONE.ASTRAL_TITANIUM.getFluidStack(576), }, + GregtechItemList.Casing_Fusion_External.get(1), + 300, + 2000000); - if (BloodMagic.isModLoaded() && KubaTech.isModLoaded() && DraconicEvolution.isModLoaded()) { + // MK5 Computer + TT_recipeAdder.addResearchableAssemblylineRecipe( + GregtechItemList.FusionComputer_UV2.get(1), + 2560000, + 4096, + (int) TierEU.RECIPE_UEV, + 8, + new Object[] { GregtechItemList.Casing_Fusion_Internal2.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + GT_OreDictUnificator.get("plateDenseMetastableOganesson", 4), ItemList.Field_Generator_UEV.get(2), + getItemContainer("PicoWafer").get(64L), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 32) }, + new FluidStack[] { ELEMENT.getInstance().CURIUM.getFluidStack(9216), + ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(9216), ALLOY.ABYSSAL.getFluidStack(9216), + ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(9216) }, + GregtechItemList.FusionComputer_UV3.get(1), + 6000, + (int) TierEU.RECIPE_UEV); + + // MK5 Coils + TT_recipeAdder.addResearchableAssemblylineRecipe( + GregtechItemList.Casing_Fusion_Internal.get(1), + 2560000, + 4096, + (int) TierEU.RECIPE_UEV, + 8, + new Object[] { ItemList.Energy_Module.get(16), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L }, + ELEMENT.STANDALONE.RHUGNOR.getPlate(8), ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1), + getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2) }, + new FluidStack[] { ELEMENT.getInstance().NEPTUNIUM.getFluidStack(2304), + ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(2304), ALLOY.ABYSSAL.getFluidStack(2304), + ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(2304) }, + GregtechItemList.Casing_Fusion_Internal2.get(1), + 1200, + (int) TierEU.RECIPE_UEV); + + // MK5 Casing + TT_recipeAdder.addResearchableAssemblylineRecipe( + GregtechItemList.Casing_Fusion_External.get(1L), + 2560000, + 4096, + (int) TierEU.RECIPE_UEV, + 8, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Elite), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.Master), 8L }, + GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 8), + ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(8), ItemList.Electric_Motor_UEV.get(2), + ItemList.Electric_Piston_UEV.get(1), GregtechItemList.Casing_Fusion_External.get(1L) }, + new FluidStack[] { ELEMENT.getInstance().FERMIUM.getFluidStack(1152), + ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(1152), ALLOY.ABYSSAL.getFluidStack(1152), + ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(1152) }, + GregtechItemList.Casing_Fusion_External2.get(1), + 300, + (int) TierEU.RECIPE_UEV); + + if (BloodMagic.isModLoaded() && DraconicEvolution.isModLoaded()) { // Draconic Evolution Fusion Crafter Controller TT_recipeAdder.addResearchableAssemblylineRecipe( getModItem(KubaTech.ID, "defc.casing", 1, 8), @@ -1188,25 +1180,23 @@ public class ResearchStationAssemblyLine implements Runnable { 6000, 500000); - if (GTPlusPlus.isModLoaded()) { - // Debug uncertainty resolver - TT_recipeAdder.addResearchableAssemblylineRecipe( - CustomItemList.UncertaintyX_Hatch.get(1L), - 72_000_000, - 5_120, - 16_000_000, - 6, - new Object[] { CustomItemList.eM_Computer_Bus.get(1), CustomItemList.hatch_CreativeMaintenance.get(1), - ItemList.Field_Generator_UIV.get(1L), GregtechItemList.Laser_Lens_Special.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 2 }, CustomItemList.DATApipe.get(64), - CustomItemList.DATApipe.get(64), ItemList.Cover_Screen.get(1) }, - new FluidStack[] { Materials.Iridium.getMolten(INGOTS * 100), new FluidStack(solderUEV, 2592), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 20000), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 20000) }, - CustomItemList.hatch_CreativeUncertainty.get(1), - 200 * 20, - (int) TierEU.RECIPE_UIV); - } + // Debug uncertainty resolver + TT_recipeAdder.addResearchableAssemblylineRecipe( + CustomItemList.UncertaintyX_Hatch.get(1L), + 72_000_000, + 5_120, + 16_000_000, + 6, + new Object[] { CustomItemList.eM_Computer_Bus.get(1), CustomItemList.hatch_CreativeMaintenance.get(1), + ItemList.Field_Generator_UIV.get(1L), GregtechItemList.Laser_Lens_Special.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 2 }, CustomItemList.DATApipe.get(64), + CustomItemList.DATApipe.get(64), ItemList.Cover_Screen.get(1) }, + new FluidStack[] { Materials.Iridium.getMolten(INGOTS * 100), new FluidStack(solderUEV, 2592), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 20000), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 20000) }, + CustomItemList.hatch_CreativeUncertainty.get(1), + 200 * 20, + (int) TierEU.RECIPE_UIV); } private void itemPartsUHVAsslineRecipes() { diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java index 2737d98f4a..537c054630 100644 --- a/src/main/java/common/recipeLoaders/AlloySmelter.java +++ b/src/main/java/common/recipeLoaders/AlloySmelter.java @@ -1,6 +1,5 @@ package common.recipeLoaders; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -15,18 +14,16 @@ public class AlloySmelter implements Runnable { @Override public void run() { - if (BartWorks.isModLoaded()) { - final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); + final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); - // YSZ Cermic Plate - GT_Values.RA.stdBuilder() - .itemInputs( - craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3), - ItemList.Shape_Mold_Plate.get(0)) - .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1)) - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(alloySmelterRecipes); - } + // YSZ Cermic Plate + GT_Values.RA.stdBuilder() + .itemInputs( + craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3), + ItemList.Shape_Mold_Plate.get(0)) + .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(alloySmelterRecipes); } } diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index fe1aaaf70e..6a410a1ac3 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -52,62 +52,60 @@ public class ResearchableAssemblyLine implements Runnable { 250 * 20, (int) TierEU.RECIPE_UEV); - if (GTPlusPlus.isModLoaded()) { - // Insanely Ultimate Capacitor (UIV) - TT_recipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8), - 24_000_000, - 1_280, - 32_000_000, - 32, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, ItemList.ZPM4.get(8L), - ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), - ItemList.Circuit_Wafer_QPIC.get(64), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), - ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) }, - new FluidStack[] { new FluidStack(solderUEV, 18_432), - new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 18432), - Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) }, - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), - 300 * 20, - (int) TierEU.RECIPE_UIV); + // Insanely Ultimate Capacitor (UIV) + TT_recipeAdder.addResearchableAssemblylineRecipe( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8), + 24_000_000, + 1_280, + 32_000_000, + 32, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, ItemList.ZPM4.get(8L), + ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), + ItemList.Circuit_Wafer_QPIC.get(64), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), + ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 18_432), + new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 18432), + Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) }, + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), + 300 * 20, + (int) TierEU.RECIPE_UIV); - // Mega Ultimate Capacitor (UMV) - TT_recipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), - 480_000_000, - 12_288, - 128_000_000, - 64, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, ItemList.ZPM5.get(8L), - ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), - ItemList.Circuit_Wafer_QPIC.get(64), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), - ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) }, - new FluidStack[] { new FluidStack(solderUEV, 36_864), - new FluidStack(FluidRegistry.getFluid("molten.astraltitanium"), 36_864), - new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 36_864), - Materials.SuperCoolant.getFluid(256_000) }, - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10), - 350 * 20, - (int) TierEU.RECIPE_UMV); - } + // Mega Ultimate Capacitor (UMV) + TT_recipeAdder.addResearchableAssemblylineRecipe( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), + 480_000_000, + 12_288, + 128_000_000, + 64, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, ItemList.ZPM5.get(8L), + ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), + ItemList.Circuit_Wafer_QPIC.get(64), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), + ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 36_864), + new FluidStack(FluidRegistry.getFluid("molten.astraltitanium"), 36_864), + new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 36_864), + Materials.SuperCoolant.getFluid(256_000) }, + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10), + 350 * 20, + (int) TierEU.RECIPE_UMV); // Ultimate Capacitor (UHV) TT_recipeAdder.addResearchableAssemblylineRecipe( diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java index 6c8ce62539..88f1edaacc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java @@ -3,7 +3,6 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.ArrayList; @@ -230,10 +229,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB result = processFuel(tFluids, RecipeMaps.gasTurbineFuels, PromoterAmount, GAS_EFFICIENCY_COEFFICIENT, 1); if (result.wasSuccessful()) return result; - if (GTPlusPlus.isModLoaded()) { - result = processFuel(tFluids, GTPPRecipeMaps.rocketFuels, PromoterAmount, ROCKET_EFFICIENCY_COEFFICIENT, 3); - if (result.wasSuccessful()) return result; - } + result = processFuel(tFluids, GTPPRecipeMaps.rocketFuels, PromoterAmount, ROCKET_EFFICIENCY_COEFFICIENT, 3); + if (result.wasSuccessful()) return result; return CheckRecipeResultRegistry.NO_FUEL_FOUND; } 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)) diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index ee95a98874..797be4e55b 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -92,6 +92,7 @@ public enum Mods { IC2NuclearControl(Names.I_C2_NUCLEAR_CONTROL), IguanaTweaksTinkerConstruct(Names.IGUANA_TWEAKS_TINKER_CONSTRUCT), IndustrialCraft2(Names.INDUSTRIAL_CRAFT2), + InfernalMobs(Names.INFERNAL_MOBS), IronChests(Names.IRON_CHESTS), IronChestsMinecarts(Names.IRON_CHESTS_MINECARTS), IronTanks(Names.IRON_TANKS), @@ -105,6 +106,7 @@ public enum Mods { Mantle(Names.MANTLE), MineAndBladeBattleGear2(Names.MINE_AND_BLADE_BATTLE_GEAR2), Minecraft(Names.MINECRAFT), + MineTweaker(Names.MINE_TWEAKER), NEICustomDiagrams(Names.N_E_I_CUSTOM_DIAGRAMS), NEIOrePlugin(Names.N_E_I_ORE_PLUGIN), Natura(Names.NATURA), @@ -269,6 +271,7 @@ public enum Mods { public static final String I_C2_NUCLEAR_CONTROL = "IC2NuclearControl"; public static final String IGUANA_TWEAKS_TINKER_CONSTRUCT = "IguanaTweaksTConstruct"; public static final String INDUSTRIAL_CRAFT2 = "IC2"; + public static final String INFERNAL_MOBS = "InfernalMobs"; public static final String IRON_CHESTS = "IronChest"; public static final String IRON_CHESTS_MINECARTS = "ironchestminecarts"; public static final String IRON_TANKS = "irontank"; @@ -282,6 +285,7 @@ public enum Mods { public static final String MANTLE = "Mantle"; public static final String MINE_AND_BLADE_BATTLE_GEAR2 = "battlegear2"; public static final String MINECRAFT = "minecraft"; + public static final String MINE_TWEAKER = "MineTweaker3"; public static final String N_E_I_CUSTOM_DIAGRAMS = "neicustomdiagram"; public static final String N_E_I_ORE_PLUGIN = "gtneioreplugin"; public static final String NATURA = "Natura"; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 8bba0fee25..a10e735843 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.ticksBetweenSounds; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import static net.minecraftforge.common.util.ForgeDirection.UP; @@ -42,7 +41,6 @@ import gregtech.api.util.ExternalMaterials; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; -import ic2.core.Ic2Items; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -192,8 +190,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case GLASS -> switch (this.mTier) { case 0, 1, 2, 3 -> new ItemStack(Blocks.glass, 1, W); - case 4, 5, 6, 7, 8 -> BartWorks.isModLoaded() ? "blockGlass" + VN[aTier] : Ic2Items.reinforcedGlass; - default -> BartWorks.isModLoaded() ? "blockGlass" + VN[8] : Ic2Items.reinforcedGlass; + case 4, 5, 6, 7, 8 -> "blockGlass" + VN[aTier]; + default -> "blockGlass" + VN[8]; }; case PLATE -> switch (this.mTier) { diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 4494d1efba..409703fbad 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -648,18 +648,16 @@ public final class RecipeMaps { .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount / 2)) .setDuration(aDuration * 2 / 3); } - if (GTPlusPlus.isModLoaded()) { - ItemStack cactusCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); - ItemStack sugarCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); - coll.derive() - .setInputs(aInput1, aInput2, cactusCoke) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) - .setDuration(aDuration * 2 / 3); - coll.derive() - .setInputs(aInput1, aInput2, sugarCoke) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) - .setDuration(aDuration * 2 / 3); - } + ItemStack cactusCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); + ItemStack sugarCoke = GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); + coll.derive() + .setInputs(aInput1, aInput2, cactusCoke) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) + .setDuration(aDuration * 2 / 3); + coll.derive() + .setInputs(aInput1, aInput2, sugarCoke) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) + .setDuration(aDuration * 2 / 3); if ((aInput1 == null || aInput1.stackSize <= 6) && (aInput2 == null || aInput2.stackSize <= 6) && (aOutput1 == null || aOutput1.stackSize <= 6) && (aOutput2 == null || aOutput2.stackSize <= 6)) { diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index d236bbc4f2..f0225fd241 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -627,32 +627,30 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { 0, 0); } - if (GTPlusPlus.isModLoaded()) { - RecipeMaps.primitiveBlastRecipes.addRecipe( - true, - new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", (aCoalAmount * 2L)) }, - new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, - null, - null, - null, - null, - aDuration * 2 / 3, - 0, - 0); - RecipeMaps.primitiveBlastRecipes.addRecipe( - true, - new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", (aCoalAmount * 2L)) }, - new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, - null, - null, - null, - null, - aDuration * 2 / 3, - 0, - 0); - } + RecipeMaps.primitiveBlastRecipes.addRecipe( + true, + new ItemStack[] { aInput1, aInput2, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", (aCoalAmount * 2L)) }, + new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, + null, + null, + null, + null, + aDuration * 2 / 3, + 0, + 0); + RecipeMaps.primitiveBlastRecipes.addRecipe( + true, + new ItemStack[] { aInput1, aInput2, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", (aCoalAmount * 2L)) }, + new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, + null, + null, + null, + null, + aDuration * 2 / 3, + 0, + 0); if ((aInput1 == null || aInput1.stackSize <= 6) && (aInput2 == null || aInput2.stackSize <= 6) && (aOutput1 == null || aOutput1.stackSize <= 6) && (aOutput2 == null || aOutput2.stackSize <= 6)) { diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index da749e5b31..5226976d0d 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -2015,14 +2015,12 @@ public class GT_CraftingRecipeLoader implements Runnable { Materials.Fireclay.getDust(2), new Object[] { Materials.Brick.getDust(1), Materials.Clay.getDust(1) }); - if (BartWorks.isModLoaded()) { - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), - bits, - new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', - OrePrefixes.frameGt.get(Materials.Chrome) }); - } + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), + bits, + new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', + OrePrefixes.frameGt.get(Materials.Chrome) }); if (Forestry.isModLoaded()) { ItemStack[] coverIDs = { ItemList.Plank_Larch.get(2L), ItemList.Plank_Teak.get(2L), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 392e6fa154..7c3beec6aa 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -58,44 +58,42 @@ public class GT_PCBFactoryRecipes { .duration(5 * MINUTES) .addTo(AssemblyLine); - if (GTPlusPlus.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - Materials.get("Artherium-Sn") - .getPlates(6)) - .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - Materials.EnrichedHolmium.getPlates(6)) - .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_UHV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), - Materials.get("Quantum") - .getPlates(6)) - .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_UIV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), - Materials.Thulium.getPlates(6)) - .itemOutputs(ItemList.InfinityCooledCasing.get(1)) - .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_UMV) - .addTo(assemblerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + Materials.get("Artherium-Sn") + .getPlates(6)) + .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + Materials.EnrichedHolmium.getPlates(6)) + .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), + Materials.get("Quantum") + .getPlates(6)) + .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), + Materials.Thulium.getPlates(6)) + .itemOutputs(ItemList.InfinityCooledCasing.get(1)) + .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_UMV) + .addTo(assemblerRecipes); // Load CircuitBoard Recipes @@ -597,106 +595,95 @@ public class GT_PCBFactoryRecipes { .addTo(RecipeMaps.pcbFactoryRecipes); } - if (GTPlusPlus.isModLoaded()) { - // Optical Circuit Board - for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { - int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); - List<ItemStack> aBoards = new ArrayList<>(); - for (int i = amountOfBoards; i > 64; i -= 64) { - aBoards.add(ItemList.Circuit_Board_Optical.get(i)); - amountOfBoards -= 64; - } - aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - BartWorks.ID, - "gt.bwMetaGeneratedfoil", - (long) (16 * (Math.sqrt(tier - 6))), - 10106), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) - .fluidInputs( - Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) - .itemOutputs(aBoards.toArray(new ItemStack[0])) - .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) - .eut((int) GT_Values.VP[tier] * 3 / 4) - .metadata(TIER, 1) - .addTo(RecipeMaps.pcbFactoryRecipes); + // Optical Circuit Board + for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { + int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); + List<ItemStack> aBoards = new ArrayList<>(); + for (int i = amountOfBoards; i > 64; i -= 64) { + aBoards.add(ItemList.Circuit_Board_Optical.get(i)); + amountOfBoards -= 64; } - for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { - int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); - List<ItemStack> aBoards = new ArrayList<>(); - for (int i = amountOfBoards; i > 64; i -= 64) { - aBoards.add(ItemList.Circuit_Board_Optical.get(i)); - amountOfBoards -= 64; - } - aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(2), - GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - BartWorks.ID, - "gt.bwMetaGeneratedfoil", - (long) (16 * (Math.sqrt(tier - 6))), - 10106), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) - .fluidInputs( - Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) - .itemOutputs(aBoards.toArray(new ItemStack[0])) - .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) - .eut((int) GT_Values.VP[tier + 1] * 3 / 4) - .metadata(TIER, 2) - .addTo(RecipeMaps.pcbFactoryRecipes); + aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_ModHandler + .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), + GT_ModHandler + .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5)))) + .eut((int) GT_Values.VP[tier] * 3 / 4) + .metadata(TIER, 1) + .addTo(RecipeMaps.pcbFactoryRecipes); + } + for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { + int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); + List<ItemStack> aBoards = new ArrayList<>(); + for (int i = amountOfBoards; i > 64; i -= 64) { + aBoards.add(ItemList.Circuit_Board_Optical.get(i)); + amountOfBoards -= 64; } - for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { - int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List<ItemStack> aBoards = new ArrayList<>(); - for (int i = amountOfBoards; i > 64; i -= 64) { - aBoards.add(ItemList.Circuit_Board_Optical.get(i)); - amountOfBoards -= 64; - } - aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) - .getPlates(1), - GT_ModHandler.getModItem( - BartWorks.ID, - "gt.bwMetaGeneratedfoil", - (long) (16 * (Math.sqrt(tier - 6))), - 10106), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) - .fluidInputs( - Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), - Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), - Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) - .itemOutputs(aBoards.toArray(new ItemStack[0])) - .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) - .eut((int) GT_Values.VP[tier + 1] * 3 / 4) - .metadata(TIER, 3) - .addTo(RecipeMaps.pcbFactoryRecipes); + aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_Utility.getNaniteAsCatalyst(Materials.Silver), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_ModHandler + .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), + GT_ModHandler + .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 2) + .addTo(RecipeMaps.pcbFactoryRecipes); + } + for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { + int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); + List<ItemStack> aBoards = new ArrayList<>(); + for (int i = amountOfBoards; i > 64; i -= 64) { + aBoards.add(ItemList.Circuit_Board_Optical.get(i)); + amountOfBoards -= 64; } + aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_Utility.getNaniteAsCatalyst(Materials.Gold), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_ModHandler + .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), + GT_ModHandler + .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + .fluidInputs( + Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), + Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), + Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6))))) + .itemOutputs(aBoards.toArray(new ItemStack[0])) + .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5)))) + .eut((int) GT_Values.VP[tier + 1] * 3 / 4) + .metadata(TIER, 3) + .addTo(RecipeMaps.pcbFactoryRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 76fcbfe346..b41340e52e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -2,11 +2,9 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.AvaritiaAddons; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.BuildCraftFactory; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GTNHLanthanides; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; @@ -6447,9 +6445,6 @@ public class AssemblerRecipes implements Runnable { } public void withBartWorks() { - if (!BartWorks.isModLoaded()) { - return; - } GT_Values.RA.stdBuilder() .itemInputs( @@ -6632,9 +6627,6 @@ public class AssemblerRecipes implements Runnable { } public void withGTNHLanthAndGTPP() { - if (!(GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded())) { - return; - } GT_Values.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 8748c96654..8c6bfc8100 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,9 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.TecTech; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -31,8 +29,7 @@ public class AssemblyLineRecipes implements Runnable { private final Materials LuVMat; public AssemblyLineRecipes() { - solderIndalloy = GTPlusPlus.isModLoaded() ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); + solderIndalloy = FluidRegistry.getFluid("molten.indalloy140"); LuVMat = ExternalMaterials.getRuridit(); } @@ -861,9 +858,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Energy_Module.get(1), ItemList.Cover_WirelessNeedsMaintainance.get(1)) .itemOutputs(ItemList.TierdDrone1.get(4)) - .fluidInputs( - new FluidStack(solderIndalloy, 576), - FluidRegistry.getFluidStack(GTPlusPlus.isModLoaded() ? "fluid.rocketfuelmixc" : "nitrofuel", 4000)) + .fluidInputs(new FluidStack(solderIndalloy, 576), FluidRegistry.getFluidStack("fluid.rocketfuelmixc", 4000)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UV) .addTo(AssemblyLine); @@ -878,15 +873,13 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Field_Generator_UV.get(16), ItemList.Gravistar.get(8), ItemList.Emitter_UV.get(4), - TecTech.isModLoaded() ? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497) - : ItemList.Hatch_AutoMaintenance.get(64), + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497), ItemList.Energy_Cluster.get(8), ItemList.Cover_WirelessNeedsMaintainance.get(1)) .itemOutputs(ItemList.TierdDrone2.get(1)) .fluidInputs( new FluidStack(solderIndalloy, 144000), - GTPlusPlus.isModLoaded() ? FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 2000) - : Materials.AdvancedGlue.getFluid(256000)) + FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 2000)) .duration(60 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(AssemblyLine); diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index b05f585950..36bfb67de5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -1,8 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTNHLanthanides; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -631,31 +629,26 @@ public class BlastFurnaceRecipes implements Runnable { .metadata(COIL_HEAT, 1200) .addTo(blastFurnaceRecipes); - if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { - - GT_Values.RA.stdBuilder() - .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1)) - .fluidInputs(Materials.Tungsten.getMolten(144)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) - .duration(3 * MINUTES) - .eut(32000000) - .metadata(COIL_HEAT, 11701) - .addTo(blastFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1)) + .fluidInputs(Materials.Tungsten.getMolten(144)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) + .duration(3 * MINUTES) + .eut(32000000) + .metadata(COIL_HEAT, 11701) + .addTo(blastFurnaceRecipes); - // Rh + 3Cl = RhCl3 + // Rh + 3Cl = RhCl3 - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) - .fluidInputs(Materials.Chlorine.getGas(3000)) - .duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .metadata(COIL_HEAT, 573) - .addTo(blastFurnaceRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) + .fluidInputs(Materials.Chlorine.getGas(3000)) + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 573) + .addTo(blastFurnaceRecipes); } public void registerPrimitiveBlastFurnaceRecipes() { diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index d099157c1c..5add456f34 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTNHLanthanides; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; @@ -3699,108 +3698,103 @@ public class ChemicalRecipes implements Runnable { .eut(30) .addTo(UniversalChemical); - if (BartWorks.isModLoaded()) { - // CaSi2 + 2HCl = 2Si + CaCl2 + 2H + // CaSi2 + 2HCl = 2Si + CaCl2 + 2H - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)) - .duration(45 * SECONDS) - .eut(30) - .addTo(UniversalChemical); - - // SiCl4 + 2Zn = 2ZnCl2 + Si + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(45 * SECONDS) + .eut(30) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052)) - .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) - .duration(20 * SECONDS) - .eut(30) - .addTo(UniversalChemical); - } + // SiCl4 + 2Zn = 2ZnCl2 + Si - if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052)) + .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) + .duration(20 * SECONDS) + .eut(30) + .addTo(UniversalChemical); - // C4H8O + 2H =Pd= C4H10O + // C4H8O + 2H =Pd= C4H10O - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1)) - .itemOutputs(ItemList.Cell_Empty.get(1)) - .fluidInputs(Materials.Hydrogen.getGas(2000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000)) - .duration(10 * SECONDS) - .eut(30) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000)) + .duration(10 * SECONDS) + .eut(30) + .addTo(UniversalChemical); - // 4CH2O + C2H4O =NaOH= C5H12O4 + CO + // 4CH2O + C2H4O =NaOH= C5H12O4 + CO - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(GTPlusPlus.ID, "Formaldehyde", 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), - Materials.Empty.getCells(4)) - .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(GTPlusPlus.ID, "Formaldehyde", 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), + Materials.Empty.getCells(4)) + .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); - // 4CH2O + C2H4O =NaOH= C5H12O4 + CO + // 4CH2O + C2H4O =NaOH= C5H12O4 + CO - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), - Materials.Empty.getCells(1)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 4000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), + Materials.Empty.getCells(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 4000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); - // CaC2 + 2H2O = Ca(OH)2 + C2H2 + // CaC2 + 2H2O = Ca(OH)2 + C2H2 - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5)) - .fluidInputs(Materials.Water.getFluid(2000)) - .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) - .duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5)) + .fluidInputs(Materials.Water.getFluid(2000)) + .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); - // Co(NO3)2 + 2NaOH = Co(OH)2 + 2NaNO3 + // Co(NO3)2 + 2NaOH = Co(OH)2 + 2NaNO3 - GT_Values.RA.stdBuilder() - .itemInputs( - MaterialsKevlar.CobaltIINitrate.getDust(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) - .itemOutputs( - MaterialsKevlar.CobaltIIHydroxide.getDust(5), - getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); - } + GT_Values.RA.stdBuilder() + .itemInputs( + MaterialsKevlar.CobaltIINitrate.getDust(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) + .itemOutputs( + MaterialsKevlar.CobaltIIHydroxide.getDust(5), + getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); } public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, ItemStack aBasicMaterialCell, Fluid aPolymer) { @@ -5625,349 +5619,337 @@ public class ChemicalRecipes implements Runnable { .eut(500000) .addTo(multiblockChemicalReactorRecipes); - if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { - // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O + // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 1000), - new FluidStack(FluidRegistry.getFluid("aniline"), 2000), - Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000)) - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // C6H5NO2 + 6H =Pd= C6H7N + 2H2O + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 1000), + new FluidStack(FluidRegistry.getFluid("aniline"), 2000), + Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), - Materials.Hydrogen.getGas(54000)) - .fluidOutputs(Materials.Water.getFluid(18000), new FluidStack(FluidRegistry.getFluid("aniline"), 9000)) - .duration(45 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // C6H6 + HNO3 =H2SO4= C6H5NO2 + H2O + // C6H5NO2 + 6H =Pd= C6H7N + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs( - Materials.Benzene.getFluid(5000), - Materials.SulfuricAcid.getFluid(3000), - Materials.NitricAcid.getFluid(5000), - GT_ModHandler.getDistilledWater(10000)) - .fluidOutputs( - new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000), - Materials.DilutedSulfuricAcid.getFluid(3000)) - .duration(6 * SECONDS) - .eut(TierEU.RECIPE_IV) - .addTo(multiblockChemicalReactorRecipes); - - // C13H14N2(HCl) + 2COCl2 = C15H10N2O2(5HCl) + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), Materials.Hydrogen.getGas(54000)) + .fluidOutputs(Materials.Water.getFluid(18000), new FluidStack(FluidRegistry.getFluid("aniline"), 9000)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs( - MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000), - new FluidStack(FluidRegistry.getFluid("phosgene"), 2000)) - .fluidOutputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + // C6H6 + HNO3 =H2SO4= C6H5NO2 + H2O - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) - .fluidInputs(MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 9000)) - .duration(4 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs( + Materials.Benzene.getFluid(5000), + Materials.SulfuricAcid.getFluid(3000), + Materials.NitricAcid.getFluid(5000), + GT_ModHandler.getDistilledWater(10000)) + .fluidOutputs( + new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000), + Materials.DilutedSulfuricAcid.getFluid(3000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("butanol"), 2000), - new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000), - Materials.IronIIIChloride.getFluid(100)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + // C13H14N2(HCl) + 2COCl2 = C15H10N2O2(5HCl) - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("butanol"), 18000), - new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000), - Materials.IronIIIChloride.getFluid(900)) - .duration(3 * MINUTES + 45 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // C2H4 + CO + H2O =C4NiO= C3H6O2 + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs( + MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000), + new FluidStack(FluidRegistry.getFluid("phosgene"), 2000)) + .fluidOutputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs( - Materials.Ethylene.getGas(1000), - Materials.CarbonMonoxide.getGas(1000), - MaterialsKevlar.NickelTetracarbonyl.getFluid(100), - Materials.Water.getFluid(1000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) + .fluidInputs(MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 9000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(9)) - .fluidInputs( - Materials.Ethylene.getGas(9000), - Materials.CarbonMonoxide.getGas(9000), - MaterialsKevlar.NickelTetracarbonyl.getFluid(900), - Materials.Water.getFluid(9000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000)) - .duration(1 * MINUTES + 15 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // C6H7N + HNO3 =H2SO4,C4H6O3= C6H6N2O2 + H2O + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("butanol"), 2000), + new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000), + Materials.IronIIIChloride.getFluid(100)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("aniline"), 1000), - new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100), - Materials.NitrationMixture.getFluid(2000)) - .fluidOutputs( - MaterialsKevlar.IVNitroaniline.getFluid(1000), - Materials.DilutedSulfuricAcid.getFluid(1000)) - .duration(15 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("butanol"), 18000), + new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000), + Materials.IronIIIChloride.getFluid(900)) + .duration(3 * MINUTES + 45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(9)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("aniline"), 9000), - new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900), - Materials.NitrationMixture.getFluid(18000)) - .fluidOutputs( - MaterialsKevlar.IVNitroaniline.getFluid(9000), - Materials.DilutedSulfuricAcid.getFluid(9000)) - .duration(1 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // C6H6N2O2 + 6H =Pd,NO2= C6H8N2 + 2H2O + // C2H4 + CO + H2O =C4NiO= C3H6O2 - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16)) - .fluidInputs( - Materials.NitrogenDioxide.getGas(100), - Materials.Hydrogen.getGas(6000), - MaterialsKevlar.IVNitroaniline.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(2000)) - .duration(20 * SECONDS) - .eut(500000) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs( + Materials.Ethylene.getGas(1000), + Materials.CarbonMonoxide.getGas(1000), + MaterialsKevlar.NickelTetracarbonyl.getFluid(100), + Materials.Water.getFluid(1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - // C4H10O2 =Cu= C4H6O2 + 4H + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .fluidInputs( + Materials.Ethylene.getGas(9000), + Materials.CarbonMonoxide.getGas(9000), + MaterialsKevlar.NickelTetracarbonyl.getFluid(900), + Materials.Water.getFluid(9000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) - .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(1000), Materials.Hydrogen.getGas(4000)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + // C6H7N + HNO3 =H2SO4,C4H6O3= C6H6N2O2 + H2O - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000)) - .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(9000), Materials.Hydrogen.getGas(36000)) - .duration(35 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("aniline"), 1000), + new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100), + Materials.NitrationMixture.getFluid(2000)) + .fluidOutputs(MaterialsKevlar.IVNitroaniline.getFluid(1000), Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - // 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2 + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("aniline"), 9000), + new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900), + Materials.NitrationMixture.getFluid(18000)) + .fluidOutputs(MaterialsKevlar.IVNitroaniline.getFluid(9000), Materials.DilutedSulfuricAcid.getFluid(9000)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12)) - .fluidInputs( - MaterialsKevlar.Acetylene.getGas(1000), - new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 2000)) - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + // C6H6N2O2 + 6H =Pd,NO2= C6H8N2 + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44)) - .fluidInputs( - MaterialsKevlar.Acetylene.getGas(9000), - new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 18000)) - .duration(2 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // C4H6O2 + 4H =NiAl= C4H10O2 + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16)) + .fluidInputs( + Materials.NitrogenDioxide.getGas(100), + Materials.Hydrogen.getGas(6000), + MaterialsKevlar.IVNitroaniline.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(20 * SECONDS) + .eut(500000) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1)) - .fluidInputs(Materials.Hydrogen.getGas(4000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) - .duration(15 * SECONDS) - .eut(500000) - .addTo(multiblockChemicalReactorRecipes); + // C4H10O2 =Cu= C4H6O2 + 4H - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) - .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) - .fluidOutputs( - MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000), - Materials.DilutedHydrochloricAcid.getFluid(2000)) - .duration(30 * SECONDS) - .eut(500000) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) + .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(1000), Materials.Hydrogen.getGas(4000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 7), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) - .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) - .fluidOutputs( - MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000), - Materials.DilutedHydrochloricAcid.getFluid(14000)) - .duration(2 * MINUTES + 55 * SECONDS) - .eut(500000) - .addTo(multiblockChemicalReactorRecipes); - - // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000)) + .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(9000), Materials.Hydrogen.getGas(36000)) + .duration(35 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23)) - .itemOutputs(Materials.Salt.getDust(4)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), Materials.Water.getFluid(5000)) - .duration(40 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(multiblockChemicalReactorRecipes); + // 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2 - // H3BO3 + 3CH4O =H2SO4= C3H9BO3 + 3H2O + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12)) + .fluidInputs( + MaterialsKevlar.Acetylene.getGas(1000), + new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 2000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs( - Materials.Methanol.getFluid(3000), - new FluidStack(FluidRegistry.getFluid("boricacid"), 1000), - Materials.SulfuricAcid.getFluid(6000)) - .fluidOutputs( - Materials.DilutedSulfuricAcid.getFluid(6000), - MaterialsKevlar.TrimethylBorate.getFluid(1000)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44)) + .fluidInputs( + MaterialsKevlar.Acetylene.getGas(9000), + new FluidStack(FluidRegistry.getFluid("fluid.formaldehyde"), 18000)) + .duration(2 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(9)) - .fluidInputs( - Materials.Methanol.getFluid(27000), - new FluidStack(FluidRegistry.getFluid("boricacid"), 9000), - Materials.SulfuricAcid.getFluid(54000)) - .fluidOutputs( - Materials.DilutedSulfuricAcid.getFluid(54000), - MaterialsKevlar.TrimethylBorate.getFluid(9000)) - .duration(3 * MINUTES + 45 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - - // RhCl3 + 3C18H15P + 3NaBH4 + CO = RhC55H46P3O + 3NaCl + 3B + 11H + // C4H6O2 + 4H =NiAl= C4H10O2 - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4), - MaterialsKevlar.Triphenylphosphene.getDust(64), - MaterialsKevlar.Triphenylphosphene.getDust(38), - MaterialsKevlar.SodiumBorohydride.getDust(18)) - .itemOutputs( - MaterialsKevlar.OrganorhodiumCatalyst.getDust(64), - MaterialsKevlar.OrganorhodiumCatalyst.getDust(42), - Materials.Salt.getDust(6), - Materials.Boron.getDust(3)) - .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(11000)) - .duration(40 * SECONDS) - .eut(500000) - .addTo(multiblockChemicalReactorRecipes); - - // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1)) + .fluidInputs(Materials.Hydrogen.getGas(4000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) + .duration(15 * SECONDS) + .eut(500000) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - Materials.SodiumHydroxide.getDust(6), - Materials.Manganese.getDustTiny(1)) - .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(4)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.hydrazine"), 1000)) - .fluidOutputs(Materials.Nitrogen.getGas(2000), Materials.Water.getFluid(2000)) - .duration(10 * TICKS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) + .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) + .fluidOutputs( + MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000), + Materials.DilutedHydrochloricAcid.getFluid(2000)) + .duration(30 * SECONDS) + .eut(500000) + .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(18), - Materials.SodiumHydroxide.getDust(54), - Materials.Manganese.getDust(1)) - .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(36)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.hydrazine"), 9000)) - .fluidOutputs(Materials.Nitrogen.getGas(18000), Materials.Water.getFluid(18000)) - .duration(3 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_EV) - .addTo(multiblockChemicalReactorRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 7), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) + .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) + .fluidOutputs( + MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000), + Materials.DilutedHydrochloricAcid.getFluid(14000)) + .duration(2 * MINUTES + 55 * SECONDS) + .eut(500000) + .addTo(multiblockChemicalReactorRecipes); + + // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23)) + .itemOutputs(Materials.Salt.getDust(4)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), Materials.Water.getFluid(5000)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + // H3BO3 + 3CH4O =H2SO4= C3H9BO3 + 3H2O + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs( + Materials.Methanol.getFluid(3000), + new FluidStack(FluidRegistry.getFluid("boricacid"), 1000), + Materials.SulfuricAcid.getFluid(6000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(6000), MaterialsKevlar.TrimethylBorate.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .fluidInputs( + Materials.Methanol.getFluid(27000), + new FluidStack(FluidRegistry.getFluid("boricacid"), 9000), + Materials.SulfuricAcid.getFluid(54000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(54000), MaterialsKevlar.TrimethylBorate.getFluid(9000)) + .duration(3 * MINUTES + 45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); + + // RhCl3 + 3C18H15P + 3NaBH4 + CO = RhC55H46P3O + 3NaCl + 3B + 11H + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4), + MaterialsKevlar.Triphenylphosphene.getDust(64), + MaterialsKevlar.Triphenylphosphene.getDust(38), + MaterialsKevlar.SodiumBorohydride.getDust(18)) + .itemOutputs( + MaterialsKevlar.OrganorhodiumCatalyst.getDust(64), + MaterialsKevlar.OrganorhodiumCatalyst.getDust(42), + Materials.Salt.getDust(6), + Materials.Boron.getDust(3)) + .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(11000)) + .duration(40 * SECONDS) + .eut(500000) + .addTo(multiblockChemicalReactorRecipes); + + // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + Materials.SodiumHydroxide.getDust(6), + Materials.Manganese.getDustTiny(1)) + .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(4)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.hydrazine"), 1000)) + .fluidOutputs(Materials.Nitrogen.getGas(2000), Materials.Water.getFluid(2000)) + .duration(10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(18), + Materials.SodiumHydroxide.getDust(54), + Materials.Manganese.getDust(1)) + .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(36)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("fluid.hydrazine"), 9000)) + .fluidOutputs(Materials.Nitrogen.getGas(18000), Materials.Water.getFluid(18000)) + .duration(3 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 11861a9618..e0ad96abe3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; @@ -540,30 +539,28 @@ public class FluidExtractorRecipes implements Runnable { .addTo(fluidExtractionRecipes); // Beecombs fluid extractor recipes - if (BartWorks.isModLoaded()) { - // xenon - GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 134)) - .fluidOutputs(getFluidStack("xenon", 250)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_IV) - .addTo(fluidExtractionRecipes); - - // neon - GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 135)) - .fluidOutputs(getFluidStack("neon", 250)) - .duration(15 * TICKS) - .eut(TierEU.RECIPE_IV) - .addTo(fluidExtractionRecipes); - - // krpton - GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 136)) - .fluidOutputs(getFluidStack("krypton", 250)) - .duration(1 * SECONDS + 5 * TICKS) - .eut(TierEU.RECIPE_IV) - .addTo(fluidExtractionRecipes); - } + // xenon + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 134)) + .fluidOutputs(getFluidStack("xenon", 250)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidExtractionRecipes); + + // neon + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 135)) + .fluidOutputs(getFluidStack("neon", 250)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidExtractionRecipes); + + // krpton + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 136)) + .fluidOutputs(getFluidStack("krypton", 250)) + .duration(1 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidExtractionRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index 49ad1154c7..6ac00b96bd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -136,15 +136,13 @@ public class ForgeHammerRecipes implements Runnable { .eut(16) .addTo(hammerRecipes); - if (GTPlusPlus.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) - .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L)) - .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L)) - .duration(10 * SECONDS) - .eut(TierEU.RECIPE_UXV) - .addTo(hammerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) + .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L)) + .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_UXV) + .addTo(hammerRecipes); if (HardcoreEnderExpansion.isModLoaded()) { GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index 444db30889..b3fd9a392b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -400,17 +399,15 @@ public class VacuumFreezerRecipes implements Runnable { .addTo(vacuumFreezerRecipes); } - if (GTPlusPlus.isModLoaded()) { - // hot transcendent metal ingot cooling - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.TranscendentMetal, 1L)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), - Materials.SuperCoolant.getFluid(1000)) - .duration(1 * SECONDS) - .eut(TierEU.RECIPE_UIV) - .addTo(vacuumFreezerRecipes); - } + // hot transcendent metal ingot cooling + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.TranscendentMetal, 1L)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), + Materials.SuperCoolant.getFluid(1000)) + .duration(1 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .addTo(vacuumFreezerRecipes); } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 2f9e347b52..107b508e04 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -448,27 +448,25 @@ public class RECIPES_Machines { GregtechItemList.Large_Plasma_Turbine.get(1), 20 * 60, MaterialUtils.getVoltageForTier(7)); - if (GoodGenerator.isModLoaded()) { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem(GoodGenerator.ID, "supercriticalFluidTurbineCasing", 1), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 4, 10101), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 8, 10101) }, - FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2), - GregtechItemList.Casing_Turbine_SC.get(1), - 20 * 5, - MaterialUtils.getVoltageForTier(6)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(18), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 32016), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 8, 10104), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 16, 10104), - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedgearGt", 4, 10104), CI.getCircuit(7, 8) }, - FluidRegistry.getFluidStack("molten.hikarium", 144 * 8), - GregtechItemList.Large_SCSteam_Turbine.get(1), - 20 * 60, - MaterialUtils.getVoltageForTier(7)); - } + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), + GT_ModHandler.getModItem(GoodGenerator.ID, "supercriticalFluidTurbineCasing", 1), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 4, 10101), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 8, 10101) }, + FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2), + GregtechItemList.Casing_Turbine_SC.get(1), + 20 * 5, + MaterialUtils.getVoltageForTier(6)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { CI.getNumberedAdvancedCircuit(18), + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 32016), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 8, 10104), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 16, 10104), + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedgearGt", 4, 10104), CI.getCircuit(7, 8) }, + FluidRegistry.getFluidStack("molten.hikarium", 144 * 8), + GregtechItemList.Large_SCSteam_Turbine.get(1), + 20 * 60, + MaterialUtils.getVoltageForTier(7)); } private static void multiSolarTower() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index e756a92343..ab9d26cdf3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; -import static gregtech.api.enums.Mods.TecTech; import static gregtech.api.util.GT_Utility.filterValidMTEs; import java.lang.reflect.InvocationTargetException; @@ -547,7 +546,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * Causes a Random Maint. Issue. - * + * * @return {@link boolean} - Returns whether or not an issue was caused, should always be true. */ public boolean causeMaintenanceIssue() { @@ -719,14 +718,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex } // Handle TT Multi-A Energy Hatches - else if (TecTech.isModLoaded() && isThisHatchMultiEnergy(aMetaTileEntity)) { + else if (isThisHatchMultiEnergy(aMetaTileEntity)) { log("Found isThisHatchMultiEnergy"); aDidAdd = addToMachineListInternal(mTecTechEnergyHatches, aMetaTileEntity, aBaseCasingIndex); updateMasterEnergyHatchList(aMetaTileEntity); } // Handle TT Multi-A Dynamos - else if (TecTech.isModLoaded() && isThisHatchMultiDynamo(aMetaTileEntity)) { + else if (isThisHatchMultiDynamo(aMetaTileEntity)) { log("Found isThisHatchMultiDynamo"); aDidAdd = addToMachineListInternal(mTecTechDynamoHatches, aMetaTileEntity, aBaseCasingIndex); updateMasterDynamoHatchList(aMetaTileEntity); @@ -975,7 +974,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * TecTech Multi-Amp Dynamo Support - * + * * @param aTileEntity - The Dynamo Hatch * @param aBaseCasingIndex - Casing Texture * @return @@ -1028,7 +1027,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * TecTech Multi-Amp Energy Hatch Support - * + * * @param aTileEntity - The Energy Hatch * @param aBaseCasingIndex - Casing Texture * @return @@ -1221,7 +1220,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * accept meta [0, maxMeta) - * + * * @param maxMeta exclusive */ public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiConsumer<T, Integer> aSetTheMeta, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 67244cb399..5ad8803040 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -9,7 +9,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.withChann import static gregtech.api.enums.GT_HatchElement.Dynamo; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.Mods.TecTech; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; import static gregtech.api.util.GT_Utility.filterValidMTEs; @@ -466,7 +465,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { return addToMachineList(aTileEntity, aBaseCasingIndex); - } else if (TecTech.isModLoaded()) { + } else { if (isThisHatchMultiDynamo(aMetaTileEntity)) { return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (isThisHatchMultiEnergy(aMetaTileEntity)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index a954711fd2..2dae8a3f75 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -1,9 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.TecTech; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; @@ -148,29 +146,14 @@ public class RecipeLoader_GlueLine { 30); // CaCO3 + 2HCl = CaCl2 + CO2 + H2O - if (BartWorks.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemUtils.getItemStackFromFQRN("bartworks:gt.bwMetaGenerateddust:63", 3)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(2000L)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - } else { - GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(3)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(2000L)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - } + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemUtils.getItemStackFromFQRN("bartworks:gt.bwMetaGenerateddust:63", 3)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000L)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Cu + 2H2SO4 = CuSO4 + SO2 + 2H2O // SO2 + 2H2O -> diluted sulfuric acid @@ -316,71 +299,69 @@ public class RecipeLoader_GlueLine { 32, 8); - if (TecTech.isModLoaded()) { - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(144), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32505", 1), - 300, - 7680); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(144), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32505", 1), + 300, + 7680); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(288), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32506", 1), - 200, - 30720); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 6), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(288), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32506", 1), + 200, + 30720); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(576), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32507", 1), - 300, - 122880); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.ElectrumFlux, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 18), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(576), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32507", 1), + 300, + 122880); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1152), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32561", 1), - 100, - 491520); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.ElectrumFlux, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 24), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1152), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32561", 1), + 100, + 491520); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(2304), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32562", 1), - 200, - 1966080); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahEnriched, 36), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(2304), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32562", 1), + 200, + 1966080); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(4608), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32563", 1), - 300, - 1966080); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.ElectrumFlux, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 48), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(4608), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32563", 1), + 300, + 1966080); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(9216), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32564", 1), - 600, - 1966080); + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 56), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(9216), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32564", 1), + 600, + 1966080); - GT_Values.RA.addAssemblerRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(18432), - ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32565", 1), - 1200, - 1966080); - } + GT_Values.RA.addAssemblerRecipe( + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 64), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(18432), + ItemUtils.getItemStackFromFQRN("gregtech:gt.metaitem.01:32565", 1), + 1200, + 1966080); if (NewHorizonsCoreMod.isModLoaded() && GalacticraftCore.isModLoaded()) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java index 28c8b2a337..c69a26326f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_TreeFarm.java @@ -24,7 +24,7 @@ public class RecipeLoader_TreeFarm { if (Mods.IndustrialCraft2.isModLoaded()) generateIC2Trees(); if (Mods.TinkerConstruct.isModLoaded()) generateTinkersTrees(); - if (Mods.GTPlusPlus.isModLoaded()) generateGTPPTrees(); + generateGTPPTrees(); if (Mods.TwilightForest.isModLoaded()) generateTwilightForestTrees(); if (Mods.GalaxySpace.isModLoaded()) generateGalaxySpaceTrees(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index b75573a9cf..8c0740192e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java @@ -1,7 +1,5 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gregtech.api.enums.Mods.GoodGenerator; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; @@ -32,11 +30,9 @@ public class GregtechLargeTurbinesAndHeatExchanger { GregtechItemList.Large_Plasma_Turbine.set( new GT_MTE_LargeTurbine_Plasma(31074, "multimachine.largerplasmaturbine", "XL Turbo Plasma Turbine") .getStackForm(1L)); - if (GoodGenerator.isModLoaded()) { - GregtechItemList.Large_SCSteam_Turbine.set( - new GT_MTE_LargeTurbine_SCSteam(31076, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine") - .getStackForm(1L)); - } + GregtechItemList.Large_SCSteam_Turbine.set( + new GT_MTE_LargeTurbine_SCSteam(31076, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine") + .getStackForm(1L)); GregtechItemList.Hatch_Turbine_Rotor .set(new GT_MetaTileEntity_Hatch_Turbine(30010, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L)); GregtechItemList.XL_HeatExchanger.set( diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index 39d6b224d5..674b87f95d 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -20,6 +20,8 @@ package kubatech; +import static gregtech.api.enums.Mods.MineTweaker; +import static gregtech.api.enums.Mods.Thaumcraft; import static kubatech.loaders.BlockLoader.registerBlocks; import static kubatech.loaders.ItemLoader.registerItems; @@ -35,7 +37,6 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import kubatech.api.LoaderReference; import kubatech.commands.CommandHandler; import kubatech.config.Config; import kubatech.loaders.MTLoader; @@ -61,12 +62,12 @@ public class CommonProxy { } public void init(FMLInitializationEvent event) { - if (LoaderReference.MineTweaker) MTLoader.init(); + if (MineTweaker.isModLoaded()) MTLoader.init(); } public void postInit(FMLPostInitializationEvent event) { RecipeLoader.addRecipes(); - if (LoaderReference.Thaumcraft) TCLoader.init(); + if (Thaumcraft.isModLoaded()) TCLoader.init(); } public void serverAboutToStart(FMLServerAboutToStartEvent event) {} diff --git a/src/main/java/kubatech/api/LoaderReference.java b/src/main/java/kubatech/api/LoaderReference.java deleted file mode 100644 index 57a7077d26..0000000000 --- a/src/main/java/kubatech/api/LoaderReference.java +++ /dev/null @@ -1,23 +0,0 @@ -package kubatech.api; - -import cpw.mods.fml.common.Loader; - -public class LoaderReference { - - public static final boolean BloodMagic = Loader.isModLoaded("AWWayofTime"); - public static final boolean EnderIO = Loader.isModLoaded("EnderIO"); - public static final boolean ExtraUtilities = Loader.isModLoaded("ExtraUtilities"); - public static final boolean InfernalMobs = Loader.isModLoaded("InfernalMobs"); - public static final boolean Thaumcraft = Loader.isModLoaded("Thaumcraft"); - public static final boolean MineTweaker = Loader.isModLoaded("MineTweaker3"); - public static final boolean Bartworks = Loader.isModLoaded("bartworks"); - public static final boolean GTNHCoreMod = Loader.isModLoaded("dreamcraft"); - public static final boolean GTPlusPlus = Loader.isModLoaded("miscutils"); - public static final boolean HarvestCraft = Loader.isModLoaded("harvestcraft"); - public static final boolean Forestry = Loader.isModLoaded("Forestry"); - public static final boolean DraconicEvolution = Loader.isModLoaded("DraconicEvolution"); - public static final boolean Avaritia = Loader.isModLoaded("Avaritia"); - public static final boolean ProjRedIllumination = Loader.isModLoaded("ProjRed|Illumination"); - public static final boolean RandomThings = Loader.isModLoaded("RandomThings"); - public static final boolean ElectroMagicTools = Loader.isModLoaded("EMT"); -} diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index f7805ec84f..d23637d7d2 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -1,5 +1,6 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.ElectroMagicTools; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; @@ -30,7 +31,6 @@ import gregtech.api.util.GT_Utility; import gregtech.nei.formatter.SimpleSpecialValueFormatter; import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; import kubatech.Tags; -import kubatech.api.LoaderReference; public class DEFCRecipes { @@ -47,19 +47,17 @@ public class DEFCRecipes { public static void addRecipes() { // Dragonblood recipe for magics haters - if (LoaderReference.GTPlusPlus) { - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dragon_egg, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) - .fluidInputs(Materials.Radon.getPlasma(144)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) - .eut(1_966_080) - .duration(14_000) - .addTo(mixerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dragon_egg, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) + .fluidInputs(Materials.Radon.getPlasma(144)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) + .eut(1_966_080) + .duration(14_000) + .addTo(mixerRecipes); // Casings @@ -129,7 +127,7 @@ public class DEFCRecipes { private static final Item EMTItems = GameRegistry.findItem("EMT", "EMTItems"); private static void addOldHiddenRecipe(GT_Recipe recipe) { - if (!LoaderReference.ElectroMagicTools) return; + if (!ElectroMagicTools.isModLoaded()) return; recipe = recipe.copy(); recipe.mInputs = Arrays.stream(recipe.mInputs) .map(i -> { @@ -147,7 +145,7 @@ public class DEFCRecipes { } private static void conversionRecipes() { - if (!LoaderReference.ElectroMagicTools) return; + if (!ElectroMagicTools.isModLoaded()) return; GameRegistry.addShapelessRecipe( kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(1), new ItemStack(EMTItems, 1, 16)); @@ -271,59 +269,56 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); // Dragon Blood - if (LoaderReference.GTPlusPlus) { - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(Materials.Radon.getPlasma(144)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) - .eut(1_966_080) - .duration(4200) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dragon_egg, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Radon.getPlasma(144)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) + .eut(1_966_080) + .duration(4200) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem("witchery", "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(Materials.Radon.getPlasma(72)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) - .eut(1_966_080) - .duration(3600) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("witchery", "infinityegg", 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Radon.getPlasma(72)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) + .eut(1_966_080) + .duration(3600) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) - .fluidInputs(Materials.Radon.getPlasma(216)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) - .eut(1_966_080) - .duration(2800) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dragon_egg, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + .fluidInputs(Materials.Radon.getPlasma(216)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) + .eut(1_966_080) + .duration(2800) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem("witchery", "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) - .fluidInputs(Materials.Radon.getPlasma(108)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) - .eut(1_966_080) - .duration(2400) - .specialValue(3) - .noOptimize() - .addTo(fusionCraftingRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("witchery", "infinityegg", 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + .fluidInputs(Materials.Radon.getPlasma(108)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) + .eut(1_966_080) + .duration(2400) + .specialValue(3) + .noOptimize() + .addTo(fusionCraftingRecipes); } } diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java index e7e4ff1736..261cad087c 100644 --- a/src/main/java/kubatech/loaders/MobHandlerLoader.java +++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java @@ -20,6 +20,8 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.InfernalMobs; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE; import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL; @@ -59,7 +61,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_Utility; import kubatech.Tags; -import kubatech.api.LoaderReference; import kubatech.api.helpers.ReflectionHelper; import kubatech.config.Config; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; @@ -161,7 +162,7 @@ public class MobHandlerLoader { } } - if (LoaderReference.InfernalMobs) { + if (InfernalMobs.isModLoaded()) { InfernalMobsCore infernalMobsCore = InfernalMobsCore.instance(); if (recipe.infernalityAllowed && mEUt * 8 <= MTE.getMaxInputEu() && !infernalMobsCore.getDimensionBlackList() @@ -229,7 +230,7 @@ public class MobHandlerLoader { @SubscribeEvent public void onPostOverridesConfigLoad(PostMobsOverridesLoadEvent event) { - if (LoaderReference.GTNHCoreMod) { + if (NewHorizonsCoreMod.isModLoaded()) { LOG.info("Detected GTNH Core Mod, parsing custom drops from there."); CustomDrops coredrops = ReflectionHelper.getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null); if (coredrops != null) { diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index c2103b7f69..7d609021b6 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -21,8 +21,12 @@ package kubatech.loaders; import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; @@ -79,7 +83,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; -import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; @@ -101,7 +104,7 @@ public class RecipeLoader { GT_MetaTileEntity_ExtremeEntityCrusher.class, "multimachine.entitycrusher", "Extreme Entity Crusher", - LoaderReference.EnderIO)) { + EnderIO.isModLoaded())) { GT_ModHandler.addCraftingRecipe( ItemList.ExtremeEntityCrusher.get(1), bitsd, @@ -114,7 +117,7 @@ public class RecipeLoader { GT_MetaTileEntity_MegaIndustrialApiary.class, "multimachine.extremeapiary", "Industrial Apicultural Acclimatiser and Drone Domestication Station", - LoaderReference.Forestry)) { + Forestry.isModLoaded())) { GT_Values.RA.stdBuilder() .metadata(RESEARCH_ITEM, gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) @@ -158,7 +161,7 @@ public class RecipeLoader { GT_MetaTileEntity_DEFusionCrafter.class, "multimachine.defusioncrafter", "Draconic Evolution Fusion Crafter", - LoaderReference.DraconicEvolution)) { + DraconicEvolution.isModLoaded())) { // Controller recipe added in TecTech DEFCRecipes.addRecipes(); } @@ -212,7 +215,7 @@ public class RecipeLoader { private static void RegisterTeaLine() { // TEA LINE // - if (LoaderReference.GTPlusPlus && LoaderReference.HarvestCraft) { + if (PamsHarvestCraft.isModLoaded()) { CORE.RA.addDehydratorRecipe( new ItemStack[] { GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1) }, null, diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index 7d6abe5132..f6ff1cac9f 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -20,6 +20,9 @@ package kubatech.loaders; +import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -32,7 +35,6 @@ import net.minecraft.world.World; import com.kuba6000.mobsinfo.api.utils.ItemID; import cpw.mods.fml.common.registry.GameRegistry; -import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.loaders.item.items.TeaUltimate; import thaumcraft.api.ThaumcraftApi; @@ -55,7 +57,7 @@ public class TCLoader { * new ResourceLocation(Tags.MODID, "textures/gui/green_tea.png"), * new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")); */ - if (!LoaderReference.GTNHCoreMod || !LoaderReference.DraconicEvolution) return; + if (!NewHorizonsCoreMod.isModLoaded() || !DraconicEvolution.isModLoaded()) return; registerRecipe(); registerResearch(); } diff --git a/src/main/java/kubatech/nei/IMCForNEI.java b/src/main/java/kubatech/nei/IMCForNEI.java index 4360aa344e..fe1eb64ebb 100644 --- a/src/main/java/kubatech/nei/IMCForNEI.java +++ b/src/main/java/kubatech/nei/IMCForNEI.java @@ -20,15 +20,16 @@ package kubatech.nei; +import static gregtech.api.enums.Mods.EnderIO; + import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.event.FMLInterModComms; -import kubatech.api.LoaderReference; public class IMCForNEI { public static void IMCSender() { - if (LoaderReference.EnderIO) sendCatalyst("mobsinfo.mobhandler", "gregtech:gt.blockmachines:14201"); + if (EnderIO.isModLoaded()) sendCatalyst("mobsinfo.mobhandler", "gregtech:gt.blockmachines:14201"); } private static void sendCatalyst(String aName, String aStack, int aPriority) { diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java index be0c628066..25038b70be 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java @@ -29,6 +29,9 @@ import static gregtech.api.enums.GT_HatchElement.InputBus; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.ExtraUtilities; +import static gregtech.api.enums.Mods.InfernalMobs; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; @@ -54,7 +57,6 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -119,7 +121,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; import kubatech.Tags; -import kubatech.api.LoaderReference; import kubatech.api.helpers.ReflectionHelper; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.api.tileentity.CustomTileEntityPacketHandler; @@ -147,12 +148,12 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher public GT_MetaTileEntity_ExtremeEntityCrusher(String aName) { super(aName); weaponCache = new WeaponCache(mInventory); - if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.register(this); + if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.register(this); } @Override public void onRemoval() { - if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.unregister(this); + if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.unregister(this); if (getBaseMetaTileEntity().isClientSide() && entityRenderer != null) { entityRenderer.setDead(); } @@ -160,7 +161,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher @Override public void onUnload() { - if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.unregister(this); + if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.unregister(this); } private static final String WellOfSufferingRitualName = "AW013Suffering"; @@ -190,15 +191,11 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher .casingIndex(CASING_INDEX) .dot(1) .buildAndChain(onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 0)))) - .addElement( - 'g', - LoaderReference.Bartworks - ? BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier) - : onElementPass(t -> t.mGlassTier = 100, ofBlock(Blocks.glass, 0))) + .addElement('g', BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier)) .addElement('f', ofFrame(Materials.Steel)) .addElement( 's', - LoaderReference.ExtraUtilities ? ofBlock(Block.getBlockFromName("ExtraUtilities:spike_base_diamond"), 0) + ExtraUtilities.isModLoaded() ? ofBlock(Block.getBlockFromName("ExtraUtilities:spike_base_diamond"), 0) : isAir()) .build(); @@ -400,13 +397,13 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher return; } if (aPlayer.isSneaking()) { - if (!LoaderReference.InfernalMobs) return; + if (!InfernalMobs.isModLoaded()) return; mIsProducingInfernalDrops = !mIsProducingInfernalDrops; if (!mIsProducingInfernalDrops) GT_Utility.sendChatToPlayer(aPlayer, "Mobs will now be prevented from spawning infernal"); else GT_Utility.sendChatToPlayer(aPlayer, "Mobs can spawn infernal now"); } else { - if (!LoaderReference.BloodMagic) return; + if (!BloodMagic.isModLoaded()) return; isInRitualMode = !isInRitualMode; if (!isInRitualMode) { GT_Utility.sendChatToPlayer(aPlayer, "Ritual mode disabled"); @@ -633,7 +630,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher } private boolean connectToRitual() { - if (!LoaderReference.BloodMagic) return false; + if (!BloodMagic.isModLoaded()) return false; ChunkCoordinates coords = this.getBaseMetaTileEntity() .getCoords(); int[] abc = new int[] { 0, -8, 2 }; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java index 4548e1adca..cdab236542 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java @@ -24,6 +24,8 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.Mods.ProjectRedIllumination; +import static gregtech.api.enums.Mods.RandomThings; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; @@ -132,7 +134,6 @@ import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import kubatech.Tags; import kubatech.api.DynamicInventory; -import kubatech.api.LoaderReference; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.client.effect.CropRenderer; @@ -218,19 +219,17 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .addElement('C', onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings4, 1))) .addElement( 'l', - LoaderReference.ProjRedIllumination + ProjectRedIllumination.isModLoaded() ? ofBlock(Block.getBlockFromName("ProjRed|Illumination:projectred.illumination.lamp"), 10) : ofChain(ofBlock(Blocks.redstone_lamp, 0), ofBlock(Blocks.lit_redstone_lamp, 0))) .addElement( 'g', - LoaderReference.Bartworks - ? BorosilicateGlass - .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glasTier = t, te -> te.glasTier) - : onElementPass(t -> t.glasTier = 100, ofBlock(Blocks.glass, 0))) + BorosilicateGlass + .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glasTier = t, te -> te.glasTier)) .addElement( 'd', ofBlock( - LoaderReference.RandomThings ? Block.getBlockFromName("RandomThings:fertilizedDirt_tilled") + RandomThings.isModLoaded() ? Block.getBlockFromName("RandomThings:fertilizedDirt_tilled") : Blocks.farmland, 0)) .addElement( diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java index 8a8dd6d4fc..10558187af 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java @@ -126,7 +126,6 @@ import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import kubatech.Tags; import kubatech.api.DynamicInventory; -import kubatech.api.LoaderReference; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.client.effect.MegaApiaryBeesRenderer; @@ -181,11 +180,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .replaceAll("F", " ")) .toArray(String[]::new)) .toArray(String[][]::new)) - .addElement( - 'A', - LoaderReference.Bartworks - ? BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier) - : onElementPass(t -> t.mGlassTier = 100, ofBlock(Blocks.glass, 0))) + .addElement('A', BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier)) .addElement('B', ofChain(ofBlockAnyMeta(Blocks.dirt, 0), ofBlock(Blocks.grass, 0))) .addElement( 'G', |