diff options
11 files changed, 104 insertions, 88 deletions
diff --git a/.github/workflows/test-forbidden-getmoditems.yml b/.github/workflows/test-forbidden-getmoditems.yml index ebfb83458e..b6fbb85407 100644 --- a/.github/workflows/test-forbidden-getmoditems.yml +++ b/.github/workflows/test-forbidden-getmoditems.yml @@ -15,4 +15,4 @@ jobs: - name: Detect forbidden getModItem calls shell: bash run: | - ! grep -E -r 'getModItem\(("(bartworks|galacticgreg|ggfab|GoodGenerator|gregtech|gtnhlanth|miscutils|kekztech|kubatech|tectech|gtneioreplugin)"|(BartWorks|GalactiGreg|GGFab|GoodGenerator|GTNHLanthanides|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin)\.ID)' src/main/java + ! grep -E -r 'getModItem\(("(bartworks|galacticgreg|ggfab|GoodGenerator|gregtech|gtnhlanth|miscutils|kekztech|kubatech|tectech|gtneioreplugin)"|.*(BartWorks|GalactiGreg|GGFab|GoodGenerator|GregTech|GTNHLanthanides|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin)\.ID)' src/main/java diff --git a/.github/workflows/test-forbidden-ismodloaded.yml b/.github/workflows/test-forbidden-ismodloaded.yml new file mode 100644 index 0000000000..baeb4515be --- /dev/null +++ b/.github/workflows/test-forbidden-ismodloaded.yml @@ -0,0 +1,18 @@ +name: Forbidden isModLoaded + +on: + pull_request: + branches: [ master, main ] + push: + branches: [ master, main ] + +jobs: + test-forbidden-getmoditems: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Detect forbidden isModLoaded calls + shell: bash + run: | + ! grep -E -r '(BartWorks|GalactiGreg|GGFab|GoodGenerator|GTNHLanthanides|GregTech|GTPlusPlus|KekzTech|KubaTech|TecTech|NEIOrePlugin)\.isModLoaded' src/main/java 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 86927d9add..c7d3ed9070 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 @@ -174,7 +174,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.ThoriumHighTemperatureReactor import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerI; import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerII; import static gregtech.api.enums.MetaTileEntityIDs.VoidMinerIII; -import static gregtech.api.enums.Mods.GalactiGreg; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -579,18 +578,13 @@ public class ItemRegistry { "MegaOilCracker", "Mega Oil Cracker").getStackForm(1L); - if (GalactiGreg.isModLoaded()) { - ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV( - VoidMinerIII.ID, - "VoidMiner3", - "Void Miner III").getStackForm(1L); - ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM( - VoidMinerII.ID, - "VoidMiner2", - "Void Miner II").getStackForm(1L); - ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV(VoidMinerI.ID, "VoidMiner1", "Void Miner I") - .getStackForm(1L); - } + ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV(VoidMinerIII.ID, "VoidMiner3", "Void Miner III") + .getStackForm(1L); + ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM(VoidMinerII.ID, "VoidMiner2", "Void Miner II") + .getStackForm(1L); + ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV(VoidMinerI.ID, "VoidMiner1", "Void Miner I") + .getStackForm(1L); + TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( LowPowerLaserPipe.ID, "pipe.lowpowerlaser", diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java index 538195362a..fd320173a4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java @@ -1,6 +1,5 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; -import static gregtech.api.enums.Mods.GalactiGreg; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -46,24 +45,22 @@ public class AssemblyLine implements Runnable { .duration(4 * MINUTES + 10 * SECONDS) .addTo(AssemblyLine); - if (GalactiGreg.isModLoaded()) { - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L)) - .metadata(RESEARCH_TIME, 25 * MINUTES + 36 * SECONDS) - .itemInputs( - ItemList.OreDrill4.get(1L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 9L), - Materials.Europium.getPlates(3), - ItemList.Electric_Motor_LuV.get(9L), - ItemList.Sensor_LuV.get(9L), - ItemList.Field_Generator_LuV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L)) - .fluidInputs(new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000)) - .itemOutputs(ItemRegistry.voidminer[0].copy()) - .eut(TierEU.RECIPE_LuV) - .duration(5 * MINUTES) - .addTo(AssemblyLine); - } + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L)) + .metadata(RESEARCH_TIME, 25 * MINUTES + 36 * SECONDS) + .itemInputs( + ItemList.OreDrill4.get(1L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 9L), + Materials.Europium.getPlates(3), + ItemList.Electric_Motor_LuV.get(9L), + ItemList.Sensor_LuV.get(9L), + ItemList.Field_Generator_LuV.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L)) + .fluidInputs(new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000)) + .itemOutputs(ItemRegistry.voidminer[0].copy()) + .eut(TierEU.RECIPE_LuV) + .duration(5 * MINUTES) + .addTo(AssemblyLine); GT_Values.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemList.Machine_LuV_CircuitAssembler.get(1L)) diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java index a760c5e256..5e8c20e979 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java @@ -13,7 +13,6 @@ package com.github.bartimaeusnek.crossmod.tectech; -import static gregtech.api.enums.Mods.GalactiGreg; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import net.minecraftforge.fluids.Fluid; @@ -37,40 +36,37 @@ public class TecTechResearchLoader { ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); - if (GalactiGreg.isModLoaded()) { - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemRegistry.voidminer[0].copy(), - 1024000, - 256, - (int) TierEU.RECIPE_ZPM, - 24, - new Object[] { ItemRegistry.voidminer[0].copy(), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 9L), - Materials.BlackPlutonium.getPlates(3), ItemList.Electric_Motor_ZPM.get(9L), - ItemList.Sensor_ZPM.get(9L), ItemList.Field_Generator_ZPM.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Krypton.getFluidOrGas(20000) }, - ItemRegistry.voidminer[1].copy(), - 5 * MINUTES, - (int) TierEU.RECIPE_ZPM); + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemRegistry.voidminer[0].copy(), + 1024000, + 256, + (int) TierEU.RECIPE_ZPM, + 24, + new Object[] { ItemRegistry.voidminer[0].copy(), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 9L), + Materials.BlackPlutonium.getPlates(3), ItemList.Electric_Motor_ZPM.get(9L), ItemList.Sensor_ZPM.get(9L), + ItemList.Field_Generator_ZPM.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 36L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Krypton.getFluidOrGas(20000) }, + ItemRegistry.voidminer[1].copy(), + 5 * MINUTES, + (int) TierEU.RECIPE_ZPM); - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemRegistry.voidminer[1].copy(), - 8192000, - 512, - (int) TierEU.RECIPE_UV, - 64, - new Object[] { ItemRegistry.voidminer[1].copy(), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 9L), - Materials.Neutronium.getPlates(3), ItemList.Electric_Motor_UV.get(9L), ItemList.Sensor_UV.get(9L), - ItemList.Field_Generator_UV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Oganesson.getFluidOrGas(20000) }, - ItemRegistry.voidminer[2].copy(), - 5 * MINUTES, - (int) TierEU.RECIPE_UV); - } + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemRegistry.voidminer[1].copy(), + 8192000, + 512, + (int) TierEU.RECIPE_UV, + 64, + new Object[] { ItemRegistry.voidminer[1].copy(), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 9L), + Materials.Neutronium.getPlates(3), ItemList.Electric_Motor_UV.get(9L), ItemList.Sensor_UV.get(9L), + ItemList.Field_Generator_UV.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 36L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Oganesson.getFluidOrGas(20000) }, + ItemRegistry.voidminer[2].copy(), + 5 * MINUTES, + (int) TierEU.RECIPE_UV); TT_recipeAdder.addResearchableAssemblylineRecipe( ItemList.Machine_Multi_ImplosionCompressor.get(1L), 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 4617117b04..dc5cf1c5ed 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 @@ -15,7 +15,6 @@ import static gregtech.api.enums.Mods.GTNHIntergalactic; import static gregtech.api.enums.Mods.GTPlusPlusEverglades; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.GraviSuite; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.SGCraft; @@ -2377,7 +2376,7 @@ public class ResearchStationAssemblyLine implements Runnable { 64, // amperage new Object[] { // Space elevator controller. - getModItem(GregTech.ID, "gt.blockmachines", 16, 14003), ItemList.Machine_Multi_PlasmaForge.get(4), + ItemList.SpaceElevatorController.get(16), ItemList.Machine_Multi_PlasmaForge.get(4), CustomItemList.EOH_Infinite_Energy_Casing.get(1), CustomItemList.TimeAccelerationFieldGeneratorTier0.get(1), diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 23688a7254..e803318906 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2554,6 +2554,7 @@ public enum ItemList implements IItemContainer { BetterJukebox_IV, WirelessHeadphones, ResearchCompleter, // Populated in EMT + SpaceElevatorController, // Populated in GTNH-Intergalactic // semicolon after the comment to reduce merge conflicts ; diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 1294e9fc04..7c76867571 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -1455,6 +1455,19 @@ public enum MetaTileEntityIDs { WORMHOLE_GENERATOR_CONTROLLER(13115), MegaChemicalReactor(13366), MegaOilCracker(13367), + PlanetaryGasSiphonController(14002), + SpaceElevatorController(14003), + SpaceElevatorModuleAssemblerT1(14004), + SpaceElevatorModuleAssemblerT2(14005), + SpaceElevatorModuleAssemblerT3(14006), + SapceElevatorModuleMinerT1(14007), + SapceElevatorModuleMinerT2(14008), + SapceElevatorModuleMinerT3(14009), + SpaceElevatorModulePumpT1(14010), + SpaceElevatorModulePumpT2(14011), + SpaceElevatorModuleManager(14012), + SpaceElevatorModuleResearch(14013), + SpaceElevatorModulePumpT3(14014), ExtremeEntityCrusherController(14201), ExtremeIndustrialApiaryController(14202), BETTER_JUKEBOX_LV(14301), diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java index 99495dc484..58b689b04d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitPhAdjustment.java @@ -7,7 +7,6 @@ import static gregtech.api.enums.GT_HatchElement.InputBus; import static gregtech.api.enums.GT_HatchElement.InputHatch; import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.enums.GT_Values.AuthorNotAPenguin; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW; @@ -486,13 +485,13 @@ public class GT_MetaTileEntity_PurificationUnitPhAdjustment } else { // Little easier egg: Fluoroantimonic acid has a pH value of -31, it's an acid so strong it will // instantly shatter the glass in the structure. - if (GoodGenerator.isModLoaded()) { - Fluid acid = FluidRegistry.getFluid("fluoroantimonic acid"); - if (stack != null && stack.getFluid() - .equals(acid)) { - // TODO: Actually break the glass and trigger achievement lol - } + + Fluid acid = FluidRegistry.getFluid("fluoroantimonic acid"); + if (stack != null && stack.getFluid() + .equals(acid)) { + // TODO: Actually break the glass and trigger achievement lol } + } // Adjust pH with to new value 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 1026f24538..f3d596fb9e 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 @@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.Mods; import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; import gtPlusPlus.xmod.forestry.ForestryTreeHandler; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm; @@ -108,16 +110,16 @@ public class RecipeLoader_TreeFarm { private static void generateGTPPTrees() { GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Rainforest Oak - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "blockRainforestOakSapling", 1, 0), - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "blockRainforestOakLog", 3, 0), - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "blockRainforestOakLeaves", 1, 0), + new ItemStack(BOP_Block_Registrator.sapling_Rainforest, 1, 0), + new ItemStack(BOP_Block_Registrator.log_Rainforest, 3, 0), + new ItemStack(BOP_Block_Registrator.leaves_Rainforest, 1, 0), new ItemStack(Items.apple, 1, 0)); GregtechMetaTileEntityTreeFarm.registerTreeProducts( // Pine - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "blockPineSapling", 1, 0), - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "blockPineLogLog", 1, 0), - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "blockPineLeaves", 1, 0), - GT_ModHandler.getModItem(Mods.GTPlusPlus.ID, "item.BasicAgrichemItem", 1, 24)); + new ItemStack(BOP_Block_Registrator.sapling_Pine, 1, 0), + new ItemStack(BOP_Block_Registrator.log_Pine, 1, 0), + new ItemStack(BOP_Block_Registrator.leaves_Pine, 1, 0), + new ItemStack(AgriculturalChem.mAgrichemItem1, 1, 24)); } private static void generateTwilightForestTrees() { 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 4df5a995b5..19a1a28deb 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,7 +24,6 @@ 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.BartWorks; 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; @@ -247,10 +246,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse : ofChain(ofBlock(Blocks.redstone_lamp, 0), ofBlock(Blocks.lit_redstone_lamp, 0))) .addElement( 'g', - BartWorks.isModLoaded() - ? BorosilicateGlass - .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glassTier = t, te -> te.glassTier) - : onElementPass(t -> t.glassTier = 100, ofBlock(Blocks.glass, 0))) + BorosilicateGlass + .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glassTier = t, te -> te.glassTier)) .addElement( 'd', ofBlock( |