diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
4 files changed, 27 insertions, 23 deletions
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index 3e2a3e69cc..d197c264c7 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -1,8 +1,8 @@ package gregtech.common.tileentities.generators; import static gregtech.api.enums.ConfigCategories.machineconfig; -import static gregtech.api.enums.GT_Values.MOD_ID_TC; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.ModIDs.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import static net.minecraft.util.EnumChatFormatting.GRAY; @@ -46,7 +46,6 @@ import thaumcraft.api.visnet.VisNetHandler; import com.google.common.base.Enums; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; @@ -72,7 +71,7 @@ interface MagicalEnergyBBListener { public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_BasicGenerator implements MagicalEnergyBBListener { - private static final boolean THAUMCRAFT_LOADED = Loader.isModLoaded(MOD_ID_TC); + private static final boolean THAUMCRAFT_LOADED = Thaumcraft.isModLoaded(); private static final ConcurrentHashMap<UUID, GT_MetaTileEntity_MagicalEnergyAbsorber> sSubscribedCrystals = new ConcurrentHashMap<>( 4); private static final List<Aspect> sPrimalAspects = (THAUMCRAFT_LOADED) ? Aspect.getPrimalAspects() diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java index bc6f50fde6..595953c06f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java @@ -1,6 +1,6 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.GT_Values.MOD_ID_RC; +import static gregtech.api.enums.ModIDs.Railcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.*; @@ -137,9 +137,11 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi addBlacklist(Materials.Graphene.getDust(1)); addBlacklist(ItemList.Circuit_Parts_Vacuum_Tube.get(1L)); addBlacklist(ItemList.Schematic.get(1L)); - addBlacklist(GT_ModHandler.getModItem(MOD_ID_RC, "track", 1L, 0)); - addBlacklist(GT_ModHandler.getModItem(MOD_ID_RC, "track", 1L, 736)); - addBlacklist(GT_ModHandler.getModItem(MOD_ID_RC, "track", 1L, 816)); + if (Railcraft.isModLoaded()) { + addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 0)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 736)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 816)); + } addBlacklist(IC2Items.getItem("mixedMetalIngot")); addBlacklist(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 14)); // region transformer diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 20b42e7bb4..3f37effffa 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.ModIDs.GalacticraftCore; +import static gregtech.api.enums.ModIDs.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes; @@ -228,36 +230,38 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { int stackItemID = Item.getIdFromItem(aStack.getItem()); int stackItemDamage = aStack.getItemDamage(); if (stackItemID == Item.getIdFromItem( - Objects.requireNonNull(GT_ModHandler.getModItem(MOD_ID_GC_CORE, "item.schematic", 1L, 0)) + Objects.requireNonNull( + GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString().equals( Objects.requireNonNull( - GT_ModHandler.getModItem(MOD_ID_GC_CORE, "item.schematic", 1L, 0)).copy() - .toString())) + GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) + .copy().toString())) sTier = "100"; else if (stackItemDamage == 1 && aStack.toString().equals( Objects.requireNonNull( - GT_ModHandler.getModItem(MOD_ID_GC_CORE, "item.schematic", 1L, 1)).copy() - .toString())) + GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 1)) + .copy().toString())) sTier = "2"; } else { if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 0)).getItem())) { + GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) + .getItem())) { if (stackItemDamage == 0 && aStack.toString().equals( Objects.requireNonNull( - GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 0)).copy() - .toString())) + GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) + .copy().toString())) sTier = "3"; else if (stackItemDamage == 1 && aStack.toString().equals( Objects.requireNonNull( - GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 1)).copy() - .toString())) + GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 1)) + .copy().toString())) sTier = "101"; else if (stackItemDamage == 2 && aStack.toString().equals( Objects.requireNonNull( - GT_ModHandler.getModItem(MOD_ID_GC_MARS, "item.schematic", 1L, 2)).copy() - .toString())) + GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 2)) + .copy().toString())) sTier = "102"; } else if (aStack.getUnlocalizedName().matches(".*\\d+.*")) sTier = aStack.getUnlocalizedName().split("(?<=\\D)(?=\\d)")[1].substring(0, 1); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 6d0b194612..a1e85f9b25 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -5,7 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUn import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.*; -import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW; @@ -23,7 +23,6 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; @@ -50,8 +49,8 @@ public class GT_MetaTileEntity_PyrolyseOven extends private static final IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> STRUCTURE_DEFINITION = createStructureDefinition(); private static IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> createStructureDefinition() { - IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = Loader.isModLoaded(MOD_ID_DC) - ? ofBlockUnlocalizedName(MOD_ID_DC, "gt.blockcasingsNH", 2) + IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded() + ? ofBlockUnlocalizedName(NewHorizonsCoreMod.modID, "gt.blockcasingsNH", 2) : ofBlock(GregTech_API.sBlockCasings1, 0); return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder() |