aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
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/api/enums
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/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java105
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java4
-rw-r--r--src/main/java/gregtech/api/enums/ModIDs.java84
-rw-r--r--src/main/java/gregtech/api/enums/Mods.java291
-rw-r--r--src/main/java/gregtech/api/enums/SoundResource.java60
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java15
6 files changed, 416 insertions, 143 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 1a9422f374..e1f4efaca2 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -1,6 +1,7 @@
package gregtech.api.enums;
-import static gregtech.api.enums.ModIDs.IndustrialCraft2;
+import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.IndustrialCraft2;
import java.math.BigInteger;
import java.util.*;
@@ -190,27 +191,93 @@ public class GT_Values {
/**
* MOD ID Strings, since they are very common Parameters.
*/
- public static final String MOD_ID = "gregtech", MOD_ID_IC2 = "IC2", MOD_ID_NC = "IC2NuclearControl",
- MOD_ID_TC = "Thaumcraft", MOD_ID_TF = "TwilightForest", MOD_ID_RC = "Railcraft",
- MOD_ID_TE = "ThermalExpansion", MOD_ID_AE = "appliedenergistics2", MOD_ID_TFC = "terrafirmacraft",
- MOD_ID_PFAA = "PFAAGeologica", MOD_ID_FR = "Forestry", MOD_ID_HaC = "harvestcraft",
- MOD_ID_APC = "AppleCore", MOD_ID_MaCr = "magicalcrops", MOD_ID_GaEn = "ganysend",
- MOD_ID_GaSu = "ganyssurface", MOD_ID_GaNe = "ganysnether", MOD_ID_BC_SILICON = "BuildCraft|Silicon",
- MOD_ID_BC_TRANSPORT = "BuildCraft|Transport", MOD_ID_BC_FACTORY = "BuildCraft|Factory",
- MOD_ID_BC_ENERGY = "BuildCraft|Energy", MOD_ID_BC_BUILDERS = "BuildCraft|Builders",
- MOD_ID_BC_CORE = "BuildCraft|Core", MOD_ID_GC_CORE = "GalacticraftCore",
- MOD_ID_GC_MARS = "GalacticraftMars", MOD_ID_GC_PLANETS = "GalacticraftPlanets", MOD_ID_DC = "dreamcraft",
- MOD_ID_GTPP = "miscutils";
+ @Deprecated
+ public static final String MOD_ID = "gregtech";
+ @Deprecated
+ public static final String MOD_ID_IC2 = "IC2";
+ @Deprecated
+ public static final String MOD_ID_NC = "IC2NuclearControl";
+ @Deprecated
+ public static final String MOD_ID_TC = "Thaumcraft";
+ @Deprecated
+ public static final String MOD_ID_TF = "TwilightForest";
+ @Deprecated
+ public static final String MOD_ID_RC = "Railcraft";
+ @Deprecated
+ public static final String MOD_ID_TE = "ThermalExpansion";
+ @Deprecated
+ public static final String MOD_ID_AE = "appliedenergistics2";
+ @Deprecated
+ public static final String MOD_ID_TFC = "terrafirmacraft";
+ @Deprecated
+ public static final String MOD_ID_PFAA = "PFAAGeologica";
+ @Deprecated
+ public static final String MOD_ID_FR = "Forestry";
+ @Deprecated
+ public static final String MOD_ID_HaC = "harvestcraft";
+ @Deprecated
+ public static final String MOD_ID_APC = "AppleCore";
+ @Deprecated
+ public static final String MOD_ID_MaCr = "magicalcrops";
+ @Deprecated
+ public static final String MOD_ID_GaEn = "ganysend";
+ @Deprecated
+ public static final String MOD_ID_GaSu = "ganyssurface";
+ @Deprecated
+ public static final String MOD_ID_GaNe = "ganysnether";
+ @Deprecated
+ public static final String MOD_ID_BC_SILICON = "BuildCraft|Silicon";
+ @Deprecated
+ public static final String MOD_ID_BC_TRANSPORT = "BuildCraft|Transport";
+ @Deprecated
+ public static final String MOD_ID_BC_FACTORY = "BuildCraft|Factory";
+ @Deprecated
+ public static final String MOD_ID_BC_ENERGY = "BuildCraft|Energy";
+ @Deprecated
+ public static final String MOD_ID_BC_BUILDERS = "BuildCraft|Builders";
+ @Deprecated
+ public static final String MOD_ID_BC_CORE = "BuildCraft|Core";
+ @Deprecated
+ public static final String MOD_ID_GC_CORE = "GalacticraftCore";
+ @Deprecated
+ public static final String MOD_ID_GC_MARS = "GalacticraftMars";
+ @Deprecated
+ public static final String MOD_ID_GC_PLANETS = "GalacticraftPlanets";
+ @Deprecated
+ public static final String MOD_ID_DC = "dreamcraft";
+ @Deprecated
+ public static final String MOD_ID_GTPP = "miscutils";
/**
* File Paths and Resource Paths
*/
- public static final String TEX_DIR = "textures/", TEX_DIR_GUI = TEX_DIR + "gui/", TEX_DIR_ITEM = TEX_DIR + "items/",
- TEX_DIR_BLOCK = TEX_DIR + "blocks/", TEX_DIR_ENTITY = TEX_DIR + "entity/",
- TEX_DIR_ASPECTS = TEX_DIR + "aspects/", RES_PATH = MOD_ID + ":" + TEX_DIR,
- RES_PATH_GUI = MOD_ID + ":" + TEX_DIR_GUI, RES_PATH_ITEM = MOD_ID + ":", RES_PATH_BLOCK = MOD_ID + ":",
- RES_PATH_ENTITY = MOD_ID + ":" + TEX_DIR_ENTITY, RES_PATH_ASPECTS = MOD_ID + ":" + TEX_DIR_ASPECTS,
- RES_PATH_IC2 = IndustrialCraft2.modID.toLowerCase(Locale.ENGLISH) + ":",
- RES_PATH_MODEL = MOD_ID + ":" + TEX_DIR + "models/";
+ @Deprecated
+ public static final String TEX_DIR = "textures/";
+ @Deprecated
+ public static final String TEX_DIR_GUI = TEX_DIR + "gui/";
+ @Deprecated
+ public static final String TEX_DIR_ITEM = TEX_DIR + "items/";
+ @Deprecated
+ public static final String TEX_DIR_BLOCK = TEX_DIR + "blocks/";
+ @Deprecated
+ public static final String TEX_DIR_ENTITY = TEX_DIR + "entity/";
+ @Deprecated
+ public static final String TEX_DIR_ASPECTS = TEX_DIR + "aspects/";
+ @Deprecated
+ public static final String RES_PATH = GregTech.getResourcePath(TEX_DIR);
+ @Deprecated
+ public static final String RES_PATH_GUI = GregTech.getResourcePath("textures", "gui/");
+ @Deprecated
+ public static final String RES_PATH_ITEM = GregTech.getResourcePath();
+ @Deprecated
+ public static final String RES_PATH_BLOCK = GregTech.getResourcePath();
+ @Deprecated
+ public static final String RES_PATH_ENTITY = GregTech.getResourcePath("textures", "entity/");
+ @Deprecated
+ public static final String RES_PATH_ASPECTS = GregTech.getResourcePath("textures", "aspects/");
+ @Deprecated
+ public static final String RES_PATH_MODEL = GregTech.getResourcePath("textures", "models/");
+ @Deprecated
+ public static final String RES_PATH_IC2 = IndustrialCraft2.getResourcePath();
/**
* NBT String Keys
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index c64b7a6d14..a96876bc7f 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -2,8 +2,8 @@ package gregtech.api.enums;
import static gregtech.api.enums.FluidState.GAS;
import static gregtech.api.enums.GT_Values.M;
-import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
-import static gregtech.api.enums.ModIDs.Thaumcraft;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+import static gregtech.api.enums.Mods.Thaumcraft;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/src/main/java/gregtech/api/enums/ModIDs.java b/src/main/java/gregtech/api/enums/ModIDs.java
deleted file mode 100644
index 16c03e3ae5..0000000000
--- a/src/main/java/gregtech/api/enums/ModIDs.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package gregtech.api.enums;
-
-import cpw.mods.fml.common.Loader;
-
-public enum ModIDs {
-
- AdvancedSolarPanel("AdvancedSolarPanel"),
- AE2FluidCraft("ae2fc"),
- AppleCore("AppleCore"),
- AppliedEnergistics2("appliedenergistics2"),
- Avaritia("Avaritia"),
- AvaritiaAddons("avaritiaddons"),
- BartWorks("bartworks"),
- BetterLoadingScreen("betterloadingscreen"),
- BiomesOPlanty("BiomesOPlenty"),
- BuildCraftFactory("BuildCraft|Factory"),
- BuildCraftSilicon("BuildCraft|Silicon"),
- BuildCraftTransport("BuildCraft|Transport"),
- Computronics("computronics"),
- CraftTweaker("MineTweaker3"),
- EnderIO("EnderIO"),
- EnderStorage("EnderStorage"),
- EternalSingularity("eternalsingularity"),
- ExtraCells2("extracells"),
- ExtraUtilities("ExtraUtilities"),
- ForbiddenMagic("ForbiddenMagic"),
- Forestry("Forestry"),
- GalacticraftCore("GalacticraftCore"),
- GalacticraftMars("GalacticraftMars"),
- GalaxySpace("GalaxySpace"),
- Gendustry("gendustry"),
- GoodGenerator("GoodGenerator"),
- GregTech("gregtech"),
- GraviSuite("GraviSuite"),
- GTNHLanthanides("gtnhlanth"),
- GTPlusPlus("miscutils"),
- PamsHarvestCraft("harvestcraft"),
- HardcoreEnderExpansion("HardcoreEnderExpansion"),
- HodgePodge("hodgepodge"),
- IC2CropPlugin("Ic2Nei"),
- IC2NuclearControl("IC2NuclearControl"),
- IguanaTweaksTinkerConstruct("IguanaTweaksTConstruct"),
- IndustrialCraft2("IC2"),
- IronChests("IronChest"),
- IronTanks("irontank"),
- Minecraft("minecraft"),
- Natura("Natura"),
- NEICustomDiagrams("neicustomdiagram"),
- NewHorizonsCoreMod("dreamcraft"),
- NotEnoughItems("NotEnoughItems"),
- OpenComputers("OpenComputers"),
- ProjectRedCore("ProjRed|Core"),
- Railcraft("Railcraft"),
- TaintedMagic("TaintedMagic"),
- Thaumcraft("Thaumcraft"),
- ThaumicBases("thaumicbases"),
- ThaumicTinkerer("ThaumicTinkerer"),
- TinkerConstruct("TConstruct"),
- TinkersGregworks("TGregworks"),
- Translocator("Translocator"),
- TwilightForest("TwilightForest"),
- Waila("Waila"),
- // Do we keep compat of those?
- IndustrialCraft2Classic("IC2-Classic-Spmod"),
- Metallurgy("Metallurgy"),
- RotaryCraft("RotaryCraft"),
- ThermalExpansion("ThermalExpansion"),
- ThermalFondation("ThermalFoundation"),
- UndergroundBiomes("UndergroundBiomes");
-
- public final String modID;
- private Boolean modLoaded;
-
- ModIDs(String modID) {
- this.modID = modID;
- }
-
- public boolean isModLoaded() {
- if (this.modLoaded == null) {
- this.modLoaded = Loader.isModLoaded(modID);
- }
- return this.modLoaded;
- }
-}
diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java
new file mode 100644
index 0000000000..723fb1bda8
--- /dev/null
+++ b/src/main/java/gregtech/api/enums/Mods.java
@@ -0,0 +1,291 @@
+package gregtech.api.enums;
+
+import java.util.Locale;
+
+import net.minecraft.util.ResourceLocation;
+
+import cpw.mods.fml.common.Loader;
+
+public enum Mods {
+
+ AdvancedSolarPanel(Names.ADVANCED_SOLAR_PANEL),
+ AdventureBackpack(Names.ADVENTURE_BACKPACK),
+ AE2FluidCraft(Names.A_E2_FLUID_CRAFT),
+ AFSU(Names.A_F_S_U),
+ AppleCore(Names.APPLE_CORE),
+ AppliedEnergistics2(Names.APPLIED_ENERGISTICS2),
+ ArchitectureCraft(Names.ARCHITECTURE_CRAFT),
+ Aroma1997Core(Names.AROMA1997_CORE),
+ Avaritia(Names.AVARITIA),
+ AvaritiaAddons(Names.AVARITIA_ADDONS),
+ Backpack(Names.BACKPACK),
+ BartWorks(Names.BART_WORKS),
+ Baubles(Names.BAUBLES),
+ BetterLoadingScreen(Names.BETTER_LOADING_SCREEN),
+ BetterQuesting(Names.BETTER_QUESTING),
+ BiblioCraft(Names.BIBLIO_CRAFT),
+ BiblioWoodsBoPEdition(Names.BIBLIO_WOODS_BO_P_EDITION),
+ BiblioWoodsForestryEdition(Names.BIBLIO_WOODS_FORESTRY_EDITION),
+ BiblioWoodsNaturaEdition(Names.BIBLIO_WOODS_NATURA_EDITION),
+ BiomesOPlenty(Names.BIOMES_O_PLENTY),
+ BloodArsenal(Names.BLOOD_ARSENAL),
+ BloodMagic(Names.BLOOD_MAGIC),
+ Botania(Names.BOTANIA),
+ Botany(Names.BOTANY),
+ BuildCraftCore(Names.BUILD_CRAFT_CORE),
+ BuildCraftFactory(Names.BUILD_CRAFT_FACTORY),
+ BuildCraftSilicon(Names.BUILD_CRAFT_SILICON),
+ BuildCraftTransport(Names.BUILD_CRAFT_TRANSPORT),
+ Chisel(Names.CHISEL),
+ Computronics(Names.COMPUTRONICS),
+ CraftTweaker(Names.CRAFT_TWEAKER),
+ CropsPlusPlus(Names.CROPS_PLUS_PLUS),
+ DraconicEvolution(Names.DRACONIC_EVOLUTION),
+ ElectroMagicTools(Names.ELECTRO_MAGIC_TOOLS),
+ EnderIO(Names.ENDER_I_O),
+ EnderStorage(Names.ENDER_STORAGE),
+ EnderZoo(Names.ENDER_ZOO),
+ EternalSingularity(Names.ETERNAL_SINGULARITY),
+ ExtraBees(Names.EXTRA_BEES),
+ ExtraCells2(Names.EXTRA_CELLS2),
+ ExtraTrees(Names.EXTRA_TREES),
+ ExtraUtilities(Names.EXTRA_UTILITIES),
+ FloodLights(Names.FLOOD_LIGHTS),
+ ForbiddenMagic(Names.FORBIDDEN_MAGIC),
+ Forestry(Names.FORESTRY),
+ ForgeMicroblocks(Names.FORGE_MICROBLOCKS),
+ ForgeRelocation(Names.FORGE_RELOCATION),
+ Gadomancy(Names.GADOMANCY),
+ GalacticraftCore(Names.GALACTICRAFT_CORE),
+ GalacticraftMars(Names.GALACTICRAFT_MARS),
+ GalactiGreg(Names.GALACTI_GREG),
+ GalaxySpace(Names.GALAXY_SPACE),
+ Gendustry(Names.GENDUSTRY),
+ Genetics(Names.GENETICS),
+ GoodGenerator(Names.GOOD_GENERATOR),
+ GraviSuite(Names.GRAVI_SUITE),
+ GregTech(Names.GREG_TECH),
+ GTNHLanthanides(Names.G_T_N_H_LANTHANIDES),
+ GTPlusPlus(Names.G_T_PLUS_PLUS),
+ HardcoreEnderExpansion(Names.HARDCORE_ENDER_EXPANSION),
+ HodgePodge(Names.HODGE_PODGE),
+ HoloInventory(Names.HOLO_INVENTORY),
+ IC2CropPlugin(Names.I_C2_CROP_PLUGIN),
+ IC2NuclearControl(Names.I_C2_NUCLEAR_CONTROL),
+ IguanaTweaksTinkerConstruct(Names.IGUANA_TWEAKS_TINKER_CONSTRUCT),
+ IndustrialCraft2(Names.INDUSTRIAL_CRAFT2),
+ IronChests(Names.IRON_CHESTS),
+ IronTanks(Names.IRON_TANKS),
+ JABBA(Names.J_A_B_B_A),
+ MagicBees(Names.MAGIC_BEES),
+ MalisisDoors(Names.MALISIS_DOORS),
+ Mantle(Names.MANTLE),
+ MineAndBladeBattleGear2(Names.MINE_AND_BLADE_BATTLE_GEAR2),
+ Minecraft(Names.MINECRAFT),
+ Natura(Names.NATURA),
+ NaturesCompass(Names.NATURES_COMPASS),
+ NEICustomDiagrams(Names.N_E_I_CUSTOM_DIAGRAMS),
+ NEIOrePlugin(Names.N_E_I_ORE_PLUGIN),
+ NewHorizonsCoreMod(Names.NEW_HORIZONS_CORE_MOD),
+ NotEnoughItems(Names.NOT_ENOUGH_ITEMS),
+ OpenBlocks(Names.OPEN_BLOCKS),
+ OpenComputers(Names.OPEN_COMPUTERS),
+ OpenGlasses(Names.OPEN_GLASSES),
+ OpenModularTurrets(Names.OPEN_MODULAR_TURRETS),
+ OpenPrinters(Names.OPEN_PRINTERS),
+ OpenSecurity(Names.OPEN_SECURITY),
+ PamsHarvestCraft(Names.PAMS_HARVEST_CRAFT),
+ PamsHarvestTheNether(Names.PAMS_HARVEST_THE_NETHER),
+ ProjectRedCore(Names.PROJECT_RED_CORE),
+ ProjectRedIllumination(Names.PROJECT_RED_ILLUMINATION),
+ Railcraft(Names.RAILCRAFT),
+ RandomThings(Names.RANDOM_THINGS),
+ SGCraft(Names.S_G_CRAFT),
+ SleepingBags(Names.SLEEPING_BAGS),
+ SpiceOfLife(Names.SPICE_OF_LIFE),
+ StevesCarts2(Names.STEVES_CARTS2),
+ SuperSolarPanels(Names.SUPER_SOLAR_PANELS),
+ TaintedMagic(Names.TAINTED_MAGIC),
+ Thaumcraft(Names.THAUMCRAFT),
+ ThaumicBases(Names.THAUMIC_BASES),
+ ThaumicEnergistics(Names.THAUMIC_ENERGISTICS),
+ ThaumicHorizons(Names.THAUMIC_HORIZONS),
+ ThaumicMachina(Names.THAUMIC_MACHINA),
+ ThaumicTinkerer(Names.THAUMIC_TINKERER),
+ TinkerConstruct(Names.TINKER_CONSTRUCT),
+ TinkersGregworks(Names.TINKERS_GREGWORKS),
+ Translocator(Names.TRANSLOCATOR),
+ TravellersGear(Names.TRAVELLERS_GEAR),
+ TwilightForest(Names.TWILIGHT_FOREST),
+ Waila(Names.WAILA),
+ WarpTheory(Names.WARP_THEORY),
+ Witchery(Names.WITCHERY),
+ WitchingGadgets(Names.WITCHING_GADGETS),
+ ZTones(Names.Z_TONES),
+
+ // Do we keep compat of those?
+ ArsMagica2(Names.ARS_MAGICA2),
+ GanysSurface(Names.GANYS_SURFACE),
+ IndustrialCraft2Classic(Names.INDUSTRIAL_CRAFT2_CLASSIC),
+ MagicalCrops(Names.MAGICAL_CROPS),
+ Metallurgy(Names.METALLURGY),
+ RotaryCraft(Names.ROTARY_CRAFT),
+ ThermalExpansion(Names.THERMAL_EXPANSION),
+ ThermalFondation(Names.THERMAL_FONDATION),
+ UndergroundBiomes(Names.UNDERGROUND_BIOMES);
+
+ public static class Names {
+
+ public static final String ADVANCED_SOLAR_PANEL = "AdvancedSolarPanel";
+ public static final String ADVENTURE_BACKPACK = "adventurebackpack";
+ public static final String A_E2_FLUID_CRAFT = "ae2fc";
+ public static final String A_F_S_U = "AFSU";
+ public static final String APPLE_CORE = "AppleCore";
+ public static final String APPLIED_ENERGISTICS2 = "appliedenergistics2";
+ public static final String ARCHITECTURE_CRAFT = "ArchitectureCraft";
+ public static final String AROMA1997_CORE = "Aroma1997Core";
+ public static final String AVARITIA = "Avaritia";
+ public static final String AVARITIA_ADDONS = "avaritiaddons";
+ public static final String BACKPACK = "Backpack";
+ public static final String BART_WORKS = "bartworks";
+ public static final String BAUBLES = "Baubles";
+ public static final String BETTER_LOADING_SCREEN = "betterloadingscreen";
+ public static final String BETTER_QUESTING = "betterquesting";
+ public static final String BIBLIO_CRAFT = "BiblioCraft";
+ public static final String BIBLIO_WOODS_BO_P_EDITION = "BiblioWoodsBoP";
+ public static final String BIBLIO_WOODS_FORESTRY_EDITION = "BiblioWoodsForestry";
+ public static final String BIBLIO_WOODS_NATURA_EDITION = "BiblioWoodsNatura";
+ public static final String BIOMES_O_PLENTY = "BiomesOPlenty";
+ public static final String BLOOD_ARSENAL = "BloodArsenal";
+ public static final String BLOOD_MAGIC = "AWWayofTime";
+ public static final String BOTANIA = "Botania";
+ public static final String BOTANY = "Botany";
+ public static final String BUILD_CRAFT_CORE = "BuildCraft|Core";
+ public static final String BUILD_CRAFT_FACTORY = "BuildCraft|Factory";
+ public static final String BUILD_CRAFT_SILICON = "BuildCraft|Silicon";
+ public static final String BUILD_CRAFT_TRANSPORT = "BuildCraft|Transport";
+ public static final String CHISEL = "chisel";
+ public static final String COMPUTRONICS = "computronics";
+ public static final String CRAFT_TWEAKER = "MineTweaker3";
+ public static final String CROPS_PLUS_PLUS = "berriespp";
+ public static final String DRACONIC_EVOLUTION = "DraconicEvolution";
+ public static final String ELECTRO_MAGIC_TOOLS = "EMT";
+ public static final String ENDER_I_O = "EnderIO";
+ public static final String ENDER_STORAGE = "EnderStorage";
+ public static final String ENDER_ZOO = "EnderZoo";
+ public static final String ETERNAL_SINGULARITY = "eternalsingularity";
+ public static final String EXTRA_BEES = "ExtraBees";
+ public static final String EXTRA_CELLS2 = "extracells";
+ public static final String EXTRA_TREES = "ExtraTrees";
+ public static final String EXTRA_UTILITIES = "ExtraUtilities";
+ public static final String FLOOD_LIGHTS = "FloodLights";
+ public static final String FORBIDDEN_MAGIC = "ForbiddenMagic";
+ public static final String FORESTRY = "Forestry";
+ public static final String FORGE_MICROBLOCKS = "ForgeMicroblock";
+ public static final String FORGE_RELOCATION = "ForgeRelocation";
+ public static final String GADOMANCY = "gadomancy";
+ public static final String GALACTICRAFT_CORE = "GalacticraftCore";
+ public static final String GALACTICRAFT_MARS = "GalacticraftMars";
+ public static final String GALACTI_GREG = "galacticgreg";
+ public static final String GALAXY_SPACE = "GalaxySpace";
+ public static final String GENDUSTRY = "gendustry";
+ public static final String GENETICS = "Genetics";
+ public static final String GOOD_GENERATOR = "GoodGenerator";
+ public static final String GRAVI_SUITE = "GraviSuite";
+ public static final String GREG_TECH = "gregtech";
+ public static final String G_T_N_H_LANTHANIDES = "gtnhlanth";
+ public static final String G_T_PLUS_PLUS = "miscutils";
+ public static final String HARDCORE_ENDER_EXPANSION = "HardcoreEnderExpansion";
+ public static final String HODGE_PODGE = "hodgepodge";
+ public static final String HOLO_INVENTORY = "holoinventory";
+ public static final String I_C2_CROP_PLUGIN = "Ic2Nei";
+ public static final String I_C2_NUCLEAR_CONTROL = "IC2NuclearControl";
+ public static final String IGUANA_TWEAKS_TINKER_CONSTRUCT = "IguanaTweaksTConstruct";
+ public static final String INDUSTRIAL_CRAFT2 = "IC2";
+ public static final String IRON_CHESTS = "IronChest";
+ public static final String IRON_TANKS = "irontank";
+ public static final String J_A_B_B_A = "JABBA";
+ public static final String MAGIC_BEES = "MagicBees";
+ public static final String MALISIS_DOORS = "malisisdoors";
+ public static final String MANTLE = "Mantle";
+ public static final String MINE_AND_BLADE_BATTLE_GEAR2 = "battlegear2";
+ public static final String MINECRAFT = "minecraft";
+ public static final String NATURA = "Natura";
+ public static final String NATURES_COMPASS = "naturescompass";
+ public static final String N_E_I_CUSTOM_DIAGRAMS = "neicustomdiagram";
+ public static final String N_E_I_ORE_PLUGIN = "gtneioreplugin";
+ public static final String NEW_HORIZONS_CORE_MOD = "dreamcraft";
+ public static final String NOT_ENOUGH_ITEMS = "NotEnoughItems";
+ public static final String OPEN_BLOCKS = "OpenBlocks";
+ public static final String OPEN_COMPUTERS = "OpenComputers";
+ public static final String OPEN_GLASSES = "openglasses";
+ public static final String OPEN_MODULAR_TURRETS = "openmodularturrets";
+ public static final String OPEN_PRINTERS = "openprinter";
+ public static final String OPEN_SECURITY = "opensecurity";
+ public static final String PAMS_HARVEST_CRAFT = "harvestcraft";
+ public static final String PAMS_HARVEST_THE_NETHER = "harvestthenether";
+ public static final String PROJECT_RED_CORE = "ProjRed|Core";
+ public static final String PROJECT_RED_ILLUMINATION = "ProjRed|Illumination";
+ public static final String RAILCRAFT = "Railcraft";
+ public static final String RANDOM_THINGS = "RandomThings";
+ public static final String S_G_CRAFT = "SGCraft";
+ public static final String SLEEPING_BAGS = "sleepingbag";
+ public static final String SPICE_OF_LIFE = "SpiceOfLife";
+ public static final String STEVES_CARTS2 = "StevesCarts";
+ public static final String SUPER_SOLAR_PANELS = "supersolarpanel";
+ public static final String TAINTED_MAGIC = "TaintedMagic";
+ public static final String THAUMCRAFT = "Thaumcraft";
+ public static final String THAUMIC_BASES = "thaumicbases";
+ public static final String THAUMIC_ENERGISTICS = "thaumicenergistics";
+ public static final String THAUMIC_HORIZONS = "ThaumicHorizons";
+ public static final String THAUMIC_MACHINA = "ThaumicMachina";
+ public static final String THAUMIC_TINKERER = "ThaumicTinkerer";
+ public static final String TINKER_CONSTRUCT = "TConstruct";
+ public static final String TINKERS_GREGWORKS = "TGregworks";
+ public static final String TRANSLOCATOR = "Translocator";
+ public static final String TRAVELLERS_GEAR = "TravellersGear";
+ public static final String TWILIGHT_FOREST = "TwilightForest";
+ public static final String WAILA = "Waila";
+ public static final String WARP_THEORY = "WarpTheory";
+ public static final String WITCHERY = "witchery";
+ public static final String WITCHING_GADGETS = "WitchingGadgets";
+ public static final String Z_TONES = "Ztones";
+
+ // Do we keep compat of those mods?
+ public static final String ARS_MAGICA2 = "arsmagica2";
+ public static final String GANYS_SURFACE = "ganyssurface";
+ public static final String INDUSTRIAL_CRAFT2_CLASSIC = "IC2-Classic-Spmod";
+ public static final String MAGICAL_CROPS = "magicalcrops";
+ public static final String METALLURGY = "Metallurgy";
+ public static final String ROTARY_CRAFT = "RotaryCraft";
+ public static final String THERMAL_EXPANSION = "ThermalExpansion";
+ public static final String THERMAL_FONDATION = "ThermalFoundation";
+ public static final String UNDERGROUND_BIOMES = "UndergroundBiomes";
+
+ }
+
+ public final String ID;
+ public final String resourceDomain;
+ private Boolean modLoaded;
+
+ Mods(String ID) {
+ this.ID = ID;
+ this.resourceDomain = ID.toLowerCase(Locale.ENGLISH);
+ }
+
+ public boolean isModLoaded() {
+ if (this.modLoaded == null) {
+ this.modLoaded = Loader.isModLoaded(ID);
+ }
+ return this.modLoaded;
+ }
+
+ public String getResourcePath(String... path) {
+ return this.getResourceLocation(path)
+ .toString();
+ }
+
+ public ResourceLocation getResourceLocation(String... path) {
+ return new ResourceLocation(this.resourceDomain, String.join("/", path));
+ }
+}
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java
index a0c039e48e..5d24abaea0 100644
--- a/src/main/java/gregtech/api/enums/SoundResource.java
+++ b/src/main/java/gregtech/api/enums/SoundResource.java
@@ -1,7 +1,7 @@
package gregtech.api.enums;
-import static gregtech.api.enums.GT_Values.MOD_ID;
-import static gregtech.api.enums.ModIDs.IndustrialCraft2;
+import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.IndustrialCraft2;
import java.util.EnumSet;
import java.util.Locale;
@@ -30,38 +30,38 @@ public enum SoundResource {
RANDOM_EXPLODE(5, "random.explode"),
FIRE_IGNITE(6, "fire.ignite"),
- IC2_TOOLS_WRENCH(100, IndustrialCraft2.modID, "tools.Wrench"),
- IC2_TOOLS_RUBBER_TRAMPOLINE(101, IndustrialCraft2.modID, "tools.RubberTrampoline"),
- IC2_TOOLS_PAINTER(102, IndustrialCraft2.modID, "tools.Painter"),
- IC2_TOOLS_BATTERY_USE(103, IndustrialCraft2.modID, "tools.BatteryUse"),
- IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE(104, IndustrialCraft2.modID, "tools.chainsaw.ChainsawUseOne"),
- IC2_TOOLS_CHAINSAW_CHAINSAW_USE_TWO(105, IndustrialCraft2.modID, "tools.chainsaw.ChainsawUseTwo"),
- IC2_TOOLS_DRILL_DRILL_SOFT(106, IndustrialCraft2.modID, "tools.drill.DrillSoft"),
- IC2_TOOLS_DRILL_DRILL_HARD(107, IndustrialCraft2.modID, "tools.drill.DrillHard"),
- IC2_TOOLS_OD_SCANNER(108, IndustrialCraft2.modID, "tools.ODScanner"),
- IC2_TOOLS_INSULATION_CUTTERS(109, IndustrialCraft2.modID, "tools.InsulationCutters"),
+ IC2_TOOLS_WRENCH(100, IndustrialCraft2.ID, "tools.Wrench"),
+ IC2_TOOLS_RUBBER_TRAMPOLINE(101, IndustrialCraft2.ID, "tools.RubberTrampoline"),
+ IC2_TOOLS_PAINTER(102, IndustrialCraft2.ID, "tools.Painter"),
+ IC2_TOOLS_BATTERY_USE(103, IndustrialCraft2.ID, "tools.BatteryUse"),
+ IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE(104, IndustrialCraft2.ID, "tools.chainsaw.ChainsawUseOne"),
+ IC2_TOOLS_CHAINSAW_CHAINSAW_USE_TWO(105, IndustrialCraft2.ID, "tools.chainsaw.ChainsawUseTwo"),
+ IC2_TOOLS_DRILL_DRILL_SOFT(106, IndustrialCraft2.ID, "tools.drill.DrillSoft"),
+ IC2_TOOLS_DRILL_DRILL_HARD(107, IndustrialCraft2.ID, "tools.drill.DrillHard"),
+ IC2_TOOLS_OD_SCANNER(108, IndustrialCraft2.ID, "tools.ODScanner"),
+ IC2_TOOLS_INSULATION_CUTTERS(109, IndustrialCraft2.ID, "tools.InsulationCutters"),
- IC2_MACHINES_EXTRACTOR_OP(200, IndustrialCraft2.modID, "machines.ExtractorOp"),
- IC2_MACHINES_MACERATOR_OP(201, IndustrialCraft2.modID, "machines.MaceratorOp"),
- IC2_MACHINES_INDUCTION_LOOP(202, IndustrialCraft2.modID, "machines.InductionLoop"),
- IC2_MACHINES_COMPRESSOR_OP(203, IndustrialCraft2.modID, "machines.CompressorOp"),
- IC2_MACHINES_RECYCLER_OP(204, IndustrialCraft2.modID, "machines.RecyclerOp"),
- IC2_MACHINES_MINER_OP(205, IndustrialCraft2.modID, "machines.MinerOp"),
- IC2_MACHINES_PUMP_OP(206, IndustrialCraft2.modID, "machines.PumpOp"),
- IC2_MACHINES_ELECTROFURNACE_LOOP(207, IndustrialCraft2.modID, "machines.ElectroFurnaceLoop"),
+ IC2_MACHINES_EXTRACTOR_OP(200, IndustrialCraft2.ID, "machines.ExtractorOp"),
+ IC2_MACHINES_MACERATOR_OP(201, IndustrialCraft2.ID, "machines.MaceratorOp"),
+ IC2_MACHINES_INDUCTION_LOOP(202, IndustrialCraft2.ID, "machines.InductionLoop"),
+ IC2_MACHINES_COMPRESSOR_OP(203, IndustrialCraft2.ID, "machines.CompressorOp"),
+ IC2_MACHINES_RECYCLER_OP(204, IndustrialCraft2.ID, "machines.RecyclerOp"),
+ IC2_MACHINES_MINER_OP(205, IndustrialCraft2.ID, "machines.MinerOp"),
+ IC2_MACHINES_PUMP_OP(206, IndustrialCraft2.ID, "machines.PumpOp"),
+ IC2_MACHINES_ELECTROFURNACE_LOOP(207, IndustrialCraft2.ID, "machines.ElectroFurnaceLoop"),
@Deprecated
- DEPRECATED_DUPE_OF_IC2_MACHINES_INDUCTION_LOOP(208, IndustrialCraft2.modID, "machines.InductionLoop"),
- IC2_MACHINES_MACHINE_OVERLOAD(209, IndustrialCraft2.modID, "machines.MachineOverload"),
- IC2_MACHINES_INTERRUPT_ONE(210, IndustrialCraft2.modID, "machines.InterruptOne"),
- IC2_MACHINES_KA_CHING(211, IndustrialCraft2.modID, "machines.KaChing"),
- IC2_MACHINES_MAGNETIZER_LOOP(212, IndustrialCraft2.modID, "machines.MagnetizerLoop"),
+ DEPRECATED_DUPE_OF_IC2_MACHINES_INDUCTION_LOOP(208, IndustrialCraft2.ID, "machines.InductionLoop"),
+ IC2_MACHINES_MACHINE_OVERLOAD(209, IndustrialCraft2.ID, "machines.MachineOverload"),
+ IC2_MACHINES_INTERRUPT_ONE(210, IndustrialCraft2.ID, "machines.InterruptOne"),
+ IC2_MACHINES_KA_CHING(211, IndustrialCraft2.ID, "machines.KaChing"),
+ IC2_MACHINES_MAGNETIZER_LOOP(212, IndustrialCraft2.ID, "machines.MagnetizerLoop"),
- GT_MACHINES_FUSION_LOOP(230, MOD_ID, "machines.FusionLoop"),
- GT_MACHINES_DISTILLERY_LOOP(231, MOD_ID, "machines.DistilleryLoop"),
- GT_MACHINES_PLASMAFORGE_LOOP(232, MOD_ID, "machines.PlasmaForgeLoop"),
+ GT_MACHINES_FUSION_LOOP(230, GregTech.ID, "machines.FusionLoop"),
+ GT_MACHINES_DISTILLERY_LOOP(231, GregTech.ID, "machines.DistilleryLoop"),
+ GT_MACHINES_PLASMAFORGE_LOOP(232, GregTech.ID, "machines.PlasmaForgeLoop"),
- GUI_BUTTON_DOWN(-1, MOD_ID, "gui.buttonDown"),
- GUI_BUTTON_UP(-1, MOD_ID, "gui.buttonUp"),
+ GUI_BUTTON_DOWN(-1, GregTech.ID, "gui.buttonDown"),
+ GUI_BUTTON_UP(-1, GregTech.ID, "gui.buttonUp"),
/*
* Other Minecraft Sounds that were missing
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index b2a3090a14..f554ee852c 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -1,7 +1,6 @@
package gregtech.api.enums;
-import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK;
-import static gregtech.api.enums.GT_Values.RES_PATH_ITEM;
+import static gregtech.api.enums.Mods.GregTech;
import java.util.HashMap;
import java.util.Map;
@@ -1727,7 +1726,7 @@ public class Textures {
@Override
public void run() {
- mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "iconsets/" + this);
+ mIcon = GregTech_API.sBlockIcons.registerIcon(GregTech.getResourcePath("iconsets", this.toString()));
}
public static class CustomIcon implements IIconContainer, Runnable {
@@ -1736,7 +1735,7 @@ public class Textures {
protected String mIconName;
public CustomIcon(String aIconName) {
- mIconName = !aIconName.contains(":") ? RES_PATH_BLOCK + aIconName : aIconName;
+ mIconName = !aIconName.contains(":") ? GregTech.getResourcePath(aIconName) : aIconName;
GregTech_API.sGTBlockIconload.add(this);
}
@@ -1851,8 +1850,8 @@ public class Textures {
@Override
public void run() {
- mIcon = GregTech_API.sItemIcons.registerIcon(RES_PATH_ITEM + "iconsets/" + this);
- mOverlay = GregTech_API.sItemIcons.registerIcon(RES_PATH_ITEM + "iconsets/" + this + "_OVERLAY");
+ mIcon = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath("iconsets", this.toString()));
+ mOverlay = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath("iconsets", this + "_OVERLAY"));
}
public static class CustomIcon implements IIconContainer, Runnable {
@@ -1882,8 +1881,8 @@ public class Textures {
@Override
public void run() {
- mIcon = GregTech_API.sItemIcons.registerIcon(RES_PATH_ITEM + mIconName);
- mOverlay = GregTech_API.sItemIcons.registerIcon(RES_PATH_ITEM + mIconName + "_OVERLAY");
+ mIcon = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath(mIconName));
+ mOverlay = GregTech_API.sItemIcons.registerIcon(GregTech.getResourcePath(mIconName + "_OVERLAY"));
}
}
}