diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-09-01 04:49:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-31 22:49:39 -0400 |
| commit | f7b56c032947b2fed7d9b521f6f2d221115e08e9 (patch) | |
| tree | 33a3aa956fe27ebe19692d5e90c54447f5db8f0e /src/main/java/gregtech | |
| parent | b22ab538b762de1fdc83d3a2e45fc21adcab5efd (diff) | |
| download | GT5-Unofficial-f7b56c032947b2fed7d9b521f6f2d221115e08e9.tar.gz GT5-Unofficial-f7b56c032947b2fed7d9b521f6f2d221115e08e9.tar.bz2 GT5-Unofficial-f7b56c032947b2fed7d9b521f6f2d221115e08e9.zip | |
Fix some more gmi calls (#3009)
* strenghten fobidden gmi checks
* yeet some hidden gt++ gmi
* yeet last gt gmi call
* forbidden isModLoaded calls
* add other GTNH-I MTE IDs
* Spotless apply for branch fix/gmi_calls for #3009 (#3010)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech')
3 files changed, 20 insertions, 7 deletions
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 |