diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2024-05-26 00:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-26 00:34:53 +0100 |
| commit | 3939f74dc8afe7236f2bec0aba021e3675c24bfc (patch) | |
| tree | bd8a56ac6d9e30b54d42848d34677becb1801c50 /src/main/java/com | |
| parent | 3819aed2f2e0e82f303f76b789b519c7702cf9bb (diff) | |
| download | GT5-Unofficial-3939f74dc8afe7236f2bec0aba021e3675c24bfc.tar.gz GT5-Unofficial-3939f74dc8afe7236f2bec0aba021e3675c24bfc.tar.bz2 GT5-Unofficial-3939f74dc8afe7236f2bec0aba021e3675c24bfc.zip | |
Mod load check refactors (#2621)
* deprecate LoaderReference
* replace all uses of LoaderReference
* delete loaderreference
* mod loaded checks in gagreg
* remove modloaded checks for merged mods
Diffstat (limited to 'src/main/java/com')
9 files changed, 680 insertions, 728 deletions
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() { |