From 9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca Mon Sep 17 00:00:00 2001 From: boubou19 Date: Tue, 4 Apr 2023 13:57:15 +0200 Subject: Modid work (#1833) * add all mods founds in NHCore * depracte old strings * add ars magica 2 * more enum work * use a switch * spotless * more mod id rework * more mod id rework * more mod id rework * should be last * spotless * rename to make more sense * add path attribute * add getResourcePath to enum * spotless --- .../machines/multi/GT_MetaTileEntity_AssemblyLine.java | 11 +++++++---- .../multi/GT_MetaTileEntity_IntegratedOreFactory.java | 11 +++++++---- .../machines/multi/GT_MetaTileEntity_PCBFactory.java | 11 +++++++---- .../machines/multi/GT_MetaTileEntity_PyrolyseOven.java | 4 ++-- 4 files changed, 23 insertions(+), 14 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/multi') 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 createStructureDefinition() { IStructureElement tCasingElement = NewHorizonsCoreMod.isModLoaded() - ? ofBlockUnlocalizedName(NewHorizonsCoreMod.modID, "gt.blockcasingsNH", 2) + ? ofBlockUnlocalizedName(NewHorizonsCoreMod.ID, "gt.blockcasingsNH", 2) : ofBlock(GregTech_API.sBlockCasings1, 0); return StructureDefinition.builder() -- cgit