diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
9 files changed, 47 insertions, 35 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 391a212115..dded37de09 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 @@ -2,7 +2,7 @@ package gregtech.common.tileentities.generators; import static gregtech.api.enums.ConfigCategories.machineconfig; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import static net.minecraft.util.EnumChatFormatting.GRAY; 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 a0d22efd5d..d46d02a761 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,7 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.*; @@ -162,25 +163,25 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi addBlacklist(ItemList.Circuit_Parts_Vacuum_Tube.get(1L)); addBlacklist(ItemList.Schematic.get(1L)); 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(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 0)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 736)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 816)); } addBlacklist(IC2Items.getItem("mixedMetalIngot")); - addBlacklist(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 14)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "machine.alpha", 1L, 14)); // region transformer // Temporary solution for cable dupe // Maybe we can mark assembler recipes as "cannot disassemble" // and only disassemble crafting recipes in the future // Also `getIC2Item` doesn't work, maybe loading order? addBlacklist(ItemList.Transformer_MV_LV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 3)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 3)); addBlacklist(ItemList.Transformer_HV_MV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 4)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 4)); addBlacklist(ItemList.Transformer_EV_HV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 5)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 5)); addBlacklist(ItemList.Transformer_IV_EV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 6)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 6)); // endregion transformer } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 27dea9bd00..8d605599e7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -2,6 +2,7 @@ package gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.debugBlockMiner; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; @@ -460,7 +461,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine } private static final FallbackableUITexture progressBarTexture = new FallbackableUITexture( - UITexture.fullImage("gregtech", "gui/progressbar/miner"), + UITexture.fullImage(GregTech.ID, "gui/progressbar/miner"), GT_UITextures.PROGRESSBAR_CANNER); @Override 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 dc3c4f7dc3..ca2182c0b8 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,8 +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.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes; @@ -261,13 +261,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { int stackItemDamage = aStack.getItemDamage(); if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString() .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftCore.modID, + GalacticraftCore.ID, "item.schematic", 1L, 0)) @@ -278,7 +278,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftCore.modID, + GalacticraftCore.ID, "item.schematic", 1L, 1)) @@ -288,13 +288,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { } else { if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString() .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 0)) @@ -305,7 +305,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 1)) @@ -316,7 +316,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 2)) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index dbd24fb012..519bed3ede 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -3,6 +3,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; @@ -113,24 +116,24 @@ public class GT_MetaTileEntity_AssemblyLine extends 'g', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index c3321931dd..e921369b05 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -2,6 +2,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofFrame; @@ -145,24 +148,24 @@ public class GT_MetaTileEntity_IntegratedOreFactory 'g', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index 21432394b4..8e6508b465 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -3,6 +3,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; @@ -218,24 +221,24 @@ public class GT_MetaTileEntity_PCBFactory extends 'A', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) 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 2644f9f49e..b674560fa5 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.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.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; @@ -50,7 +50,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends private static IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> createStructureDefinition() { IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded() - ? ofBlockUnlocalizedName(NewHorizonsCoreMod.modID, "gt.blockcasingsNH", 2) + ? ofBlockUnlocalizedName(NewHorizonsCoreMod.ID, "gt.blockcasingsNH", 2) : ofBlock(GregTech_API.sBlockCasings1, 0); return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder() diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java index 5997520884..c2209cbe27 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java @@ -1,5 +1,6 @@ package gregtech.common.tileentities.machines.multiblock.logic; +import static gregtech.api.enums.Mods.Railcraft; import static net.minecraftforge.oredict.OreDictionary.getOreID; import static net.minecraftforge.oredict.OreDictionary.getOreIDs; @@ -46,7 +47,7 @@ public class CokeOvenProcessingLogic extends ProcessingLogic { return GT_OreDictUnificator.get("fuelCoke", null, 1); } else if (oreId == COAL_BLOCK_ORE_ID) { timeMultiplier = 9; - return GT_ModHandler.getModItem("Railcraft", "cube", 1, 0); + return GT_ModHandler.getModItem(Railcraft.ID, "cube", 1, 0); } else if (oreId == WOOD_ORE_ID) { return new ItemStack(Items.coal, 1, 1); } else if (oreId == SUGARCANE_ORE_ID) { |