diff options
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 |