aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-04 13:57:15 +0200
committerGitHub <noreply@github.com>2023-04-04 13:57:15 +0200
commit9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca (patch)
tree72a719f446d59538cc51768cf780ba142d3512f2 /src/main/java/gregtech/common/tileentities/machines/basic
parent769168bf3db04d09bcb8566e72b0dddb64157e7d (diff)
downloadGT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.tar.gz
GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.tar.bz2
GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.zip
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
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java19
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java18
3 files changed, 21 insertions, 19 deletions
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))
generated by cgit (git 2.46.0) at 2025-08-11 10:44:14 +0000