From 3939f74dc8afe7236f2bec0aba021e3675c24bfc Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 26 May 2024 00:34:53 +0100 Subject: 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 --- .../base/GregtechMeta_MultiBlockBase.java | 13 +- ...chMetaTileEntity_PowerSubStationController.java | 3 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 147 +++++++++------------ .../loaders/recipe/RecipeLoader_TreeFarm.java | 2 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 10 +- 5 files changed, 75 insertions(+), 100 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') 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 IStructureElement addTieredBlock(Block aBlock, BiConsumer 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( -- cgit