diff options
author | boubou19 <miisterunknown@gmail.com> | 2023-04-04 13:57:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-04 13:57:15 +0200 |
commit | 9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca (patch) | |
tree | 72a719f446d59538cc51768cf780ba142d3512f2 /src/main/java/gregtech/api/metatileentity | |
parent | 769168bf3db04d09bcb8566e72b0dddb64157e7d (diff) | |
download | GT5-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/api/metatileentity')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index 2a1ec3c22c..ee610d2631 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -1,7 +1,7 @@ package gregtech.api.metatileentity.implementations; import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES; -import static gregtech.api.enums.ModIDs.GalacticraftCore; +import static gregtech.api.enums.Mods.GalacticraftCore; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index b428d187d7..c8718d0e52 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -540,13 +540,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { return false; } - @Optional.Method(modid = "TConstruct") + @Optional.Method(modid = Mods.Names.TINKER_CONSTRUCT) private boolean isTConstructFaucet(TileEntity tTileEntity) { // Tinker Construct Faucets return a null tank info, so check the class return tTileEntity instanceof tconstruct.smeltery.logic.FaucetLogic; } - @Optional.Method(modid = "Translocator") + @Optional.Method(modid = Mods.Names.TRANSLOCATOR) private boolean isTranslocator(TileEntity tTileEntity) { // Translocators return a TankInfo, but it's of 0 length - so check the class if we see this pattern return tTileEntity instanceof codechicken.translocator.TileLiquidTranslocator; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index bc756fa6a5..70afd35f57 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -4,7 +4,8 @@ import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.ticksBetweenSounds; -import static gregtech.api.enums.ModIDs.BartWorks; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import java.util.Locale; @@ -643,7 +644,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTextureName(String name, UITexture fallback) { return setProgressBarTexture( - new FallbackableUITexture(UITexture.fullImage("gregtech", "gui/progressbar/" + name), fallback)); + new FallbackableUITexture(UITexture.fullImage(GregTech.ID, "gui/progressbar/" + name), fallback)); } public GT_MetaTileEntity_BasicMachine_GT_Recipe setProgressBarTextureName(String name) { |