diff options
Diffstat (limited to 'src/main/java/gregtech/api')
30 files changed, 907 insertions, 519 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 7a8b495a4b..59fa6776c3 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -3,7 +3,7 @@ package gregtech.api; import static gregtech.api.enums.GT_Values.B; import static gregtech.api.enums.GT_Values.L; import static gregtech.api.enums.GT_Values.M; -import static gregtech.api.enums.ModIDs.IndustrialCraft2; +import static gregtech.api.enums.Mods.IndustrialCraft2; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -285,7 +285,7 @@ public class GregTech_API { public static boolean mUseOnlyGoodSolderingMaterials = false; - private static final String aTextIC2Lower = IndustrialCraft2.modID.toLowerCase(Locale.ENGLISH); + private static final String aTextIC2Lower = IndustrialCraft2.ID.toLowerCase(Locale.ENGLISH); /** * Getting assigned by the Mod loading */ 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")); } } } diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java index b891ed177d..1d82fa8274 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.entity.player.InventoryPlayer; @@ -13,13 +13,17 @@ public class GT_GUIContainer_1by1 extends GT_GUIContainerMetaTile_Machine { private final int textColor = this.getTextColorOrDefault("title", 0x404040); public GT_GUIContainer_1by1(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) { - super(new GT_Container_1by1(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "1by1.png"); + super( + new GT_Container_1by1(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", "1by1.png")); mName = aName; } public GT_GUIContainer_1by1(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) { - super(new GT_Container_1by1(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "1by1.png"); + super( + new GT_Container_1by1(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", aBackground + "1by1.png")); mName = aName; } diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java index a06d4a98d2..5d65ca1344 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.entity.player.InventoryPlayer; @@ -13,13 +13,17 @@ public class GT_GUIContainer_2by2 extends GT_GUIContainerMetaTile_Machine { private final int textColor = this.getTextColorOrDefault("title", 0x404040); public GT_GUIContainer_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) { - super(new GT_Container_2by2(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "2by2.png"); + super( + new GT_Container_2by2(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", "2by2.png")); mName = aName; } public GT_GUIContainer_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) { - super(new GT_Container_2by2(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "2by2.png"); + super( + new GT_Container_2by2(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", aBackground + "2by2.png")); mName = aName; } diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java index 715be4fdea..2ba68decf6 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.entity.player.InventoryPlayer; @@ -13,13 +13,17 @@ public class GT_GUIContainer_3by3 extends GT_GUIContainerMetaTile_Machine { private final int textColor = this.getTextColorOrDefault("title", 0x404040); public GT_GUIContainer_3by3(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) { - super(new GT_Container_3by3(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "3by3.png"); + super( + new GT_Container_3by3(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", "3by3.png")); mName = aName; } public GT_GUIContainer_3by3(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) { - super(new GT_Container_3by3(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "3by3.png"); + super( + new GT_Container_3by3(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", aBackground + "3by3.png")); mName = aName; } diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java index d091abfff6..f1933897c7 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.entity.player.InventoryPlayer; @@ -13,13 +13,17 @@ public class GT_GUIContainer_4by4 extends GT_GUIContainerMetaTile_Machine { private final int textColor = this.getTextColorOrDefault("title", 0x404040); public GT_GUIContainer_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) { - super(new GT_Container_4by4(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "4by4.png"); + super( + new GT_Container_4by4(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", "4by4.png")); mName = aName; } public GT_GUIContainer_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) { - super(new GT_Container_4by4(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "4by4.png"); + super( + new GT_Container_4by4(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", aBackground + "4by4.png")); mName = aName; } diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java index eb0122093c..6e6ce4c1d0 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java @@ -1,8 +1,8 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; -import java.awt.Rectangle; +import java.awt.*; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -61,7 +61,7 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin String aTextureFile, String aNEI, byte aProgressBarDirection, byte aProgressBarAmount) { super( new GT_Container_BasicMachine(aInventoryPlayer, aTileEntity), - RES_PATH_GUI + "basicmachines/" + aTextureFile); + GregTech.getResourcePath("textures", "gui", "basicmachines", aTextureFile)); mProgressBarDirection = aProgressBarDirection; mProgressBarAmount = (byte) Math.max(1, aProgressBarAmount); mName = aName; diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java index 99478667ec..a8e965cf28 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; @@ -16,7 +16,9 @@ public class GT_GUIContainer_BasicTank extends GT_GUIContainerMetaTile_Machine { textColorValue = this.getTextColorOrDefault("value", 0xFAFAFF); public GT_GUIContainer_BasicTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) { - super(new GT_Container_BasicTank(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png"); + super( + new GT_Container_BasicTank(aInventoryPlayer, aTileEntity), + GregTech.getResourcePath("textures", "gui", "BasicTank.png")); mName = aName; } diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java index d9c971482c..8378c5e8cf 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java @@ -1,6 +1,6 @@ package gregtech.api.gui; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -28,7 +28,11 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin String aTextureFile) { super( new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity), - RES_PATH_GUI + "multimachines/" + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile)); + GregTech.getResourcePath( + "textures", + "gui", + "multimachines", + aTextureFile == null ? "MultiblockDisplay" : aTextureFile)); mName = aName; } diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java index 590b14af29..ff05f23d25 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java +++ b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java @@ -1,5 +1,7 @@ package gregtech.api.gui.modularui; +import static gregtech.api.enums.Mods.GregTech; + import java.util.function.BiFunction; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -9,475 +11,553 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; public class GT_UITextures { - private static final String MODID = "gregtech"; - - public static final UITexture TRANSPARENT = UITexture.fullImage(MODID, "gui/picture/transparent"); + public static final UITexture TRANSPARENT = UITexture.fullImage(GregTech.ID, "gui/picture/transparent"); public static final AdaptableUITexture BACKGROUND_SINGLEBLOCK_DEFAULT = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/background/singleblock_default", 176, 166, 4); public static final SteamTexture BACKGROUND_STEAM = SteamTexture.adaptableTexture( - MODID, + GregTech.ID, "gui/background/%s", 176, 166, 4); public static final UITexture BACKGROUND_FUSION_COMPUTER = UITexture.fullImage( - MODID, + GregTech.ID, "gui/background/fusion_computer"); public static final AdaptableUITexture BACKGROUND_TEXT_FIELD = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/background/text_field", 142, 28, 1); public static final AdaptableUITexture BACKGROUND_TEXT_FIELD_LIGHT_GRAY = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/background/text_field_light_gray", 61, 12, 1); - public static final SteamTexture SLOT_ITEM_STEAM = SteamTexture.fullImage(MODID, "gui/slot/item_%s"); - public static final SteamTexture SLOT_FLUID_STEAM = SteamTexture.fullImage(MODID, "gui/slot/fluid_%s"); + public static final SteamTexture SLOT_ITEM_STEAM = SteamTexture.fullImage(GregTech.ID, "gui/slot/item_%s"); + public static final SteamTexture SLOT_FLUID_STEAM = SteamTexture.fullImage(GregTech.ID, "gui/slot/fluid_%s"); public static final AdaptableUITexture SLOT_DARK_GRAY = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/slot/dark_gray", 18, 18, 1); public static final AdaptableUITexture SLOT_MAINTENANCE = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/slot/maintenance", 20, 20, 1); - public static final AdaptableUITexture SLOT_UPLIFTED = AdaptableUITexture.of(MODID, "gui/slot/uplifted", 18, 18, 1); + public static final AdaptableUITexture SLOT_UPLIFTED = AdaptableUITexture.of( + GregTech.ID, + "gui/slot/uplifted", + 18, + 18, + 1); - public static final UITexture OVERLAY_SLOT_ARROW_ME = UITexture.fullImage(MODID, "gui/overlay_slot/arrow_me"); - public static final UITexture OVERLAY_SLOT_BEAKER_1 = UITexture.fullImage(MODID, "gui/overlay_slot/beaker_1"); - public static final UITexture OVERLAY_SLOT_BEAKER_2 = UITexture.fullImage(MODID, "gui/overlay_slot/beaker_2"); - public static final UITexture OVERLAY_SLOT_BEE_DRONE = UITexture.fullImage(MODID, "gui/overlay_slot/bee_drone"); - public static final UITexture OVERLAY_SLOT_BEE_QUEEN = UITexture.fullImage(MODID, "gui/overlay_slot/bee_queen"); - public static final UITexture OVERLAY_SLOT_BENDER = UITexture.fullImage(MODID, "gui/overlay_slot/bender"); - public static final UITexture OVERLAY_SLOT_BOX = UITexture.fullImage(MODID, "gui/overlay_slot/box"); - public static final UITexture OVERLAY_SLOT_BOXED = UITexture.fullImage(MODID, "gui/overlay_slot/boxed"); - public static final UITexture OVERLAY_SLOT_CANISTER = UITexture.fullImage(MODID, "gui/overlay_slot/canister"); + public static final UITexture OVERLAY_SLOT_ARROW_ME = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/arrow_me"); + public static final UITexture OVERLAY_SLOT_BEAKER_1 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/beaker_1"); + public static final UITexture OVERLAY_SLOT_BEAKER_2 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/beaker_2"); + public static final UITexture OVERLAY_SLOT_BEE_DRONE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/bee_drone"); + public static final UITexture OVERLAY_SLOT_BEE_QUEEN = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/bee_queen"); + public static final UITexture OVERLAY_SLOT_BENDER = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/bender"); + public static final UITexture OVERLAY_SLOT_BOX = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/box"); + public static final UITexture OVERLAY_SLOT_BOXED = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/boxed"); + public static final UITexture OVERLAY_SLOT_CANISTER = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/canister"); public static final SteamTexture OVERLAY_SLOT_CANISTER_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/canister_%s"); - public static final UITexture OVERLAY_SLOT_CANNER = UITexture.fullImage(MODID, "gui/overlay_slot/canner"); - public static final UITexture OVERLAY_SLOT_CAULDRON = UITexture.fullImage(MODID, "gui/overlay_slot/cauldron"); - public static final UITexture OVERLAY_SLOT_CENTRIFUGE = UITexture.fullImage(MODID, "gui/overlay_slot/centrifuge"); + public static final UITexture OVERLAY_SLOT_CANNER = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/canner"); + public static final UITexture OVERLAY_SLOT_CAULDRON = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/cauldron"); + public static final UITexture OVERLAY_SLOT_CENTRIFUGE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/centrifuge"); public static final UITexture OVERLAY_SLOT_CENTRIFUGE_FLUID = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/centrifuge_fluid"); public static final SteamTexture OVERLAY_SLOT_CENTRIFUGE_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/centrifuge_%s"); - public static final UITexture OVERLAY_SLOT_CHARGER = UITexture.fullImage(MODID, "gui/overlay_slot/charger"); + public static final UITexture OVERLAY_SLOT_CHARGER = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/charger"); public static final UITexture OVERLAY_SLOT_CHARGER_FLUID = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/charger_fluid"); - public static final UITexture OVERLAY_SLOT_CIRCUIT = UITexture.fullImage(MODID, "gui/overlay_slot/circuit"); + public static final UITexture OVERLAY_SLOT_CIRCUIT = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/circuit"); public static final SteamTexture OVERLAY_SLOT_COAL_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/coal_%s"); - public static final UITexture OVERLAY_SLOT_COMPRESSOR = UITexture.fullImage(MODID, "gui/overlay_slot/compressor"); + public static final UITexture OVERLAY_SLOT_COMPRESSOR = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/compressor"); public static final SteamTexture OVERLAY_SLOT_COMPRESSOR_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/compressor_%s"); - public static final UITexture OVERLAY_SLOT_CRUSHED_ORE = UITexture.fullImage(MODID, "gui/overlay_slot/crushed_ore"); + public static final UITexture OVERLAY_SLOT_CRUSHED_ORE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/crushed_ore"); public static final SteamTexture OVERLAY_SLOT_CRUSHED_ORE_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/crushed_ore_%s"); public static final UITexture OVERLAY_SLOT_CUTTER_SLICED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/cutter_sliced"); - public static final UITexture OVERLAY_SLOT_DATA_ORB = UITexture.fullImage(MODID, "gui/overlay_slot/data_orb"); - public static final UITexture OVERLAY_SLOT_DATA_STICK = UITexture.fullImage(MODID, "gui/overlay_slot/data_stick"); - public static final UITexture OVERLAY_SLOT_DUST = UITexture.fullImage(MODID, "gui/overlay_slot/dust"); + public static final UITexture OVERLAY_SLOT_DATA_ORB = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/data_orb"); + public static final UITexture OVERLAY_SLOT_DATA_STICK = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/data_stick"); + public static final UITexture OVERLAY_SLOT_DUST = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/dust"); public static final SteamTexture OVERLAY_SLOT_DUST_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/dust_%s"); public static final SteamTexture OVERLAY_SLOT_BLOCK_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/block_%s"); - public static final UITexture OVERLAY_SLOT_EXPLOSIVE = UITexture.fullImage(MODID, "gui/overlay_slot/explosive"); + public static final UITexture OVERLAY_SLOT_EXPLOSIVE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/explosive"); public static final UITexture OVERLAY_SLOT_EXTRUDER_SHAPE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/extruder_shape"); - public static final UITexture OVERLAY_SLOT_FURNACE = UITexture.fullImage(MODID, "gui/overlay_slot/furnace"); + public static final UITexture OVERLAY_SLOT_FURNACE = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/furnace"); public static final SteamTexture OVERLAY_SLOT_FURNACE_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/furnace_%s"); - public static final UITexture OVERLAY_SLOT_GEM = UITexture.fullImage(MODID, "gui/overlay_slot/gem"); - public static final UITexture OVERLAY_SLOT_HAMMER = UITexture.fullImage(MODID, "gui/overlay_slot/hammer"); + public static final UITexture OVERLAY_SLOT_GEM = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/gem"); + public static final UITexture OVERLAY_SLOT_HAMMER = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/hammer"); public static final SteamTexture OVERLAY_SLOT_HAMMER_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/hammer_%s"); - public static final UITexture OVERLAY_SLOT_HEATER_1 = UITexture.fullImage(MODID, "gui/overlay_slot/heater_1"); - public static final UITexture OVERLAY_SLOT_HEATER_2 = UITexture.fullImage(MODID, "gui/overlay_slot/heater_2"); - public static final UITexture OVERLAY_SLOT_IMPLOSION = UITexture.fullImage(MODID, "gui/overlay_slot/implosion"); - public static final UITexture OVERLAY_SLOT_IN = UITexture.fullImage(MODID, "gui/overlay_slot/in"); - public static final SteamTexture OVERLAY_SLOT_IN_STEAM = SteamTexture.fullImage(MODID, "gui/overlay_slot/in_%s"); + public static final UITexture OVERLAY_SLOT_HEATER_1 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/heater_1"); + public static final UITexture OVERLAY_SLOT_HEATER_2 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/heater_2"); + public static final UITexture OVERLAY_SLOT_IMPLOSION = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/implosion"); + public static final UITexture OVERLAY_SLOT_IN = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/in"); + public static final SteamTexture OVERLAY_SLOT_IN_STEAM = SteamTexture.fullImage( + GregTech.ID, + "gui/overlay_slot/in_%s"); public static final SteamTexture OVERLAY_SLOT_INGOT_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/ingot_%s"); - public static final UITexture OVERLAY_SLOT_INT_CIRCUIT = UITexture.fullImage(MODID, "gui/overlay_slot/int_circuit"); - public static final UITexture OVERLAY_SLOT_LENS = UITexture.fullImage(MODID, "gui/overlay_slot/lens"); - public static final UITexture OVERLAY_SLOT_MICROSCOPE = UITexture.fullImage(MODID, "gui/overlay_slot/microscope"); - public static final UITexture OVERLAY_SLOT_MOLD = UITexture.fullImage(MODID, "gui/overlay_slot/mold"); - public static final UITexture OVERLAY_SLOT_MOLECULAR_1 = UITexture.fullImage(MODID, "gui/overlay_slot/molecular_1"); - public static final UITexture OVERLAY_SLOT_MOLECULAR_2 = UITexture.fullImage(MODID, "gui/overlay_slot/molecular_2"); - public static final UITexture OVERLAY_SLOT_MOLECULAR_3 = UITexture.fullImage(MODID, "gui/overlay_slot/molecular_3"); - public static final UITexture OVERLAY_SLOT_OUT = UITexture.fullImage(MODID, "gui/overlay_slot/out"); - public static final SteamTexture OVERLAY_SLOT_OUT_STEAM = SteamTexture.fullImage(MODID, "gui/overlay_slot/out_%s"); - public static final UITexture OVERLAY_SLOT_PAGE_BLANK = UITexture.fullImage(MODID, "gui/overlay_slot/page_blank"); + public static final UITexture OVERLAY_SLOT_INT_CIRCUIT = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/int_circuit"); + public static final UITexture OVERLAY_SLOT_LENS = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/lens"); + public static final UITexture OVERLAY_SLOT_MICROSCOPE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/microscope"); + public static final UITexture OVERLAY_SLOT_MOLD = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/mold"); + public static final UITexture OVERLAY_SLOT_MOLECULAR_1 = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/molecular_1"); + public static final UITexture OVERLAY_SLOT_MOLECULAR_2 = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/molecular_2"); + public static final UITexture OVERLAY_SLOT_MOLECULAR_3 = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/molecular_3"); + public static final UITexture OVERLAY_SLOT_OUT = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/out"); + public static final SteamTexture OVERLAY_SLOT_OUT_STEAM = SteamTexture.fullImage( + GregTech.ID, + "gui/overlay_slot/out_%s"); + public static final UITexture OVERLAY_SLOT_PAGE_BLANK = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/page_blank"); public static final UITexture OVERLAY_SLOT_PAGE_PRINTED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/page_printed"); - public static final UITexture OVERLAY_SLOT_PRESS_1 = UITexture.fullImage(MODID, "gui/overlay_slot/press_1"); - public static final UITexture OVERLAY_SLOT_PRESS_2 = UITexture.fullImage(MODID, "gui/overlay_slot/press_2"); - public static final UITexture OVERLAY_SLOT_PRESS_3 = UITexture.fullImage(MODID, "gui/overlay_slot/press_3"); - public static final UITexture OVERLAY_SLOT_RECYCLE = UITexture.fullImage(MODID, "gui/overlay_slot/recycle"); - public static final UITexture OVERLAY_SLOT_ROD_1 = UITexture.fullImage(MODID, "gui/overlay_slot/rod_1"); - public static final UITexture OVERLAY_SLOT_ROD_2 = UITexture.fullImage(MODID, "gui/overlay_slot/rod_2"); - public static final UITexture OVERLAY_SLOT_SLICE_SHAPE = UITexture.fullImage(MODID, "gui/overlay_slot/slice_shape"); + public static final UITexture OVERLAY_SLOT_PRESS_1 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/press_1"); + public static final UITexture OVERLAY_SLOT_PRESS_2 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/press_2"); + public static final UITexture OVERLAY_SLOT_PRESS_3 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/press_3"); + public static final UITexture OVERLAY_SLOT_RECYCLE = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/recycle"); + public static final UITexture OVERLAY_SLOT_ROD_1 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/rod_1"); + public static final UITexture OVERLAY_SLOT_ROD_2 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/rod_2"); + public static final UITexture OVERLAY_SLOT_SLICE_SHAPE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_slot/slice_shape"); public static final UITexture OVERLAY_SLOT_SLICER_SLICED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/slicer_sliced"); - public static final UITexture OVERLAY_SLOT_SQUARE = UITexture.fullImage(MODID, "gui/overlay_slot/square"); - public static final UITexture OVERLAY_SLOT_UUA = UITexture.fullImage(MODID, "gui/overlay_slot/uua"); - public static final UITexture OVERLAY_SLOT_UUM = UITexture.fullImage(MODID, "gui/overlay_slot/uum"); - public static final UITexture OVERLAY_SLOT_VIAL_1 = UITexture.fullImage(MODID, "gui/overlay_slot/vial_1"); - public static final UITexture OVERLAY_SLOT_VIAL_2 = UITexture.fullImage(MODID, "gui/overlay_slot/vial_2"); - public static final UITexture OVERLAY_SLOT_WIREMILL = UITexture.fullImage(MODID, "gui/overlay_slot/wiremill"); - public static final UITexture OVERLAY_SLOT_WRENCH = UITexture.fullImage(MODID, "gui/overlay_slot/wrench"); + public static final UITexture OVERLAY_SLOT_SQUARE = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/square"); + public static final UITexture OVERLAY_SLOT_UUA = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/uua"); + public static final UITexture OVERLAY_SLOT_UUM = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/uum"); + public static final UITexture OVERLAY_SLOT_VIAL_1 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/vial_1"); + public static final UITexture OVERLAY_SLOT_VIAL_2 = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/vial_2"); + public static final UITexture OVERLAY_SLOT_WIREMILL = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/wiremill"); + public static final UITexture OVERLAY_SLOT_WRENCH = UITexture.fullImage(GregTech.ID, "gui/overlay_slot/wrench"); public static final UITexture[] OVERLAY_SLOTS_NUMBER = IntStream.range(0, 12) .mapToObj( i -> UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_slot/number_" + i)) .collect(Collectors.toList()) .toArray(new UITexture[0]); - public static final UITexture PROGRESSBAR_ARROW = UITexture.fullImage(MODID, "gui/progressbar/arrow"); + public static final UITexture PROGRESSBAR_ARROW = UITexture.fullImage(GregTech.ID, "gui/progressbar/arrow"); public static final SteamTexture PROGRESSBAR_ARROW_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/arrow_%s"); public static final SteamTexture PROGRESSBAR_ARROW_2_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/arrow_2_%s"); public static final UITexture PROGRESSBAR_ARROW_MULTIPLE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/arrow_multiple"); - public static final UITexture PROGRESSBAR_ASSEMBLE = UITexture.fullImage(MODID, "gui/progressbar/assemble"); + public static final UITexture PROGRESSBAR_ASSEMBLE = UITexture.fullImage(GregTech.ID, "gui/progressbar/assemble"); public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_1 = UITexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/assemblyline_1"); public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_2 = UITexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/assemblyline_2"); public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_3 = UITexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/assemblyline_3"); - public static final UITexture PROGRESSBAR_BATH = UITexture.fullImage(MODID, "gui/progressbar/bath"); - public static final UITexture PROGRESSBAR_BENDING = UITexture.fullImage(MODID, "gui/progressbar/bending"); + public static final UITexture PROGRESSBAR_BATH = UITexture.fullImage(GregTech.ID, "gui/progressbar/bath"); + public static final UITexture PROGRESSBAR_BENDING = UITexture.fullImage(GregTech.ID, "gui/progressbar/bending"); public static final SteamTexture PROGRESSBAR_BOILER_EMPTY_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/boiler_empty_%s"); - public static final UITexture PROGRESSBAR_BOILER_HEAT = UITexture.fullImage(MODID, "gui/progressbar/boiler_heat"); - public static final UITexture PROGRESSBAR_BOILER_STEAM = UITexture.fullImage(MODID, "gui/progressbar/boiler_steam"); - public static final UITexture PROGRESSBAR_BOILER_WATER = UITexture.fullImage(MODID, "gui/progressbar/boiler_water"); - public static final UITexture PROGRESSBAR_CANNER = UITexture.fullImage(MODID, "gui/progressbar/canner"); + public static final UITexture PROGRESSBAR_BOILER_HEAT = UITexture.fullImage( + GregTech.ID, + "gui/progressbar/boiler_heat"); + public static final UITexture PROGRESSBAR_BOILER_STEAM = UITexture.fullImage( + GregTech.ID, + "gui/progressbar/boiler_steam"); + public static final UITexture PROGRESSBAR_BOILER_WATER = UITexture.fullImage( + GregTech.ID, + "gui/progressbar/boiler_water"); + public static final UITexture PROGRESSBAR_CANNER = UITexture.fullImage(GregTech.ID, "gui/progressbar/canner"); public static final UITexture PROGRESSBAR_CIRCUIT_ASSEMBLER = UITexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/circuit_assembler"); - public static final UITexture PROGRESSBAR_COMPRESS = UITexture.fullImage(MODID, "gui/progressbar/compress"); + public static final UITexture PROGRESSBAR_COMPRESS = UITexture.fullImage(GregTech.ID, "gui/progressbar/compress"); public static final SteamTexture PROGRESSBAR_COMPRESS_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/compress_%s"); - public static final UITexture PROGRESSBAR_CUT = UITexture.fullImage(MODID, "gui/progressbar/cut"); - public static final UITexture PROGRESSBAR_EXTRACT = UITexture.fullImage(MODID, "gui/progressbar/extract"); + public static final UITexture PROGRESSBAR_CUT = UITexture.fullImage(GregTech.ID, "gui/progressbar/cut"); + public static final UITexture PROGRESSBAR_EXTRACT = UITexture.fullImage(GregTech.ID, "gui/progressbar/extract"); public static final SteamTexture PROGRESSBAR_EXTRACT_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/extract_%s"); - public static final UITexture PROGRESSBAR_EXTRUDE = UITexture.fullImage(MODID, "gui/progressbar/extrude"); - public static final SteamTexture PROGRESSBAR_FUEL_STEAM = SteamTexture.fullImage(MODID, "gui/progressbar/fuel_%s"); - public static final UITexture PROGRESSBAR_HAMMER = UITexture.fullImage(MODID, "gui/progressbar/hammer"); - public static final UITexture PROGRESSBAR_HAMMER_BASE = UITexture.fullImage(MODID, "gui/progressbar/hammer_base"); + public static final UITexture PROGRESSBAR_EXTRUDE = UITexture.fullImage(GregTech.ID, "gui/progressbar/extrude"); + public static final SteamTexture PROGRESSBAR_FUEL_STEAM = SteamTexture.fullImage( + GregTech.ID, + "gui/progressbar/fuel_%s"); + public static final UITexture PROGRESSBAR_HAMMER = UITexture.fullImage(GregTech.ID, "gui/progressbar/hammer"); + public static final UITexture PROGRESSBAR_HAMMER_BASE = UITexture.fullImage( + GregTech.ID, + "gui/progressbar/hammer_base"); public static final SteamTexture PROGRESSBAR_HAMMER_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/hammer_%s"); public static final SteamTexture PROGRESSBAR_HAMMER_BASE_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/hammer_base_%s"); - public static final UITexture PROGRESSBAR_LATHE = UITexture.fullImage(MODID, "gui/progressbar/lathe"); - public static final UITexture PROGRESSBAR_LATHE_BASE = UITexture.fullImage(MODID, "gui/progressbar/lathe_base"); - public static final UITexture PROGRESSBAR_MACERATE = UITexture.fullImage(MODID, "gui/progressbar/macerate"); + public static final UITexture PROGRESSBAR_LATHE = UITexture.fullImage(GregTech.ID, "gui/progressbar/lathe"); + public static final UITexture PROGRESSBAR_LATHE_BASE = UITexture.fullImage( + GregTech.ID, + "gui/progressbar/lathe_base"); + public static final UITexture PROGRESSBAR_MACERATE = UITexture.fullImage(GregTech.ID, "gui/progressbar/macerate"); public static final SteamTexture PROGRESSBAR_MACERATE_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/progressbar/macerate_%s"); - public static final UITexture PROGRESSBAR_MAGNET = UITexture.fullImage(MODID, "gui/progressbar/magnet"); - public static final UITexture PROGRESSBAR_MIXER = UITexture.fullImage(MODID, "gui/progressbar/mixer"); - public static final UITexture PROGRESSBAR_RECYCLE = UITexture.fullImage(MODID, "gui/progressbar/recycle"); - public static final UITexture PROGRESSBAR_SIFT = UITexture.fullImage(MODID, "gui/progressbar/sift"); - public static final UITexture PROGRESSBAR_SLICE = UITexture.fullImage(MODID, "gui/progressbar/slice"); - public static final UITexture PROGRESSBAR_STORED_EU = UITexture.fullImage(MODID, "gui/progressbar/stored_eu"); - public static final UITexture PROGRESSBAR_WIREMILL = UITexture.fullImage(MODID, "gui/progressbar/wiremill"); + public static final UITexture PROGRESSBAR_MAGNET = UITexture.fullImage(GregTech.ID, "gui/progressbar/magnet"); + public static final UITexture PROGRESSBAR_MIXER = UITexture.fullImage(GregTech.ID, "gui/progressbar/mixer"); + public static final UITexture PROGRESSBAR_RECYCLE = UITexture.fullImage(GregTech.ID, "gui/progressbar/recycle"); + public static final UITexture PROGRESSBAR_SIFT = UITexture.fullImage(GregTech.ID, "gui/progressbar/sift"); + public static final UITexture PROGRESSBAR_SLICE = UITexture.fullImage(GregTech.ID, "gui/progressbar/slice"); + public static final UITexture PROGRESSBAR_STORED_EU = UITexture.fullImage(GregTech.ID, "gui/progressbar/stored_eu"); + public static final UITexture PROGRESSBAR_WIREMILL = UITexture.fullImage(GregTech.ID, "gui/progressbar/wiremill"); - public static final UITexture TAB_COVER_NORMAL = UITexture.fullImage(MODID, "gui/tab/cover_normal"); - public static final UITexture TAB_COVER_HIGHLIGHT = UITexture.fullImage(MODID, "gui/tab/cover_highlight"); - public static final UITexture TAB_COVER_DISABLED = UITexture.fullImage(MODID, "gui/tab/cover_disabled"); - public static final SteamTexture TAB_COVER_STEAM_NORMAL = SteamTexture.fullImage(MODID, "gui/tab/cover_%s_normal"); + public static final UITexture TAB_COVER_NORMAL = UITexture.fullImage(GregTech.ID, "gui/tab/cover_normal"); + public static final UITexture TAB_COVER_HIGHLIGHT = UITexture.fullImage(GregTech.ID, "gui/tab/cover_highlight"); + public static final UITexture TAB_COVER_DISABLED = UITexture.fullImage(GregTech.ID, "gui/tab/cover_disabled"); + public static final SteamTexture TAB_COVER_STEAM_NORMAL = SteamTexture.fullImage( + GregTech.ID, + "gui/tab/cover_%s_normal"); public static final SteamTexture TAB_COVER_STEAM_HIGHLIGHT = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/tab/cover_%s_highlight"); public static final SteamTexture TAB_COVER_STEAM_DISABLED = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/tab/cover_%s_disabled"); - public static final AdaptableUITexture TAB_TITLE = AdaptableUITexture.of(MODID, "gui/tab/title", 28, 28, 4); + public static final AdaptableUITexture TAB_TITLE = AdaptableUITexture.of(GregTech.ID, "gui/tab/title", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_DARK = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/tab/title_dark", 28, 28, 4); public static final SteamTexture TAB_TITLE_STEAM = SteamTexture.adaptableTexture( - MODID, + GregTech.ID, "gui/tab/title_%s", 28, 28, 4); public static final SteamTexture TAB_TITLE_DARK_STEAM = SteamTexture.adaptableTexture( - MODID, + GregTech.ID, "gui/tab/title_dark_%s", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_ANGULAR = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/tab/title_angular", 28, 28, 4); public static final SteamTexture TAB_TITLE_ANGULAR_STEAM = SteamTexture.adaptableTexture( - MODID, + GregTech.ID, "gui/tab/title_angular_%s", 28, 28, 4); - public static final UITexture BUTTON_STANDARD = AdaptableUITexture.of(MODID, "gui/button/standard", 18, 18, 1); + public static final UITexture BUTTON_STANDARD = AdaptableUITexture.of( + GregTech.ID, + "gui/button/standard", + 18, + 18, + 1); public static final UITexture BUTTON_STANDARD_DISABLED = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/button/standard_disabled", 18, 18, 1); public static final UITexture BUTTON_STANDARD_TOGGLE = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/button/standard_toggle", 18, 18, 1); public static final UITexture BUTTON_STANDARD_TOGGLE_DISABLED = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/button/standard_toggle_disabled", 18, 18, 1); - public static final UITexture BUTTON_COVER_NORMAL = UITexture.fullImage(MODID, "gui/button/cover_normal"); + public static final UITexture BUTTON_COVER_NORMAL = UITexture.fullImage(GregTech.ID, "gui/button/cover_normal"); public static final UITexture BUTTON_COVER_NORMAL_HOVERED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/button/cover_normal_hovered"); public static final UITexture BUTTON_COVER_NORMAL_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/button/cover_normal_disabled"); - public static final UITexture OVERLAY_BUTTON_DISABLE = UITexture.fullImage(MODID, "gui/overlay_button/disable"); + public static final UITexture OVERLAY_BUTTON_DISABLE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/disable"); public static final UITexture OVERLAY_BUTTON_REDSTONE_OFF = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/redstone_off"); public static final UITexture OVERLAY_BUTTON_REDSTONE_ON = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/redstone_on"); public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_ON = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/power_switch_on"); public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_OFF = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/power_switch_off"); public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_ON = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/void_excess_on"); public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_ON_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/void_excess_on_disabled"); public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_OFF = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/void_excess_off"); public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_OFF_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/void_excess_off_disabled"); public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_ON = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/input_separation_on"); public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/input_separation_on_disabled"); public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_OFF = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/input_separation_off"); public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/input_separation_off_disabled"); public static final UITexture OVERLAY_BUTTON_RECIPE_LOCKED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/recipe_locked"); public static final UITexture OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/recipe_locked_disabled"); public static final UITexture OVERLAY_BUTTON_RECIPE_UNLOCKED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/recipe_unlocked"); public static final UITexture OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/recipe_unlocked_disabled"); public static final UITexture OVERLAY_BUTTON_BATCH_MODE_ON = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/batch_mode_on"); public static final UITexture OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/batch_mode_on_disabled"); public static final UITexture OVERLAY_BUTTON_BATCH_MODE_OFF = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/batch_mode_off"); public static final UITexture OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/batch_mode_off_disabled"); public static final UITexture OVERLAY_BUTTON_DOWN_TIERING_ON = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/down_tiering_on"); public static final UITexture OVERLAY_BUTTON_DOWN_TIERING_OFF = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/down_tiering_off"); - public static final UITexture OVERLAY_BUTTON_CHECKMARK = UITexture.fullImage(MODID, "gui/overlay_button/checkmark"); - public static final UITexture OVERLAY_BUTTON_CROSS = UITexture.fullImage(MODID, "gui/overlay_button/cross"); - public static final UITexture OVERLAY_BUTTON_WHITELIST = UITexture.fullImage(MODID, "gui/overlay_button/whitelist"); - public static final UITexture OVERLAY_BUTTON_BLACKLIST = UITexture.fullImage(MODID, "gui/overlay_button/blacklist"); - public static final UITexture OVERLAY_BUTTON_PROGRESS = UITexture.fullImage(MODID, "gui/overlay_button/progress"); - public static final UITexture OVERLAY_BUTTON_EXPORT = UITexture.fullImage(MODID, "gui/overlay_button/export"); - public static final UITexture OVERLAY_BUTTON_IMPORT = UITexture.fullImage(MODID, "gui/overlay_button/import"); + public static final UITexture OVERLAY_BUTTON_CHECKMARK = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/checkmark"); + public static final UITexture OVERLAY_BUTTON_CROSS = UITexture.fullImage(GregTech.ID, "gui/overlay_button/cross"); + public static final UITexture OVERLAY_BUTTON_WHITELIST = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/whitelist"); + public static final UITexture OVERLAY_BUTTON_BLACKLIST = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/blacklist"); + public static final UITexture OVERLAY_BUTTON_PROGRESS = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/progress"); + public static final UITexture OVERLAY_BUTTON_EXPORT = UITexture.fullImage(GregTech.ID, "gui/overlay_button/export"); + public static final UITexture OVERLAY_BUTTON_IMPORT = UITexture.fullImage(GregTech.ID, "gui/overlay_button/import"); public static final UITexture OVERLAY_BUTTON_AUTOOUTPUT_ITEM = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/autooutput_item"); public static final UITexture OVERLAY_BUTTON_AUTOOUTPUT_FLUID = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/autooutput_fluid"); public static final UITexture OVERLAY_BUTTON_ALLOW_INPUT = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/allow_input"); public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/auto_pull_me"); public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME_DISABLED = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/auto_pull_me_disabled"); public static final UITexture OVERLAY_BUTTON_BLOCK_INPUT = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/block_input"); public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_UP = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/arrow_green_up"); public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_DOWN = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/arrow_green_down"); - public static final UITexture OVERLAY_BUTTON_CYCLIC = UITexture.fullImage(MODID, "gui/overlay_button/cyclic"); + public static final UITexture OVERLAY_BUTTON_CYCLIC = UITexture.fullImage(GregTech.ID, "gui/overlay_button/cyclic"); public static final UITexture OVERLAY_BUTTON_EMIT_ENERGY = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/emit_energy"); public static final UITexture OVERLAY_BUTTON_EMIT_REDSTONE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/emit_redstone"); public static final UITexture OVERLAY_BUTTON_INVERT_REDSTONE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/invert_redstone"); public static final UITexture OVERLAY_BUTTON_STOCKING_MODE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/stocking_mode"); public static final UITexture OVERLAY_BUTTON_INVERT_FILTER = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/invert_filter"); - public static final UITexture OVERLAY_BUTTON_NBT = UITexture.fullImage(MODID, "gui/overlay_button/nbt"); - public static final UITexture OVERLAY_BUTTON_PRINT = UITexture.fullImage(MODID, "gui/overlay_button/print"); - public static final UITexture OVERLAY_BUTTON_TRANSPOSE = UITexture.fullImage(MODID, "gui/overlay_button/transpose"); + public static final UITexture OVERLAY_BUTTON_NBT = UITexture.fullImage(GregTech.ID, "gui/overlay_button/nbt"); + public static final UITexture OVERLAY_BUTTON_PRINT = UITexture.fullImage(GregTech.ID, "gui/overlay_button/print"); + public static final UITexture OVERLAY_BUTTON_TRANSPOSE = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/transpose"); public static final UITexture OVERLAY_BUTTON_BOUNDING_BOX = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/bounding_box"); public static final UITexture OVERLAY_BUTTON_MINUS_SMALL = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/minus_small"); public static final UITexture OVERLAY_BUTTON_MINUS_LARGE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/minus_large"); public static final UITexture OVERLAY_BUTTON_PLUS_SMALL = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/plus_small"); public static final UITexture OVERLAY_BUTTON_PLUS_LARGE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/plus_large"); - public static final UITexture OVERLAY_BUTTON_GATE_AND = UITexture.fullImage(MODID, "gui/overlay_button/gate_and"); - public static final UITexture OVERLAY_BUTTON_GATE_NAND = UITexture.fullImage(MODID, "gui/overlay_button/gate_nand"); - public static final UITexture OVERLAY_BUTTON_GATE_OR = UITexture.fullImage(MODID, "gui/overlay_button/gate_or"); - public static final UITexture OVERLAY_BUTTON_GATE_NOR = UITexture.fullImage(MODID, "gui/overlay_button/gate_nor"); - public static final UITexture OVERLAY_BUTTON_ANALOG = UITexture.fullImage(MODID, "gui/overlay_button/analog"); - public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(MODID, "gui/overlay_button/lock"); + public static final UITexture OVERLAY_BUTTON_GATE_AND = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/gate_and"); + public static final UITexture OVERLAY_BUTTON_GATE_NAND = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/gate_nand"); + public static final UITexture OVERLAY_BUTTON_GATE_OR = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/gate_or"); + public static final UITexture OVERLAY_BUTTON_GATE_NOR = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/gate_nor"); + public static final UITexture OVERLAY_BUTTON_ANALOG = UITexture.fullImage(GregTech.ID, "gui/overlay_button/analog"); + public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(GregTech.ID, "gui/overlay_button/lock"); public static final UITexture OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/input_from_output_side"); public static final UITexture OVERLAY_BUTTON_VOID_EXCESS = UITexture.fullImage( - MODID, + GregTech.ID, "gui/overlay_button/void_excess"); - public static final UITexture OVERLAY_BUTTON_VOID_ALL = UITexture.fullImage(MODID, "gui/overlay_button/void_all"); - public static final UITexture OVERLAY_BUTTON_NEI = UITexture.fullImage(MODID, "gui/overlay_button/nei"); + public static final UITexture OVERLAY_BUTTON_VOID_ALL = UITexture.fullImage( + GregTech.ID, + "gui/overlay_button/void_all"); + public static final UITexture OVERLAY_BUTTON_NEI = UITexture.fullImage(GregTech.ID, "gui/overlay_button/nei"); /** * Can adjust size as needed. */ public static final AdaptableUITexture PICTURE_SCREEN_BLACK = AdaptableUITexture.of( - MODID, + GregTech.ID, "gui/picture/screen_black", 16, 16, 2); public static final UITexture PICTURE_RADIATION_WARNING = UITexture.fullImage( - MODID, + GregTech.ID, "gui/picture/radiation_warning"); public static final UITexture PICTURE_GT_LOGO_17x17_TRANSPARENT = UITexture.fullImage( - MODID, + GregTech.ID, "gui/picture/gt_logo_17x17_transparent"); public static final UITexture PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY = UITexture.fullImage( - MODID, + GregTech.ID, "gui/picture/gt_logo_17x17_transparent_gray"); public static final SteamTexture PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM = SteamTexture.fullImage( - MODID, + GregTech.ID, "gui/picture/gt_logo_17x17_transparent_%s"); - public static final UITexture PICTURE_GT_LOGO_18x18 = UITexture.fullImage(MODID, "gui/picture/gt_logo_18x18"); - public static final UITexture PICTURE_GT_LOGO_19x19 = UITexture.fullImage(MODID, "gui/picture/gt_logo_19x19"); - public static final UITexture PICTURE_INFORMATION = UITexture.fullImage(MODID, "gui/picture/information"); + public static final UITexture PICTURE_GT_LOGO_18x18 = UITexture.fullImage(GregTech.ID, "gui/picture/gt_logo_18x18"); + public static final UITexture PICTURE_GT_LOGO_19x19 = UITexture.fullImage(GregTech.ID, "gui/picture/gt_logo_19x19"); + public static final UITexture PICTURE_INFORMATION = UITexture.fullImage(GregTech.ID, "gui/picture/information"); public static final UITexture PICTURE_STALLED_ELECTRICITY = UITexture.fullImage( - MODID, + GregTech.ID, "gui/picture/stalled_electricity"); - public static final UITexture PICTURE_STALLED_STEAM = UITexture.fullImage(MODID, "gui/picture/stalled_steam"); + public static final UITexture PICTURE_STALLED_STEAM = UITexture.fullImage(GregTech.ID, "gui/picture/stalled_steam"); public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_RED = (width, fromRight) -> UITexture.partly( - MODID, + GregTech.ID, "gui/picture/arrow_22_red", 87, 22, @@ -487,7 +567,7 @@ public class GT_UITextures { 22); public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_BLUE = (width, fromRight) -> UITexture.partly( - MODID, + GregTech.ID, "gui/picture/arrow_22_blue", 87, 22, @@ -497,7 +577,7 @@ public class GT_UITextures { 22); public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_WHITE = (width, fromRight) -> UITexture.partly( - MODID, + GregTech.ID, "gui/picture/arrow_22_white", 87, 22, @@ -507,7 +587,7 @@ public class GT_UITextures { 22); public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_RED = (width, fromRight) -> UITexture.partly( - MODID, + GregTech.ID, "gui/picture/arrow_24_red", 69, 24, @@ -517,7 +597,7 @@ public class GT_UITextures { 24); public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_BLUE = (width, fromRight) -> UITexture.partly( - MODID, + GregTech.ID, "gui/picture/arrow_24_blue", 69, 24, @@ -527,7 +607,7 @@ public class GT_UITextures { 24); public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_WHITE = (width, fromRight) -> UITexture.partly( - MODID, + GregTech.ID, "gui/picture/arrow_24_white", 69, 24, @@ -535,17 +615,19 @@ public class GT_UITextures { 0, fromRight ? 69 : width, 24); - public static final UITexture PICTURE_FLUID_WINDOW = UITexture.fullImage(MODID, "gui/picture/fluid_window"); - public static final UITexture PICTURE_FLUID_TANK = UITexture.fullImage(MODID, "gui/picture/fluid_tank"); - public static final UITexture PICTURE_SLOTS_HOLO_3BY3 = UITexture.fullImage(MODID, "gui/picture/slots_holo_3by3"); - public static final UITexture PICTURE_ARROW_DOUBLE = UITexture.fullImage(MODID, "gui/picture/arrow_double"); - public static final UITexture PICTURE_SUPER_BUFFER = UITexture.fullImage(MODID, "gui/picture/super_buffer"); + public static final UITexture PICTURE_FLUID_WINDOW = UITexture.fullImage(GregTech.ID, "gui/picture/fluid_window"); + public static final UITexture PICTURE_FLUID_TANK = UITexture.fullImage(GregTech.ID, "gui/picture/fluid_tank"); + public static final UITexture PICTURE_SLOTS_HOLO_3BY3 = UITexture.fullImage( + GregTech.ID, + "gui/picture/slots_holo_3by3"); + public static final UITexture PICTURE_ARROW_DOUBLE = UITexture.fullImage(GregTech.ID, "gui/picture/arrow_double"); + public static final UITexture PICTURE_SUPER_BUFFER = UITexture.fullImage(GregTech.ID, "gui/picture/super_buffer"); public static final UITexture PICTURE_SQUARE_LIGHT_GRAY = UITexture.fullImage( - MODID, + GregTech.ID, "gui/picture/square_light_gray"); - public static final UITexture PICTURE_GAUGE = UITexture.fullImage(MODID, "gui/picture/gauge"); - public static final UITexture PICTURE_ITEM_IN = UITexture.fullImage(MODID, "gui/picture/item_in"); - public static final UITexture PICTURE_ITEM_OUT = UITexture.fullImage(MODID, "gui/picture/item_out"); - public static final UITexture PICTURE_FLUID_IN = UITexture.fullImage(MODID, "gui/picture/fluid_in"); - public static final UITexture PICTURE_FLUID_OUT = UITexture.fullImage(MODID, "gui/picture/fluid_out"); + public static final UITexture PICTURE_GAUGE = UITexture.fullImage(GregTech.ID, "gui/picture/gauge"); + public static final UITexture PICTURE_ITEM_IN = UITexture.fullImage(GregTech.ID, "gui/picture/item_in"); + public static final UITexture PICTURE_ITEM_OUT = UITexture.fullImage(GregTech.ID, "gui/picture/item_out"); + public static final UITexture PICTURE_FLUID_IN = UITexture.fullImage(GregTech.ID, "gui/picture/fluid_in"); + public static final UITexture PICTURE_FLUID_OUT = UITexture.fullImage(GregTech.ID, "gui/picture/fluid_out"); } diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java index cb149547b4..a1876dcc8f 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java @@ -1,5 +1,7 @@ package gregtech.api.gui.widgets; +import static gregtech.api.enums.Mods.GregTech; + import java.util.Arrays; import net.minecraft.client.Minecraft; @@ -58,9 +60,9 @@ public enum GT_GuiIcon implements IGuiIcon { TAB_INFO_BLUE(2, 220 + 18, 0, 18, 20),; private static final int T_SIZE = 256; - private static ResourceLocation[] TEXTURES = { new ResourceLocation("gregtech", "textures/gui/GuiButtons.png"), - new ResourceLocation("gregtech", "textures/gui/GuiCover.png"), - new ResourceLocation("gregtech", "textures/gui/GuiTabs.png"), }; + private static ResourceLocation[] TEXTURES = { new ResourceLocation(GregTech.ID, "textures/gui/GuiButtons.png"), + new ResourceLocation(GregTech.ID, "textures/gui/GuiCover.png"), + new ResourceLocation(GregTech.ID, "textures/gui/GuiTabs.png"), }; public final int x, y, width, height; public final IGuiIcon overlay; diff --git a/src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java b/src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java index 3527b2e60d..7364dec050 100644 --- a/src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java +++ b/src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java @@ -11,18 +11,19 @@ import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; +import gregtech.api.enums.Mods; /** * Implement this interface if your GuiContainer supports Drag-And-Drop behavior on NEI. */ -@Optional.Interface(modid = "NotEnoughItems", iface = "codechicken.nei.api.INEIGuiHandler") +@Optional.Interface(modid = Mods.Names.NOT_ENOUGH_ITEMS, iface = "codechicken.nei.api.INEIGuiHandler") public interface IDragAndDropSupport extends INEIGuiHandler { /** * Implement this to handle Drag-And-Drop behavior. This may be invoked on normal click too * ({@code isGhost==false}), so be careful if your slot supports both Drag-And-Drop and other behaviors e.g. fluid * I/O with FluidDisplay click - * + * * @param gui Current gui instance. Make sure to check if it is an instance of your GuiContainer. * @param mousex X position of the mouse * @param mousey Y position of the mouse diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java index d69d6d93b9..2ddf82c342 100644 --- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java +++ b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java @@ -1,6 +1,6 @@ package gregtech.api.items; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import java.util.List; import java.util.Map; @@ -84,7 +84,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister aIconRegister) { - this.itemIcon = aIconRegister.registerIcon(RES_PATH_ITEM + getUnlocalizedName()); + this.itemIcon = aIconRegister.registerIcon(GregTech.getResourcePath(getUnlocalizedName())); } @Override diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java index 03e42a1b41..66b19d9ddf 100644 --- a/src/main/java/gregtech/api/items/GT_Generic_Item.java +++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java @@ -1,7 +1,6 @@ package gregtech.api.items; -import static gregtech.api.enums.GT_Values.MOD_ID; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import java.util.List; @@ -55,7 +54,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem { aWriteToolTipIntoLangFile); else mTooltip = null; setCreativeTab(GregTech_API.TAB_GREGTECH); - GameRegistry.registerItem(this, mName, MOD_ID); + GameRegistry.registerItem(this, mName, GregTech.ID); BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense()); } @@ -77,7 +76,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister aIconRegister) { - mIcon = aIconRegister.registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : mName)); + mIcon = aIconRegister.registerIcon(GregTech.getResourcePath(GT_Config.troll ? "troll" : mName)); } @Override diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java index 7d70ae1c8e..74cda91f44 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -1,7 +1,9 @@ package gregtech.api.items; -import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.AppleCore; +import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.enums.Mods.AppleCore; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +29,7 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IFoodStat; @@ -56,7 +59,7 @@ import gregtech.common.render.items.GT_GeneratedMaterial_Renderer; * These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike * Item. */ -@Optional.Interface(iface = "squeek.applecore.api.food.IEdible", modid = MOD_ID_APC) +@Optional.Interface(iface = "squeek.applecore.api.food.IEdible", modid = Mods.Names.APPLE_CORE) public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements IGT_ItemWithMaterialRenderer, IEdible { /** @@ -342,7 +345,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements } @Override - @Optional.Method(modid = MOD_ID_APC) + @Optional.Method(modid = Mods.Names.APPLE_CORE) public FoodValues getFoodValues(ItemStack aStack) { IFoodStat tStat = mFoodStats.get((short) getDamage(aStack)); return tStat == null ? null @@ -376,10 +379,10 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements for (short i = 0; i < j; i++) if (mEnabledItems.get(i)) { for (byte k = 1; k < mIconList[i].length; k++) { mIconList[i][k] = aIconRegister.registerIcon( - RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i + "/" + k)); + GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i + "/" + k)); } mIconList[i][0] = aIconRegister.registerIcon( - RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } } 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) { diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java index 34c6899c1e..37a3749c8f 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java @@ -1,7 +1,5 @@ package gregtech.api.multitileentity.interfaces; -import static gregtech.api.enums.GT_Values.MOD_ID_APC; - import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -21,6 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.tileentity.*; import gregtech.api.multitileentity.MultiTileEntityBlockInternal; import gregtech.api.multitileentity.MultiTileEntityItemInternal; @@ -242,7 +241,7 @@ public interface IMultiTileEntity interface IMTE_GetFoodValues extends IMultiTileEntity { - @Optional.Method(modid = MOD_ID_APC) + @Optional.Method(modid = Mods.Names.APPLE_CORE) squeek.applecore.api.food.FoodValues getFoodValues(MultiTileEntityItemInternal aItem, ItemStack aStack); } diff --git a/src/main/java/gregtech/api/objects/GT_Fluid.java b/src/main/java/gregtech/api/objects/GT_Fluid.java index db240479de..1f82f412e5 100644 --- a/src/main/java/gregtech/api/objects/GT_Fluid.java +++ b/src/main/java/gregtech/api/objects/GT_Fluid.java @@ -1,6 +1,6 @@ package gregtech.api.objects; -import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK; +import static gregtech.api.enums.Mods.GregTech; import net.minecraftforge.fluids.Fluid; @@ -31,6 +31,6 @@ public class GT_Fluid extends Fluid implements Runnable { @Override public void run() { - setIcons(GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "fluids/fluid." + mTextureName)); + setIcons(GregTech_API.sBlockIcons.registerIcon(GregTech.getResourcePath("fluids", "fluid." + mTextureName))); } } diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index a586ad672e..12e6b86019 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -1,7 +1,7 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; -import static gregtech.api.enums.ModIDs.IC2CropPlugin; +import static gregtech.api.enums.Mods.IC2CropPlugin; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; diff --git a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java b/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java index afbcf6145f..bfc6daf45f 100644 --- a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java +++ b/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java @@ -1,5 +1,7 @@ package gregtech.api.util; +import static gregtech.api.enums.Mods.GregTech; + import java.io.DataInput; import java.io.DataInputStream; import java.io.DataOutput; @@ -285,7 +287,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID w.getSaveHandler() .getWorldDirectory(), w.provider.getSaveFolder()); - return new File(base, "gregtech"); + return new File(base, GregTech.ID); } public interface IData { diff --git a/src/main/java/gregtech/api/util/GT_ModReference.java b/src/main/java/gregtech/api/util/GT_ModReference.java index 02a1116f68..d0b2314764 100644 --- a/src/main/java/gregtech/api/util/GT_ModReference.java +++ b/src/main/java/gregtech/api/util/GT_ModReference.java @@ -1,15 +1,15 @@ package gregtech.api.util; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Railcraft; import cpw.mods.fml.common.Loader; @Deprecated // use gregtech.api.enums.ModIDs instead public enum GT_ModReference { - RAILCRAFT(Railcraft.modID), - GTPP(GTPlusPlus.modID),; + RAILCRAFT(Railcraft.ID), + GTPP(GTPlusPlus.ID),; private final boolean loaded; private final String modID; diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index ba78931129..eedd568ebb 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1,9 +1,10 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.NEICustomDiagrams; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.NEICustomDiagrams; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; import static gregtech.api.util.GT_RecipeMapUtil.*; import static gregtech.api.util.GT_Utility.formatNumbers; @@ -1085,12 +1086,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> { */ public static final Map<String, GT_Recipe_Map> sIndexedMappings = new HashMap<>(); + static final String TEXTURES_GUI_BASICMACHINES = "textures/gui/basicmachines"; public static final GT_Recipe_Map sOreWasherRecipes = new GT_Recipe_Map( new HashSet<>(500), "gt.recipe.orewasher", "Ore Washing Plant", null, - RES_PATH_GUI + "basicmachines/OreWasher", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "OreWasher"), 1, 3, 1, @@ -1109,7 +1111,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.thermalcentrifuge", "Thermal Centrifuge", null, - RES_PATH_GUI + "basicmachines/ThermalCentrifuge", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ThermalCentrifuge"), 1, 3, 1, @@ -1128,7 +1130,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.compressor", "Compressor", null, - RES_PATH_GUI + "basicmachines/Compressor", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Compressor"), 1, 1, 1, @@ -1148,7 +1150,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.extractor", "Extractor", null, - RES_PATH_GUI + "basicmachines/Extractor", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Extractor"), 1, 1, 1, @@ -1168,7 +1170,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "ic.recipe.recycler", "Recycler", "ic2.recycler", - RES_PATH_GUI + "basicmachines/Recycler", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Recycler"), 1, 1, 1, @@ -1185,7 +1187,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "mc.recipe.furnace", "Furnace", "smelting", - RES_PATH_GUI + "basicmachines/E_Furnace", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "E_Furnace"), 1, 1, 1, @@ -1204,7 +1206,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.microwave", "Microwave", "smelting", - RES_PATH_GUI + "basicmachines/E_Furnace", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "E_Furnace"), 1, 1, 1, @@ -1223,7 +1225,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.disassembler", "Disassembler", null, - RES_PATH_GUI + "basicmachines/Disassembler", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Disassembler"), 1, 9, 1, @@ -1257,7 +1259,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.scanner", "Scanner", null, - RES_PATH_GUI + "basicmachines/Scanner", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Scanner"), 1, 1, 1, @@ -1275,7 +1277,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.rockbreaker", "Rock Breaker", null, - RES_PATH_GUI + "basicmachines/RockBreaker", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "RockBreaker"), 2, 1, 0, @@ -1293,7 +1295,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.byproductlist", "Ore Byproduct List", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 6, 1, @@ -1309,7 +1311,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.replicator", "Replicator", null, - RES_PATH_GUI + "basicmachines/Replicator", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Replicator"), 0, 1, 0, @@ -1324,14 +1326,15 @@ public class GT_Recipe implements Comparable<GT_Recipe> { .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_ORB) .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); // public static final GT_Recipe_Map sAssemblylineFakeRecipes = new GT_Recipe_Map(new HashSet<>(30), - // "gt.recipe.scanner", "Scanner", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 1, 0, 1, E, 1, E, true, + // "gt.recipe.scanner", "Scanner", null, Mods.GregTech.getResourcePath(BASIC_MACHINES, "Default"), 1, 1, 1, 0, + // 1, E, 1, E, true, // true); public static final GT_Recipe_Map sAssemblylineVisualRecipes = new GT_Recipe_Map_AssemblyLineFake( new HashSet<>(110), "gt.recipe.fakeAssemblylineProcess", "Assemblyline Process", null, - RES_PATH_GUI + "FakeAssemblyline", + GregTech.getResourcePath("textures", "gui", "FakeAssemblyline"), 16, 1, 1, @@ -1352,7 +1355,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.plasmaarcfurnace", "Plasma Arc Furnace", null, - RES_PATH_GUI + "basicmachines/PlasmaArcFurnace", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "PlasmaArcFurnace"), 1, 4, 1, @@ -1372,7 +1375,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.arcfurnace", "Arc Furnace", null, - RES_PATH_GUI + "basicmachines/ArcFurnace", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ArcFurnace"), 1, 4, 1, @@ -1389,7 +1392,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.printer", "Printer", null, - RES_PATH_GUI + "basicmachines/Printer", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Printer"), 1, 1, 1, @@ -1409,7 +1412,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.sifter", "Sifter", null, - RES_PATH_GUI + "basicmachines/Sifter", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Sifter"), 1, 9, 0, @@ -1426,7 +1429,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.press", "Forming Press", null, - RES_PATH_GUI + "basicmachines/Press3", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Press3"), 6, 1, 2, @@ -1446,7 +1449,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.laserengraver", "Precision Laser Engraver", null, - RES_PATH_GUI + "basicmachines/LaserEngraver2", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LaserEngraver2"), 4, 4, 0, @@ -1466,7 +1469,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.mixer", "Mixer", null, - RES_PATH_GUI + "basicmachines/Mixer6", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Mixer6"), 9, 4, 1, @@ -1485,7 +1488,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.autoclave", "Autoclave", null, - RES_PATH_GUI + "basicmachines/Autoclave4", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Autoclave4"), 2, 4, 1, @@ -1505,7 +1508,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.electromagneticseparator", "Electromagnetic Separator", null, - RES_PATH_GUI + "basicmachines/ElectromagneticSeparator", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ElectromagneticSeparator"), 1, 3, 1, @@ -1524,7 +1527,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.polarizer", "Electromagnetic Polarizer", null, - RES_PATH_GUI + "basicmachines/Polarizer", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Polarizer"), 1, 1, 1, @@ -1541,7 +1544,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.macerator", "Pulverization", null, - RES_PATH_GUI + "basicmachines/Macerator4", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Macerator4"), 1, 4, 1, @@ -1563,7 +1566,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.chemicalbath", "Chemical Bath", null, - RES_PATH_GUI + "basicmachines/ChemicalBath", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ChemicalBath"), 1, 3, 1, @@ -1580,7 +1583,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fluidcanner", "Fluid Canning Machine", null, - RES_PATH_GUI + "basicmachines/FluidCanner", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "FluidCanner"), 1, 1, 1, @@ -1599,7 +1602,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.brewer", "Brewing Machine", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "PotionBrewer"), 1, 0, 1, @@ -1617,7 +1620,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fluidheater", "Fluid Heater", null, - RES_PATH_GUI + "basicmachines/FluidHeater", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "FluidHeater"), 1, 0, 0, @@ -1636,7 +1639,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.distillery", "Distillery", null, - RES_PATH_GUI + "basicmachines/Distillery", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Distillery"), 1, 1, 1, @@ -1698,7 +1701,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fermenter", "Fermenter", null, - RES_PATH_GUI + "basicmachines/Fermenter", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Fermenter"), 0, 0, 0, @@ -1715,7 +1718,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fluidsolidifier", "Fluid Solidifier", null, - RES_PATH_GUI + "basicmachines/FluidSolidifier", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "FluidSolidifier"), 1, 1, 1, @@ -1745,7 +1748,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fluidextractor", "Fluid Extractor", null, - RES_PATH_GUI + "basicmachines/FluidExtractor", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "FluidExtractor"), 1, 1, 1, @@ -1775,7 +1778,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.packager", "Packager", null, - RES_PATH_GUI + "basicmachines/Packager", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Packager"), 2, 1, 2, @@ -1794,7 +1797,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.unpackager", "Unpackager", null, - RES_PATH_GUI + "basicmachines/Unpackager", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Unpackager"), 1, 2, 1, @@ -1815,7 +1818,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fusionreactor", "Fusion Reactor", null, - RES_PATH_GUI + "basicmachines/FusionReactor", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "FusionReactor"), 0, 0, 0, @@ -1839,7 +1842,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.complexfusionreactor", "Complex Fusion Reactor", null, - RES_PATH_GUI + "basicmachines/ComplexFusionReactor", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ComplexFusionReactor"), 3, 0, 0, @@ -1861,7 +1864,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.centrifuge", "Centrifuge", null, - RES_PATH_GUI + "basicmachines/Centrifuge", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Centrifuge"), 2, 6, 0, @@ -1881,7 +1884,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.electrolyzer", "Electrolyzer", null, - RES_PATH_GUI + "basicmachines/Electrolyzer", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Electrolyzer"), 2, 6, 0, @@ -1904,7 +1907,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.blastfurnace", "Blast Furnace", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 6, 6, 1, @@ -1925,7 +1928,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.plasmaforge", "DTPF", null, - RES_PATH_GUI + "basicmachines/PlasmaForge", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "PlasmaForge"), 9, 9, 0, @@ -1946,7 +1949,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.transcendentplasmamixerrecipes", "Transcendent Plasma Mixer", null, - RES_PATH_GUI + "basicmachines/PlasmaForge", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "PlasmaForge"), 1, 0, 0, @@ -1974,7 +1977,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fakespaceprojects", "Space Projects", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 12, 0, 0, @@ -2157,7 +2160,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.primitiveblastfurnace", "Primitive Blast Furnace", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 3, 3, 1, @@ -2202,11 +2205,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { } if (GTPlusPlus.isModLoaded()) { ItemStack cactusCoke = GT_ModHandler.getModItem( - GTPlusPlus.modID, + GTPlusPlus.ID, "itemCactusCoke", aCoalAmount * 2L); ItemStack sugarCoke = GT_ModHandler.getModItem( - GTPlusPlus.modID, + GTPlusPlus.ID, "itemSugarCoke", aCoalAmount * 2L); coll.derive() @@ -2254,7 +2257,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.implosioncompressor", "Implosion Compressor", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 2, 2, 2, @@ -2311,7 +2314,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.vacuumfreezer", "Vacuum Freezer", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2353,7 +2356,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.chemicalreactor", "Chemical Reactor", null, - RES_PATH_GUI + "basicmachines/ChemicalReactor", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "ChemicalReactor"), 2, 2, 1, @@ -2404,7 +2407,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.pyro", "Pyrolyse Oven", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 2, 1, 1, @@ -2422,7 +2425,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.wiremill", "Wiremill", null, - RES_PATH_GUI + "basicmachines/Wiremill", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Wiremill"), 2, 1, 1, @@ -2440,7 +2443,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.metalbender", "Bending Machine", null, - RES_PATH_GUI + "basicmachines/Bender", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Bender"), 2, 1, 2, @@ -2458,7 +2461,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.alloysmelter", "Alloy Smelter", null, - RES_PATH_GUI + "basicmachines/AlloySmelter", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "AlloySmelter"), 2, 1, 2, @@ -2495,7 +2498,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.assembler", "Assembler", null, - RES_PATH_GUI + "basicmachines/Assembler2", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Assembler2"), 9, 1, 1, @@ -2513,7 +2516,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.circuitassembler", "Circuit Assembler", null, - RES_PATH_GUI + "basicmachines/CircuitAssembler", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "CircuitAssembler"), 6, 1, 1, @@ -2532,7 +2535,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.canner", "Canning Machine", null, - RES_PATH_GUI + "basicmachines/Canner", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Canner"), 2, 2, 1, @@ -2552,7 +2555,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.cncmachine", "CNC Machine", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 2, 1, 2, @@ -2568,7 +2571,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.lathe", "Lathe", null, - RES_PATH_GUI + "basicmachines/Lathe", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Lathe"), 1, 2, 1, @@ -2589,7 +2592,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.cuttingsaw", "Cutting Machine", null, - RES_PATH_GUI + "basicmachines/Cutter4", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Cutter4"), 2, 4, 1, @@ -2634,7 +2637,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.slicer", "Slicing Machine", null, - RES_PATH_GUI + "basicmachines/Slicer", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Slicer"), 2, 1, 2, @@ -2654,7 +2657,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.extruder", "Extruder", null, - RES_PATH_GUI + "basicmachines/Extruder", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Extruder"), 2, 1, 2, @@ -2673,7 +2676,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.hammer", "Forge Hammer", null, - RES_PATH_GUI + "basicmachines/Hammer", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Hammer"), 2, 2, 1, @@ -2697,7 +2700,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.uuamplifier", "Amplifabricator", null, - RES_PATH_GUI + "basicmachines/Amplifabricator", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Amplifabricator"), 1, 0, 1, @@ -2716,7 +2719,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.massfab", "Mass Fabrication", null, - RES_PATH_GUI + "basicmachines/Massfabricator", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Massfabricator"), 1, 0, 1, @@ -2734,7 +2737,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.dieselgeneratorfuel", "Combustion Generator Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2750,7 +2753,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.extremedieselgeneratorfuel", "Extreme Diesel Engine Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2766,7 +2769,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.gasturbinefuel", "Gas Turbine Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2782,7 +2785,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.thermalgeneratorfuel", "Thermal Generator Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2798,7 +2801,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.semifluidboilerfuels", "Semifluid Boiler Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2814,7 +2817,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.plasmageneratorfuels", "Plasma Generator Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2830,7 +2833,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.magicfuels", "Magic Energy Absorber Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2846,7 +2849,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.smallnaquadahreactor", "Naquadah Reactor MkI", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2862,7 +2865,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.largenaquadahreactor", "Naquadah Reactor MkII", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2878,7 +2881,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fluidnaquadahreactor", "Naquadah Reactor MkIII", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2894,7 +2897,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.hugenaquadahreactor", "Naquadah Reactor MkIV", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2910,7 +2913,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.extrahugenaquadahreactor", "Naquadah Reactor MkV", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2926,7 +2929,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.fluidfuelnaquadahreactor", "Fluid Naquadah Reactor", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 0, @@ -2942,7 +2945,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.largeelectrolyzer", "Large(PA) Electrolyzer", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LCRNEI"), 1, 9, 0, @@ -2959,7 +2962,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.largecentrifuge", "Large(PA) Centrifuge", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LCRNEI"), 1, 9, 0, @@ -2976,7 +2979,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.largemixer", "Large(PA) Mixer", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LCRNEI"), 9, 3, 0, @@ -2999,7 +3002,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.nanoforge", "Nano Forge", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LCRNEI"), 6, 2, 2, @@ -3020,7 +3023,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.pcbfactory", "PCB Factory", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LCRNEI"), 6, 9, 3, @@ -3275,7 +3278,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { aMinimalInputFluids, aMinimalInputItems); progressBarTexture = new FallbackableUITexture( - UITexture.fullImage("gregtech", "gui/progressbar/" + mUnlocalizedName), + UITexture.fullImage(GregTech.ID, "gui/progressbar/" + mUnlocalizedName), GT_UITextures.PROGRESSBAR_ARROW); colorOverride = GT_GUIColorOverride.get(ModularUITextures.VANILLA_BACKGROUND.location); if (sIndexedMappings.put(mUniqueIdentifier, this) != null) @@ -3378,7 +3381,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public GT_Recipe_Map setProgressBar(UITexture progressBarTexture, ProgressBar.Direction progressBarDirection) { return setProgressBarWithFallback( new FallbackableUITexture( - UITexture.fullImage("gregtech", "gui/progressbar/" + mUnlocalizedName), + UITexture.fullImage(GregTech.ID, "gui/progressbar/" + mUnlocalizedName), progressBarTexture), progressBarDirection); } @@ -3402,7 +3405,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public GT_Recipe_Map setProgressBarSteam(SteamTexture progressBarTexture) { return setProgressBarSteamWithFallback( new FallbackableSteamTexture( - SteamTexture.fullImage("gregtech", "gui/progressbar/" + mUnlocalizedName + "_%s"), + SteamTexture.fullImage(GregTech.ID, "gui/progressbar/" + mUnlocalizedName + "_%s"), progressBarTexture)); } @@ -5946,7 +5949,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.largeboilerfakefuels", "Large Boiler", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 1, @@ -6090,7 +6093,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.ic2nuke", "Fission", null, - RES_PATH_GUI + "basicmachines/Default", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "Default"), 1, 1, 1, @@ -6156,7 +6159,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "LCRNEI"), TOTAL_INPUT_COUNT, OUTPUT_COUNT, 0, @@ -6276,7 +6279,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.distillationtower", "Distillation Tower", null, - RES_PATH_GUI + "basicmachines/DistillationTower", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "DistillationTower"), 2, 1, 0, @@ -6327,7 +6330,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gt.recipe.craker", "Oil Cracker", null, - RES_PATH_GUI + "basicmachines/OilCracker", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "OilCracker"), 1, 1, 1, diff --git a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java b/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java index 54a2c5a692..542821ecbb 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java +++ b/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java @@ -1,5 +1,6 @@ package gregtech.api.util; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.util.GT_Config.getStackConfigName; import static gregtech.api.util.GT_Utility.isArrayEmptyOrNull; @@ -132,7 +133,7 @@ public class GT_RecipeMapUtil { String modId = Loader.instance() .activeModContainer() .getModId(); - if ("gregtech".equals(modId)) throw new IllegalStateException( + if (GregTech.ID.equals(modId)) throw new IllegalStateException( "do not register recipe map under the name of gregtech! do it in your own preinit!"); String id = modId + "@" + identifier; addonRecipeMaps.put(id, recipeMap); |