diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-04 13:57:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 13:57:15 +0200 |
| commit | 9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca (patch) | |
| tree | 72a719f446d59538cc51768cf780ba142d3512f2 /src/main/java | |
| parent | 769168bf3db04d09bcb8566e72b0dddb64157e7d (diff) | |
| download | GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.tar.gz GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.tar.bz2 GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.zip | |
Modid work (#1833)
* add all mods founds in NHCore
* depracte old strings
* add ars magica 2
* more enum work
* use a switch
* spotless
* more mod id rework
* more mod id rework
* more mod id rework
* should be last
* spotless
* rename to make more sense
* add path attribute
* add getResourcePath to enum
* spotless
Diffstat (limited to 'src/main/java')
116 files changed, 2583 insertions, 2238 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 7d239263b0..5a7bee508b 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -1,7 +1,7 @@ package gregtech; import static gregtech.api.GregTech_API.registerCircuitProgrammer; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import java.io.PrintWriter; import java.io.StringWriter; @@ -93,7 +93,7 @@ import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeOutput; @Mod( - modid = "gregtech", + modid = Mods.Names.GREG_TECH, name = "GregTech", version = "MC1710", guiFactory = "gregtech.client.GT_GuiFactory", @@ -148,10 +148,13 @@ public class GT_Mod implements IGT_Mod { @Deprecated public static final int REQUIRED_IC2 = 624; - @Mod.Instance("gregtech") + @Mod.Instance(Mods.Names.GREG_TECH) public static GT_Mod instance; - @SidedProxy(modId = "gregtech", clientSide = "gregtech.common.GT_Client", serverSide = "gregtech.common.GT_Server") + @SidedProxy( + modId = Mods.Names.GREG_TECH, + clientSide = "gregtech.common.GT_Client", + serverSide = "gregtech.common.GT_Server") public static GT_Proxy gregtechproxy; public static int MAX_IC2 = 2147483647; @@ -331,7 +334,7 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.registerUnificationEntries(); new GT_FuelLoader().run(); } - if (ModIDs.Waila.isModLoaded()) { + if (Mods.Waila.isModLoaded()) { Waila.init(); } IMCForNEI.IMCSender(); 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); diff --git a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java index cf9b2fd8f9..2a2c321fc7 100644 --- a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java +++ b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java @@ -1,5 +1,7 @@ package gregtech.client; +import static gregtech.api.enums.Mods.GregTech; + import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -20,7 +22,7 @@ public class GT_GUI_ClientConfig extends GuiConfig { super( parentScreen, getConfigElements(), - "gregtech", + GregTech.ID, "client", false, false, diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 505fa1a96d..af7a4a6c00 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -7,7 +7,8 @@ package gregtech.common; import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES; import static gregtech.api.enums.GT_Values.calculateMaxPlasmaTurbineEfficiency; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GregTech; import static org.lwjgl.opengl.GL11.GL_LINE_LOOP; import java.net.URL; @@ -761,7 +762,7 @@ public class GT_Client extends GT_Proxy implements Runnable { @SubscribeEvent public void onConfigChange(ConfigChangedEvent.OnConfigChangedEvent e) { - if ("gregtech".equals(e.modID) && "client".equals(e.configID)) { + if (GregTech.ID.equals(e.modID) && "client".equals(e.configID)) { GregTech_API.sClientDataFile.mConfig.save(); // refresh client preference and send to server, since it's the only config we allow changing at runtime. mPreference = new GT_ClientPreference(GregTech_API.sClientDataFile); diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index df8d0bb39b..ef5a893f5e 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -5,10 +5,9 @@ import static gregtech.api.enums.FluidState.GAS; import static gregtech.api.enums.FluidState.LIQUID; import static gregtech.api.enums.FluidState.MOLTEN; import static gregtech.api.enums.FluidState.PLASMA; -import static gregtech.api.enums.GT_Values.MOD_ID; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.debugEntityCramming; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY; import java.io.File; @@ -574,8 +573,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public int mTicksUntilNextCraftSound = 0; public double mMagneticraftBonusOutputPercent = 0d; private World mUniverse = null; - private final String aTextForestry = "Forestry"; - private final String aTextArsmagica2 = "arsmagica2"; public boolean mTEMachineRecipes = false; public boolean mEnableAllMaterials = false; public boolean mEnableAllComponents = false; @@ -792,62 +789,62 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } } GT_Log.out.println("GT_Mod: Getting required Items of other Mods."); - ItemList.TE_Slag.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "slag", 1L)); - ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "slagRich", 1L)); - ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "rockwool", 1L)); - ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "glassHardened", 1L)); - - ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.modID, "machine.delta", 1L, 0)); - ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.modID, "frame", 1L, 0)); - ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 0)); - ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 1)); - ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 2)); - ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 3)); - ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 4)); - ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 5)); - ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(Railcraft.modID, "part.tie", 1L, 0)); - ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(Railcraft.modID, "part.tie", 1L, 1)); - ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(Railcraft.modID, "part.railbed", 1L, 0)); - ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(Railcraft.modID, "part.railbed", 1L, 1)); - ItemList.RC_Rebar.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rebar", 1L)); - ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(Thaumcraft.modID, "ItemThaumometer", 1L, 0)); - ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.sword", 1L)); - ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.pickaxe", 1L)); - ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.shovel", 1L)); - ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.axe", 1L)); - ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.hoe", 1L)); - - ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.liveRoot", 1L, 0)); - ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.fieryBlood", 1L)); - ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.fieryTears", 1L)); - - ItemList.FR_Lemon.set(GT_ModHandler.getModItem(aTextForestry, "fruits", 1L, 3)); - ItemList.FR_Mulch.set(GT_ModHandler.getModItem(aTextForestry, "mulch", 1L)); - ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem(aTextForestry, "fertilizerCompound", 1L)); - ItemList.FR_Compost.set(GT_ModHandler.getModItem(aTextForestry, "fertilizerBio", 1L)); - ItemList.FR_Silk.set(GT_ModHandler.getModItem(aTextForestry, "craftingMaterial", 1L, 2)); - ItemList.FR_Wax.set(GT_ModHandler.getModItem(aTextForestry, "beeswax", 1L)); - ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem(aTextForestry, "waxCapsule", 1L)); - ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem(aTextForestry, "refractoryWax", 1L)); - ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem(aTextForestry, "refractoryEmpty", 1L)); - ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem(aTextForestry, "beeDroneGE", 1L)); - ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem(aTextForestry, "beePrincessGE", 1L)); - ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem(aTextForestry, "beeQueenGE", 1L)); + ItemList.TE_Slag.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "slag", 1L)); + ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "slagRich", 1L)); + ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "rockwool", 1L)); + ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "glassHardened", 1L)); + + ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.ID, "machine.delta", 1L, 0)); + ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.ID, "frame", 1L, 0)); + ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 0)); + ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 1)); + ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 2)); + ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 3)); + ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 4)); + ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 5)); + ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 0)); + ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 1)); + ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 0)); + ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 1)); + ItemList.RC_Rebar.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rebar", 1L)); + ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemThaumometer", 1L, 0)); + ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.sword", 1L)); + ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.pickaxe", 1L)); + ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.shovel", 1L)); + ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.axe", 1L)); + ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.hoe", 1L)); + + ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.liveRoot", 1L, 0)); + ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryBlood", 1L)); + ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryTears", 1L)); + + ItemList.FR_Lemon.set(GT_ModHandler.getModItem(Forestry.ID, "fruits", 1L, 3)); + ItemList.FR_Mulch.set(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1L)); + ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem(Forestry.ID, "fertilizerCompound", 1L)); + ItemList.FR_Compost.set(GT_ModHandler.getModItem(Forestry.ID, "fertilizerBio", 1L)); + ItemList.FR_Silk.set(GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 2)); + ItemList.FR_Wax.set(GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L)); + ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1L)); + ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L)); + ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1L)); + ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem(Forestry.ID, "beeDroneGE", 1L)); + ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem(Forestry.ID, "beePrincessGE", 1L)); + ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem(Forestry.ID, "beeQueenGE", 1L)); ItemList.FR_Tree_Sapling.set( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "sapling", 1L, - GT_ModHandler.getModItem(aTextForestry, "saplingGE", 1L))); - ItemList.FR_Butterfly.set(GT_ModHandler.getModItem(aTextForestry, "butterflyGE", 1L)); - ItemList.FR_Larvae.set(GT_ModHandler.getModItem(aTextForestry, "beeLarvaeGE", 1L)); - ItemList.FR_Serum.set(GT_ModHandler.getModItem(aTextForestry, "serumGE", 1L)); - ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem(aTextForestry, "caterpillarGE", 1L)); - ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem(aTextForestry, "pollenFertile", 1L)); - ItemList.FR_Stick.set(GT_ModHandler.getModItem(aTextForestry, "oakStick", 1L)); - ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem(aTextForestry, "impregnatedCasing", 1L)); - ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem(aTextForestry, "sturdyMachine", 1L)); - ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem(aTextForestry, "hardenedMachine", 1L)); + GT_ModHandler.getModItem(Forestry.ID, "saplingGE", 1L))); + ItemList.FR_Butterfly.set(GT_ModHandler.getModItem(Forestry.ID, "butterflyGE", 1L)); + ItemList.FR_Larvae.set(GT_ModHandler.getModItem(Forestry.ID, "beeLarvaeGE", 1L)); + ItemList.FR_Serum.set(GT_ModHandler.getModItem(Forestry.ID, "serumGE", 1L)); + ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem(Forestry.ID, "caterpillarGE", 1L)); + ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem(Forestry.ID, "pollenFertile", 1L)); + ItemList.FR_Stick.set(GT_ModHandler.getModItem(Forestry.ID, "oakStick", 1L)); + ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem(Forestry.ID, "impregnatedCasing", 1L)); + ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem(Forestry.ID, "sturdyMachine", 1L)); + ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem(Forestry.ID, "hardenedMachine", 1L)); ItemList.Bottle_Empty.set(new ItemStack(Items.glass_bottle, 1)); @@ -968,52 +965,45 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.diamond", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.steel", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.iron", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.legsNaga", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticHelm", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticPlate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.steel", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.iron", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticLegs", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiHelm", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiLegs", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiBoots", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristHelmet", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristChest", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameUntreated", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameImpregnated", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameProven", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "waxCast", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristHelmet", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristChest", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameUntreated", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameImpregnated", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameProven", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "waxCast", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); + GT_ModHandler.getModItem(IC2NuclearControl.ID, "ItemToolThermometer", 1L, 32767)); RecipeSorter.register( "gregtech:shaped", @@ -1035,38 +1025,38 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.ore.println("GT_Mod: Beginning Load-Phase."); GT_OreDictUnificator.registerOre( "cropChilipepper", - GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); + GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 2)); GT_OreDictUnificator.registerOre( "cropTomato", - GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); + GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 8)); GT_OreDictUnificator.registerOre( "cropGrape", - GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); - GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); + GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 4)); + GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem(GanysSurface.ID, "teaLeaves", 1L, 0)); // Clay buckets, which don't get registered until Iguana Tweaks pre-init if (IguanaTweaksTinkerConstruct.isModLoaded()) { OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem( - IguanaTweaksTinkerConstruct.modID, + IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Empty, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Water, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketWater", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketWater", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Lava, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketLava", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketLava", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Milk, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketMilk", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketMilk", 1L, 0)); FluidContainerRegistry.registerFluidContainer( new FluidContainerRegistry.FluidContainerData( @@ -1093,64 +1083,64 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG addFullHazmatToIC2Item("quantumBoots"); // GraviSuite Hazmat - addFullHazmatToGeneralItem("GraviSuite", "graviChestPlate", 1L); - addFullHazmatToGeneralItem("GraviSuite", "advNanoChestPlate", 1L); + addFullHazmatToGeneralItem(GraviSuite.ID, "graviChestPlate", 1L); + addFullHazmatToGeneralItem(GraviSuite.ID, "advNanoChestPlate", 1L); // EMT Hazmat - addFullHazmatToGeneralItem("EMT", "itemArmorQuantumChestplate", 1L); - addFullHazmatToGeneralItem("EMT", "NanoBootsTraveller", 1L); - addFullHazmatToGeneralItem("EMT", "NanosuitGogglesRevealing", 1L); - addFullHazmatToGeneralItem("EMT", "QuantumBootsTraveller", 1L); - addFullHazmatToGeneralItem("EMT", "QuantumGogglesRevealing", 1L); - addFullHazmatToGeneralItem("EMT", "SolarHelmetRevealing", 1L); - addFullHazmatToGeneralItem("EMT", "NanosuitWing", 1L); - addFullHazmatToGeneralItem("EMT", "QuantumWing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "itemArmorQuantumChestplate", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "NanoBootsTraveller", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "NanosuitGogglesRevealing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "QuantumBootsTraveller", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "QuantumGogglesRevealing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "SolarHelmetRevealing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "NanosuitWing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "QuantumWing", 1L); // DraconicEvolution Hazmat - addFullHazmatToGeneralItem("DraconicEvolution", "draconicBoots", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "draconicHelm", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "draconicLeggs", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "draconicChest", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernBoots", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernHelm", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernLeggs", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernChest", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicBoots", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicHelm", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicLeggs", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicChest", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernBoots", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernHelm", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernLeggs", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernChest", 1L, 0); // AdvancedSolarPanel - addFullHazmatToGeneralItem("AdvancedSolarPanel", "advanced_solar_helmet", 1L); - addFullHazmatToGeneralItem("AdvancedSolarPanel", "hybrid_solar_helmet", 1L); - addFullHazmatToGeneralItem("AdvancedSolarPanel", "ultimate_solar_helmet", 1L); + addFullHazmatToGeneralItem(AdvancedSolarPanel.ID, "advanced_solar_helmet", 1L); + addFullHazmatToGeneralItem(AdvancedSolarPanel.ID, "hybrid_solar_helmet", 1L); + addFullHazmatToGeneralItem(AdvancedSolarPanel.ID, "ultimate_solar_helmet", 1L); // TaintedMagic Hazmat - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidwalkerBoots", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressHelmet", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressChestplate", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressLeggings", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressHelmet", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressChestplate", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressLeggings", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidmetalGoggles", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidwalkerBoots", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemShadowFortressHelmet", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemShadowFortressChestplate", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemShadowFortressLeggings", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidFortressHelmet", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidFortressChestplate", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidFortressLeggings", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidmetalGoggles", 1L); // WitchingGadgets Hazmat - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialHelm", 1L); - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialChest", 1L); - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialLegs", 1L); - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialBoots", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialHelm", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialChest", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialLegs", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialBoots", 1L); // ThaumicTinkerer Hazmat - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothChestGem", 1L); - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothBootsGem", 1L); - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothHelmGem", 1L); - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothLegsGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothChestGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothBootsGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothHelmGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothLegsGem", 1L); // GalaxySpace Hazmat - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_helmet", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_helmetglasses", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_plate", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_jetplate", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_leg", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_boots", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_gravityboots", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_helmet", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_helmetglasses", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_plate", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_jetplate", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_leg", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_boots", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_gravityboots", 1L); // Extra Hazmat GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_helmet, 1, W)); @@ -1159,20 +1149,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_boots, 1, W)); // Infinity Hazmat - addFullHazmatToGeneralItem("Avaritia", "Infinity_Helm", 1L); - addFullHazmatToGeneralItem("Avaritia", "Infinity_Chest", 1L); - addFullHazmatToGeneralItem("Avaritia", "Infinity_Pants", 1L); - addFullHazmatToGeneralItem("Avaritia", "Infinity_Shoes", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Helm", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Chest", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Pants", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Shoes", 1L); // EnderIO Hazmat - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_helmet", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_chestplate", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_leggings", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_boots", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_helmet", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_chestplate", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_leggings", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_boots", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_helmet", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_chestplate", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_leggings", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_boots", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_helmet", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_chestplate", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_leggings", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_boots", 1L); GregTech_API.sLoadStarted = true; for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { @@ -1592,8 +1582,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId(); String aOriginalMod = aMod; if (GT_OreDictUnificator.isRegisteringOres()) { - aMod = "gregtech"; - } else if (aMod.equals("gregtech")) { + aMod = GregTech.ID; + } else if (aMod.equals(GregTech.ID)) { aMod = "UNKNOWN"; } if ((aEvent == null) || (aEvent.Ore == null) @@ -1603,7 +1593,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG || (aEvent.Name.replaceAll("_", "") .length() - aEvent.Name.length() == 9)) { - if (aOriginalMod.equals("gregtech")) { + if (aOriginalMod.equals(GregTech.ID)) { aOriginalMod = "UNKNOWN"; } GT_Log.ore.println( @@ -1733,7 +1723,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } OrePrefixes aPrefix = OrePrefixes.getOrePrefix(aEvent.Name); Materials aMaterial = Materials._NULL; - if ((aPrefix == OrePrefixes.nugget) && (aMod.equals("Thaumcraft")) + if ((aPrefix == OrePrefixes.nugget) && (aMod.equals(Thaumcraft.ID)) && (aEvent.Ore.getItem() .getUnlocalizedName() .contains("ItemResource"))) { @@ -2702,7 +2692,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { return GT_FluidFactory.builder(aName) .withLocalizedName(aLocalized) - .withStillIconResourceLocation(new ResourceLocation(MOD_ID, "fluids/fluid." + aTexture)) + .withStillIconResourceLocation( + new ResourceLocation(GregTech.ID, "fluids/fluid." + aTexture)) .withColorRGBA(aRGBa) .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) .buildAndRegister() @@ -2733,26 +2724,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { - boolean chkmi = tOre.mModID != null; - if (chkmi) { - if (tOre.mModID.equalsIgnoreCase("enderio") && tOre.mPrefix == OrePrefixes.ingot - && tOre.mMaterial == Materials.DarkSteel) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.Blizz) { + boolean checkModID = tOre.mModID != null; + + if (checkModID) { + switch (tOre.mModID) { + case Names.ENDER_I_O -> { + if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) { GT_OreDictUnificator.addAssociation( tOre.mPrefix, tOre.mMaterial, @@ -2763,219 +2740,187 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), + ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); continue; - } else - if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.Pyrotheum) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.Vinteum) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.BlueTopaz) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.Chimerite) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) - && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.Moonstone) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) - && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.Sunstone) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase("rotarycraft") - && tOre.mPrefix == OrePrefixes.ingot - && tOre.mMaterial == Materials.HSLA) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") - && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.CertusQuartz) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") - && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.CertusQuartz) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append( - tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } + } + } + case Names.THERMAL_FONDATION -> { + if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + case Names.ARS_MAGICA2 -> { + if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.BlueTopaz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Chimerite) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Moonstone) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Sunstone) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + case Names.ROTARY_CRAFT -> { + if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.HSLA) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + case Names.APPLIED_ENERGISTICS2 -> { + if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.CertusQuartz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + default -> {} + } } if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); @@ -2985,17 +2930,15 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, - (chkmi) && (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), + (checkModID) && (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, false)), true); } } } + for (OreDictEventContainer tOre : this.mEvents) { if (((tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 3816973227..89d56baaef 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -1,8 +1,8 @@ package gregtech.common; import static gregtech.GT_Mod.GT_FML_LOGGER; -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 java.util.ArrayList; import java.util.Arrays; @@ -678,7 +678,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe( true, new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.modID, "itemCactusCoke", (aCoalAmount * 2L)) }, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", (aCoalAmount * 2L)) }, new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, null, null, @@ -690,7 +690,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe( true, new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.modID, "itemSugarCoke", (aCoalAmount * 2L)) }, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", (aCoalAmount * 2L)) }, new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, null, null, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java index 7f78fe0bda..e29e7963a8 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java @@ -1,6 +1,6 @@ package gregtech.common.blocks; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.NotEnoughItems; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 098c2f3ebe..64f6b2e8ae 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -1,6 +1,6 @@ package gregtech.common.blocks; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.NotEnoughItems; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java index 4b730ef0ff..2a27ee0cf9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java @@ -1,5 +1,7 @@ package gregtech.common.blocks; +import static gregtech.api.enums.Mods.UndergroundBiomes; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,7 +16,7 @@ import gregtech.api.render.TextureFactory; public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract { - Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "igneousStone"); + Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "igneousStone"); public GT_Block_Ores_UB1() { super("gt.blockores.ub1", 8, true, Material.rock); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java index 890aed5a2c..d7f08f2466 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java @@ -1,5 +1,7 @@ package gregtech.common.blocks; +import static gregtech.api.enums.Mods.UndergroundBiomes; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,7 +16,7 @@ import gregtech.api.render.TextureFactory; public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract { - Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "metamorphicStone"); + Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "metamorphicStone"); public GT_Block_Ores_UB2() { super("gt.blockores.ub2", 8, true, Material.rock); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java index 873902a344..7315d81890 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java @@ -1,5 +1,7 @@ package gregtech.common.blocks; +import static gregtech.api.enums.Mods.UndergroundBiomes; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,7 +16,7 @@ import gregtech.api.render.TextureFactory; public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract { - Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "sedimentaryStone"); + Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "sedimentaryStone"); public GT_Block_Ores_UB3() { super("gt.blockores.ub3", 8, true, Material.rock); diff --git a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java b/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java index f3effb0c99..13ee7f8c8d 100644 --- a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java +++ b/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java @@ -1,6 +1,6 @@ package gregtech.common.fluid; -import static gregtech.api.enums.GT_Values.MOD_ID; +import static gregtech.api.enums.Mods.GregTech; import java.util.Locale; @@ -85,7 +85,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder { */ @Override public IGT_FluidBuilder withTextureName(final String textureName) { - this.stillIconResourceLocation = new ResourceLocation(MOD_ID, "fluids/fluid." + textureName); + this.stillIconResourceLocation = new ResourceLocation(GregTech.ID, "fluids/fluid." + textureName); this.flowingIconResourceLocation = null; return this; } diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 66a6437e98..e970084691 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -1,7 +1,7 @@ package gregtech.common.items; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; import java.util.List; @@ -225,7 +225,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo super.registerIcons(aIconRegister); for (int i = 0; i < mIconDamage.length; i++) { mIconDamage[i] = aIconRegister.registerIcon( - RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } if (GregTech_API.sPostloadFinished) { GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase"); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 7165702f98..7b42dc60f2 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -1,6 +1,6 @@ package gregtech.common.items; -import static gregtech.api.enums.ModIDs.GalacticraftMars; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.client.GT_TooltipHandler.Tier.*; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 7300e59b14..164a5c4ca4 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -1,5 +1,6 @@ package gregtech.common.items; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Textures.BlockIcons.*; import net.minecraft.dispenser.IBlockSource; @@ -46,7 +47,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { public static GT_MetaGenerated_Item_02 INSTANCE; private static final String aTextCover = "Usable as Cover"; - private static final String aTextForestry = "Forestry"; public GT_MetaGenerated_Item_02() { super( @@ -1868,99 +1868,99 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addCraftingRecipe( ItemList.Plank_Larch.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 0) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Teak.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 1) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Acacia_Green.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 2) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 2) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Lime.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 3) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 3) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Chestnut.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 4) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 4) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Wenge.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 5) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 5) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Baobab.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 6) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 6) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Sequoia.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 7) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 7) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Kapok.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 0) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Ebony.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 1) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Mahagony.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 2) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 2) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Balsa.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 3) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 3) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Willow.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 4) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 4) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Walnut.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 5) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 5) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Greenheart.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 6) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 6) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Cherry.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 7) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 7) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Mahoe.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 0) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Poplar.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 1) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Palm.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 2) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 2) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Papaya.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 3) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 3) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Pine.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 4) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 4) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Plum.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 5) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 5) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Maple.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 6) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 6) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Citrus.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 7) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 7) }); GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null); GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null); @@ -1973,7 +1973,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 0, @@ -1985,7 +1985,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 1, @@ -1997,7 +1997,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 2, @@ -2009,7 +2009,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 3, @@ -2021,7 +2021,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 4, @@ -2033,7 +2033,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 5, @@ -2045,7 +2045,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 6, @@ -2057,7 +2057,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 7, @@ -2069,7 +2069,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 8, @@ -2081,7 +2081,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 9, @@ -2093,7 +2093,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 10, @@ -2105,7 +2105,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 11, @@ -2117,7 +2117,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 12, @@ -2129,7 +2129,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 13, @@ -2141,7 +2141,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 14, @@ -2153,7 +2153,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 15, @@ -2165,7 +2165,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 16, @@ -2177,7 +2177,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 17, @@ -2189,7 +2189,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 18, @@ -2201,7 +2201,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 19, @@ -2213,7 +2213,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 20, @@ -2225,7 +2225,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 21, @@ -2237,7 +2237,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 22, @@ -2249,7 +2249,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 23, diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index 63fa279916..069d7acd5b 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -1,6 +1,6 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.util.GT_Utility.formatNumbers; import static ic2.core.util.LiquidUtil.drainContainerStack; import static ic2.core.util.LiquidUtil.fillContainerStack; @@ -142,7 +142,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister aIconRegister) { super.registerIcons(aIconRegister); - iconWindow = aIconRegister.registerIcon(RES_PATH_ITEM + "gt." + unlocalFlaskName + ".window"); + iconWindow = aIconRegister.registerIcon(GregTech.getResourcePath("gt." + unlocalFlaskName + ".window")); } public void setCapacity(ItemStack stack, int capacity) { diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 5d4d624513..c3000b9fc7 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -1,7 +1,7 @@ package gregtech.common.items; import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import java.util.Arrays; import java.util.List; @@ -44,7 +44,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.comb"); - GameRegistry.registerItem(this, "gt.comb", MOD_ID); + GameRegistry.registerItem(this, "gt.comb", GregTech.ID); } public ItemStack getStackForType(CombType type) { @@ -228,8 +228,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.LAPOTRON, new ItemStack[] { GT_Bees.drop.getStackForType(DropType.LAPIS), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LapotronDust", 1, 0), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 2) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LapotronDust", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 2) }, new int[] { 20 * 100, 15 * 100, 40 * 100 }, Voltage.HV, 196); @@ -438,31 +438,31 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.THAUMIUMDUST, new Materials[] { Materials.Thaumium }, Voltage.MV); addCentrifugeToItemStack( CombType.THAUMIUMSHARD, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1, 1), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 2), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 3), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 4), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 5), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 6), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 1), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 3), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 4), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 5), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 6), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 50 * 100 }, Voltage.ULV); addProcessGT(CombType.AMBER, new Materials[] { Materials.Amber }, Voltage.LV); addProcessGT(CombType.QUICKSILVER, new Materials[] { Materials.Cinnabar }, Voltage.LV); addCentrifugeToItemStack( CombType.SALISMUNDUS, - new ItemStack[] { GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 14), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 14), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 100 * 100, 50 * 100 }, Voltage.MV); addCentrifugeToItemStack( CombType.TAINTED, - new ItemStack[] { GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 11), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 12), - GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 0), - GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 1), - GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 2), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 11), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 12), + GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 1), + GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 2), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 15 * 100, 15 * 100, 15 * 100, 15 * 100, 15 * 100, 50 * 100 }, Voltage.ULV); addProcessGT(CombType.MITHRIL, new Materials[] { Materials.Mithril }, Voltage.HV); @@ -473,13 +473,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToItemStack( CombType.THAUMINITE, - new ItemStack[] { GT_ModHandler.getModItem("thaumicbases", "resource", 1, 0), + new ItemStack[] { GT_ModHandler.getModItem(ThaumicBases.ID, "resource", 1, 0), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 1), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 20 * 100, 10 * 100, 50 * 100 }, Voltage.HV); addProcessGT(CombType.SHADOWMETAL, new Materials[] { Materials.Shadow }, Voltage.HV); @@ -489,13 +489,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 75) * 100, 10 * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addProcessGT(CombType.DIVIDED, new Materials[] { Materials.Diamond }, Voltage.HV); addCentrifugeToItemStack( CombType.DIVIDED, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("ExtraUtilities", "unstableingot", 1, 1), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(ExtraUtilities.ID, "unstableingot", 1, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1) }, new int[] { 50 * 100, 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100, @@ -504,8 +504,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.SPARKELING, new Materials[] { Materials.NetherStar }, Voltage.EV); addCentrifugeToItemStack( CombType.SPARKELING, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("MagicBees", "miscResources", 2, 5), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 2, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1) }, new int[] { 50 * 100, 10 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 50) * 100 }, Voltage.EV); @@ -516,12 +516,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 100 * 100 }, new int[] {}, Voltage.MV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToItemStack( CombType.QUICKSILVER, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1, 5) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) }, new int[] { 50 * 100, 100 * 100 }, Voltage.ULV); } else { @@ -531,7 +531,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 100 * 100, 75 * 100 }, new int[] {}, Voltage.MV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToMaterial( CombType.AMBER, @@ -539,12 +539,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 100 * 100 }, new int[] {}, Voltage.ULV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToItemStack( CombType.QUICKSILVER, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1, 5), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Cinnabar, 1) }, new int[] { 50 * 100, 100 * 100, 85 * 100 }, Voltage.ULV); @@ -554,7 +554,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 75 * 100, 55 * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); } @@ -1161,39 +1161,39 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { // Twilight addCentrifugeToItemStack( CombType.NAGA, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleChip", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleFragment", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 4), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleChip", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleFragment", 1L, 0), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.MV); addCentrifugeToItemStack( CombType.LICH, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneChip", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneFragment", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 5), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneChip", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneFragment", 1L, 0), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.HYDRA, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.FieryBloodDrop", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 1), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.FieryBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.HYDRA), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.URGHAST, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CarminiteChip", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CarminiteFragment", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteChip", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteFragment", 1L, 0), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.EV); addCentrifugeToItemStack( CombType.SNOWQUEEN, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SnowQueenBloodDrop", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.SNOW_QUEEN), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.EV); @@ -1201,49 +1201,49 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { // HEE addCentrifugeToItemStack( CombType.ENDDUST, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.End), GT_Bees.drop.getStackForType(DropType.ENDERGOO), }, new int[] { 20 * 100, 15 * 100, 10 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.STARDUST, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Stardust), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 20 * 100, 15 * 100, 10 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.ECTOPLASMA, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Ectoplasma), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 25 * 100, 10 * 100, 15 * 100 }, Voltage.EV); addCentrifugeToItemStack( CombType.ARCANESHARD, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Arcaneshard), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 25 * 100, 10 * 100, 15 * 100 }, Voltage.EV); addCentrifugeToItemStack( CombType.DRAGONESSENCE, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Dragonessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 }, Voltage.IV); addCentrifugeToItemStack( CombType.ENDERMAN, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Enderman), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 3000, 750, 2000 }, Voltage.IV); addCentrifugeToItemStack( CombType.SILVERFISH, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish), GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Items.spawn_egg, 1, 60) }, new int[] { 25 * 100, 10 * 100, 20 * 100, 15 * 100 }, @@ -1256,28 +1256,28 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 50 * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), 20 * 100); } addCentrifugeToItemStack( CombType.RUNEI, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfPowerFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfAgilityFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfVigorFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfDefenseFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfMagicFragment", 1L, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfPowerFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfAgilityFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVigorFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfDefenseFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfMagicFragment", 1L, 0) }, new int[] { 25 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100 }, Voltage.IV); addCentrifugeToItemStack( CombType.RUNEII, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfVoidFragment", 1L, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVoidFragment", 1L, 0) }, new int[] { 50 * 100, (int) (2.5 * 100) }, Voltage.IV); addCentrifugeToItemStack( CombType.FIREESSENSE, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Fireessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 }, @@ -1286,7 +1286,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { if (AE2FluidCraft.isModLoaded()) { addCentrifugeToItemStack( CombType.WALRUS, - new ItemStack[] { GT_ModHandler.getModItem("ae2fc", "walrus", 1L, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(AE2FluidCraft.ID, "walrus", 1L, 0) }, new int[] { 100 * 100 }, Voltage.LV); } @@ -1295,7 +1295,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { CombType.SPACE, new ItemStack[] { ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L), GT_Bees.drop.getStackForType(DropType.OXYGEN), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CoinSpace", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CoinSpace", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 15 * 100, 5 * 100 }, Voltage.HV); addProcessGT(CombType.METEORICIRON, new Materials[] { Materials.MeteoricIron }, Voltage.HV); @@ -1397,24 +1397,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.MOON, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.MV, 300); addCentrifugeToItemStack( CombType.MARS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MarsStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.HV, 300); addCentrifugeToItemStack( CombType.JUPITER, - new ItemStack[] { GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.CallistoIce, 1L), ItemList.FR_Wax.get(1L) }, new int[] { 30 * 100, 30 * 100, 30 * 100, 30 * 100, 30 * 100, 5 * 100, 50 * 100 }, @@ -1423,91 +1423,91 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.MERCURY, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MercuryCoreDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MercuryStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryCoreDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.EV, 300); addCentrifugeToItemStack( CombType.VENUS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VenusStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.EV, 300); addCentrifugeToItemStack( CombType.SATURN, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.URANUS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.NEPTUN, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.PLUTO, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoIceDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.HAUMEA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.MAKEMAKE, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MakeMakeStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.CENTAURI, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriAStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.TCETI, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.BARNARDA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.VEGA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.ZPM, 300); @@ -1515,7 +1515,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.SEAWEED, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem("GalaxySpace", "tcetiedandelions", 1L, 0) }, + GT_ModHandler.getModItem(GalaxySpace.ID, "tcetiedandelions", 1L, 0) }, new int[] { 50 * 100, 100 * 100 }, Voltage.UV, 100); diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index 2593945417..6604b887e6 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -1,8 +1,11 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.MOD_ID; -import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.ExtraBees; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.MagicBees; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import java.util.List; @@ -33,7 +36,7 @@ public class ItemDrop extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.drop"); - GameRegistry.registerItem(this, "gt.drop", MOD_ID); + GameRegistry.registerItem(this, "gt.drop", GregTech.ID); } public ItemStack getStackForType(DropType type) { @@ -102,53 +105,53 @@ public class ItemDrop extends Item { addProcessLV( tDrop, Materials.OilHeavy.getFluid(100L), - GT_ModHandler.getModItem("Forestry", "propolis", 1L, 0), + GT_ModHandler.getModItem(Forestry.ID, "propolis", 1L, 0), 3000, 8); RecipeManagers.squeezerManager.addRecipe( 40, new ItemStack[] { tDrop }, Materials.OilHeavy.getFluid(100L), - GT_ModHandler.getModItem("Forestry", "propolis", 1L, 0), + GT_ModHandler.getModItem(Forestry.ID, "propolis", 1L, 0), 30); tDrop = getStackForType(DropType.COOLANT); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 0), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0), 3000, 8); RecipeManagers.squeezerManager.addRecipe( 40, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 0), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0), 30); tDrop = getStackForType(DropType.HOT_COOLANT); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), 3000, 8); RecipeManagers.squeezerManager.addRecipe( 40, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), 30); tDrop = getStackForType(DropType.SNOW_QUEEN); addProcessMV( tDrop, Materials.FierySteel.getFluid(200L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "SnowQueenBloodDrop", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "SnowQueenBloodDrop", 1L, 0), 1500, 48); tDrop = getStackForType(DropType.LAPIS); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 200), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), 5000, 1200, 2); @@ -156,20 +159,20 @@ public class ItemDrop extends Item { 400, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), 30); tDrop = getStackForType(DropType.HYDRA); addProcessMV( tDrop, Materials.FierySteel.getFluid(50L), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), 3000, 8); tDrop = getStackForType(DropType.OXYGEN); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("liquidoxygen"), 100), - GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2), 250, 1200, 8); @@ -177,7 +180,7 @@ public class ItemDrop extends Item { 400, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2), 30); tDrop = getStackForType(DropType.ENDERGOO); if (HardcoreEnderExpansion.isModLoaded()) diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java index 45557518ff..70e2d64514 100644 --- a/src/main/java/gregtech/common/items/ItemPollen.java +++ b/src/main/java/gregtech/common/items/ItemPollen.java @@ -1,6 +1,6 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.MOD_ID; +import static gregtech.api.enums.Mods.GregTech; import java.util.List; @@ -25,7 +25,7 @@ public class ItemPollen extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.pollen"); - GameRegistry.registerItem(this, "gt.pollen", MOD_ID); + GameRegistry.registerItem(this, "gt.pollen", GregTech.ID); } public ItemStack getStackForType(PollenType type) { diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 00f2f4843a..20573dcdd7 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -1,7 +1,8 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.MOD_ID; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import java.util.List; @@ -32,7 +33,7 @@ public class ItemPropolis extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.propolis"); - GameRegistry.registerItem(this, "gt.propolis", MOD_ID); + GameRegistry.registerItem(this, "gt.propolis", GregTech.ID); } public ItemStack getStackForType(PropolisType type) { @@ -80,23 +81,23 @@ public class ItemPropolis extends Item { ItemStack tPropolis; tPropolis = getStackForType(PropolisType.End); - addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "end_powder", 1, 0)); + addProcessHV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "end_powder", 1, 0)); tPropolis = getStackForType(PropolisType.Stardust); - addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "stardust", 1, 0)); + addProcessHV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "stardust", 1, 0)); tPropolis = getStackForType(PropolisType.Ectoplasma); - addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EctoplasmaChip", 1, 0)); + addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EctoplasmaChip", 1, 0)); tPropolis = getStackForType(PropolisType.Arcaneshard); - addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ArcaneShardChip", 1, 0)); + addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneShardChip", 1, 0)); tPropolis = getStackForType(PropolisType.Dragonessence); - addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 0)); + addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 0)); tPropolis = getStackForType(PropolisType.Enderman); - addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "enderman_head", 1, 0)); + addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "enderman_head", 1, 0)); tPropolis = getStackForType(PropolisType.Silverfish); - addProcessEV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "silverfish_blood", 1, 0)); + addProcessEV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "silverfish_blood", 1, 0)); tPropolis = getStackForType(PropolisType.Endium); addProcessHV(tPropolis, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.HeeEndium, 1)); tPropolis = getStackForType(PropolisType.Fireessence); - addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 1)); + addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 1)); // addRecipe(tDrop, aOutput, aOutput2, aChance, aDuration, aEUt); } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java index 9a8231cf4c..4d8ecb2f41 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java @@ -1,5 +1,7 @@ package gregtech.common.items.behaviors; +import static gregtech.api.enums.Mods.Railcraft; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,7 +29,7 @@ public class Behaviour_Crowbar extends Behaviour_None { if (aWorld.isRemote) { return false; } - if (GT_ModHandler.getModItem("Railcraft", "fluid.creosote.bucket", 1L) != null) { + if (GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) { return false; } Block aBlock = aWorld.getBlock(aX, aY, aZ); diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java index 7d0c4cee3e..34a71bfc84 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java @@ -1,5 +1,6 @@ package gregtech.common.misc.spaceprojects.enums; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.*; import static gregtech.common.misc.spaceprojects.enums.StarType.*; @@ -10,7 +11,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceBody; /** * An enum of all space bodies in the Sol Solar System. Or to be exact the more important ones - * + * * @author BlueWeabo */ public enum SolarSystem implements ISpaceBody { @@ -65,7 +66,7 @@ public enum SolarSystem implements ISpaceBody { SolarSystem(SpaceBodyType aType, StarType aStarType) { star = aStarType; spaceBody = aType; - texture = UITexture.fullImage("gregtech", "solarsystem/" + getName()); + texture = UITexture.fullImage(GregTech.ID, "solarsystem/" + getName()); SpaceProjectManager.addLocation(this); } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index 391a212115..dded37de09 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -2,7 +2,7 @@ package gregtech.common.tileentities.generators; import static gregtech.api.enums.ConfigCategories.machineconfig; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import static net.minecraft.util.EnumChatFormatting.GRAY; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java index a0d22efd5d..d46d02a761 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java @@ -1,6 +1,7 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.*; @@ -162,25 +163,25 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi addBlacklist(ItemList.Circuit_Parts_Vacuum_Tube.get(1L)); addBlacklist(ItemList.Schematic.get(1L)); if (Railcraft.isModLoaded()) { - addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 0)); - addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 736)); - addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 816)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 0)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 736)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 816)); } addBlacklist(IC2Items.getItem("mixedMetalIngot")); - addBlacklist(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 14)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "machine.alpha", 1L, 14)); // region transformer // Temporary solution for cable dupe // Maybe we can mark assembler recipes as "cannot disassemble" // and only disassemble crafting recipes in the future // Also `getIC2Item` doesn't work, maybe loading order? addBlacklist(ItemList.Transformer_MV_LV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 3)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 3)); addBlacklist(ItemList.Transformer_HV_MV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 4)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 4)); addBlacklist(ItemList.Transformer_EV_HV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 5)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 5)); addBlacklist(ItemList.Transformer_IV_EV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 6)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 6)); // endregion transformer } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 27dea9bd00..8d605599e7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -2,6 +2,7 @@ package gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.debugBlockMiner; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; @@ -460,7 +461,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine } private static final FallbackableUITexture progressBarTexture = new FallbackableUITexture( - UITexture.fullImage("gregtech", "gui/progressbar/miner"), + UITexture.fullImage(GregTech.ID, "gui/progressbar/miner"), GT_UITextures.PROGRESSBAR_CANNER); @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index dc3c4f7dc3..ca2182c0b8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -1,8 +1,8 @@ package gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.GalacticraftCore; -import static gregtech.api.enums.ModIDs.GalacticraftMars; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes; @@ -261,13 +261,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { int stackItemDamage = aStack.getItemDamage(); if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString() .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftCore.modID, + GalacticraftCore.ID, "item.schematic", 1L, 0)) @@ -278,7 +278,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftCore.modID, + GalacticraftCore.ID, "item.schematic", 1L, 1)) @@ -288,13 +288,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { } else { if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString() .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 0)) @@ -305,7 +305,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 1)) @@ -316,7 +316,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 2)) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index dbd24fb012..519bed3ede 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -3,6 +3,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; @@ -113,24 +116,24 @@ public class GT_MetaTileEntity_AssemblyLine extends 'g', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index c3321931dd..e921369b05 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -2,6 +2,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofFrame; @@ -145,24 +148,24 @@ public class GT_MetaTileEntity_IntegratedOreFactory 'g', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index 21432394b4..8e6508b465 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -3,6 +3,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; @@ -218,24 +221,24 @@ public class GT_MetaTileEntity_PCBFactory extends 'A', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 2644f9f49e..b674560fa5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -5,7 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUn import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.*; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW; @@ -50,7 +50,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends private static IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> createStructureDefinition() { IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded() - ? ofBlockUnlocalizedName(NewHorizonsCoreMod.modID, "gt.blockcasingsNH", 2) + ? ofBlockUnlocalizedName(NewHorizonsCoreMod.ID, "gt.blockcasingsNH", 2) : ofBlock(GregTech_API.sBlockCasings1, 0); return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder() diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java index 5997520884..c2209cbe27 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java @@ -1,5 +1,6 @@ package gregtech.common.tileentities.machines.multiblock.logic; +import static gregtech.api.enums.Mods.Railcraft; import static net.minecraftforge.oredict.OreDictionary.getOreID; import static net.minecraftforge.oredict.OreDictionary.getOreIDs; @@ -46,7 +47,7 @@ public class CokeOvenProcessingLogic extends ProcessingLogic { return GT_OreDictUnificator.get("fuelCoke", null, 1); } else if (oreId == COAL_BLOCK_ORE_ID) { timeMultiplier = 9; - return GT_ModHandler.getModItem("Railcraft", "cube", 1, 0); + return GT_ModHandler.getModItem(Railcraft.ID, "cube", 1, 0); } else if (oreId == WOOD_ORE_ID) { return new ItemStack(Items.coal, 1, 1); } else if (oreId == SUGARCANE_ORE_ID) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java index df6a5ef668..3784fbc7bc 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/gregtech/crossmod/Waila.java b/src/main/java/gregtech/crossmod/Waila.java index c07622c84b..47f986e828 100644 --- a/src/main/java/gregtech/crossmod/Waila.java +++ b/src/main/java/gregtech/crossmod/Waila.java @@ -3,6 +3,7 @@ package gregtech.crossmod; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import cpw.mods.fml.common.event.FMLInterModComms; +import gregtech.api.enums.Mods; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.multitileentity.base.MultiTileEntity; @@ -26,6 +27,6 @@ public class Waila { } public static void init() { - FMLInterModComms.sendMessage("Waila", "register", Waila.class.getName() + ".callbackRegister"); + FMLInterModComms.sendMessage(Mods.Waila.ID, "register", Waila.class.getName() + ".callbackRegister"); } } diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index bc90879e5f..82601e5336 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -1,6 +1,6 @@ package gregtech.loaders; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; @@ -10,6 +10,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ExtraIcons { + private static final String LARGE_FLUID_CELL_CUSTOM = "large_fluid_cell_custom"; public static IIcon steelLargeCellInner; public static IIcon aluminiumLargeCellInner; public static IIcon stainlesssteelLargeCellInner; @@ -24,17 +25,22 @@ public class ExtraIcons { public void regIcons(TextureStitchEvent.Pre event) { TextureMap reg = event.map; if (reg.getTextureType() == 1) { // are for items - steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); - aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); + steelLargeCellInner = reg.registerIcon(GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "steel_inner")); + aluminiumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "aluminium_inner")); stainlesssteelLargeCellInner = reg.registerIcon( - RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "stainlesssteel_inner")); tungstensteelLargeCellInner = reg.registerIcon( - RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); - titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); - chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); - iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); - osmiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/osmium_inner"); - neutroniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/neutronium_inner"); + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "tungstensteel_inner")); + titaniumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "titanium_inner")); + chromiumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "chromium_inner")); + iridiumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "iridium_inner")); + osmiumLargeCellInner = reg.registerIcon(GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "osmium_inner")); + neutroniumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "neutronium_inner")); } } } diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 9a9837aae9..e87538c831 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -1,5 +1,9 @@ package gregtech.loaders.load; +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Thaumcraft; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -123,8 +127,8 @@ public class GT_FuelLoader implements Runnable { // BloodMagic GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L) }, null, null, null, @@ -133,8 +137,8 @@ public class GT_FuelLoader implements Runnable { 400); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) }, null, null, null, @@ -143,8 +147,8 @@ public class GT_FuelLoader implements Runnable { 1000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) }, null, null, null, @@ -153,8 +157,8 @@ public class GT_FuelLoader implements Runnable { 8000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) }, null, null, null, @@ -162,7 +166,7 @@ public class GT_FuelLoader implements Runnable { 0, 20000); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5); + GT_Values.RA.addFuel(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4), null, 4, 5); GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5); GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5); GT_Values.RA.addFuel( @@ -170,6 +174,6 @@ public class GT_FuelLoader implements Runnable { null, Materials.NetherStar.mFuelPower * 2, Materials.NetherStar.mFuelType); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1), null, 250, 1); + GT_Values.RA.addFuel(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1), null, 250, 1); } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 2ed494d0c0..102b41a87c 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -1,6 +1,6 @@ package gregtech.loaders.materialprocessing; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index c7ca40e111..06f7884875 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -1,6 +1,6 @@ package gregtech.loaders.misc; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 84260a32fa..614c730ede 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -5,7 +5,7 @@ import static forestry.api.core.EnumHumidity.ARID; import static forestry.api.core.EnumHumidity.DAMP; import static forestry.api.core.EnumTemperature.*; import static forestry.core.genetics.alleles.EnumAllele.*; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.loaders.misc.GT_BeeDefinitionReference.*; import java.awt.*; @@ -62,9 +62,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { // organic CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f); beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem("BiomesOPlenty", "mudball", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(BiomesOPlenty.ID, "mudball", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> { @@ -79,14 +79,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay }), SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 15), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 15), 0.30f); beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); if (TinkerConstruct.isModLoaded()) { - beeSpecies.addProduct(GT_ModHandler.getModItem(TinkerConstruct.modID, "strangeFood", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(TinkerConstruct.modID, "slime.gel", 1, 2), 0.02f); + beeSpecies.addProduct(GT_ModHandler.getModItem(TinkerConstruct.ID, "strangeFood", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1, 2), 0.02f); } }, template -> { AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS); @@ -97,13 +97,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Marshy"), CLAY, 7); if (TinkerConstruct.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(TinkerConstruct.modID, "slime.gel"), 1); + tMutation.requireResource(GameRegistry.findBlock(TinkerConstruct.ID, "slime.gel"), 1); }), PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.modID, "peat", 1, 0), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.modID, "mulch", 1, 0), 0.05f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "peat", 1, 0), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> { @@ -115,7 +115,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)), STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f); beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); @@ -145,7 +145,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource("blockCoal"); }), OIL(GT_BranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.75f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -160,7 +160,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); }, dis -> dis.registerMutation(COAL, STICKYRESIN, 4)), SANDWICH(GT_BranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f); beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f); beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f); @@ -179,7 +179,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Agrarian"), getSpecies(MAGICBEES, "TCBatty"), 10)), ASH(GT_BranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASH), 0.15f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); @@ -194,7 +194,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.restrictTemperature(HELLISH); }), APATITE(GT_BranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.APATITE), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(WARM); @@ -210,7 +210,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), FERTILIZER(GT_BranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1), 0.2f); beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1), 0.3f); @@ -234,12 +234,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(APATITE, ASH, 12); tMutation.restrictTemperature(HOT); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem2"), 8); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockgem2"), 8); }), // Tea bee, Humidity: normal, Parents: Ash and Fertilizer, Mutationrate: 10%, combrate: 10% TEA(GT_BranchDefinition.ORGANIC, "Tea", false, new Color(0x65D13A), new Color(0x9a9679), beeSpecies -> { beeSpecies.addProduct( - GT_ModHandler.getModItem("harvestcraft", "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(NORMAL); @@ -255,7 +255,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PEAT, getSpecies(MAGICBEES, "Silicon"), 15); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings5"), 0); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockcasings5"), 0); }), // gems @@ -291,7 +291,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Hermitic"), LAPIS, 10); - tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0); + tMutation.requireResource(GameRegistry.findBlock(AppliedEnergistics2.ID, "tile.BlockQuartz"), 0); }), FLUIX(GT_BranchDefinition.GEM, "FluixDust", true, new Color(0xA375FF), new Color(0xB591FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); @@ -300,7 +300,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, LAPIS, 7); - tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockFluix"), 0); + tMutation.requireResource(GameRegistry.findBlock(AppliedEnergistics2.ID, "tile.BlockFluix"), 0); }), DIAMOND(GT_BranchDefinition.GEM, "Diamond", false, new Color(0xCCFFFF), new Color(0xA3CCCC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); @@ -545,7 +545,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(GLOWSTONE, GOLD, 5); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings"), 15); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockcasings"), 15); }), CHROME(GT_BranchDefinition.RAREMETAL, "Chrome", true, new Color(0xEBA1EB), new Color(0xF2C3F2), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); @@ -662,7 +662,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // IC2 COOLANT(GT_BranchDefinition.IC2, "Coolant", false, new Color(0x144F5A), new Color(0x2494A2), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 4), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COOLANT), 0.15f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); @@ -681,13 +681,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { 10); tMutation.requireResource( Block.getBlockFromItem( - GT_ModHandler.getModItem("IC2", "fluidCoolant", 1) + GT_ModHandler.getModItem(IndustrialCraft2.ID, "fluidCoolant", 1) .getItem()), 0); tMutation.restrictTemperature(ICY); }), ENERGY(GT_BranchDefinition.IC2, "Energy", false, new Color(0xC11F1F), new Color(0xEBB9B9), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 12), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 12), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(WARM); @@ -707,7 +707,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 10); tMutation.requireResource( Block.getBlockFromItem( - GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1) + GT_ModHandler.getModItem(IndustrialCraft2.ID, "fluidHotCoolant", 1) .getItem()), 0); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome @@ -784,11 +784,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, COAL, 4); - tMutation.requireResource(GameRegistry.findBlock("IC2", "blockITNT"), 0); + tMutation.requireResource(GameRegistry.findBlock(IndustrialCraft2.ID, "blockITNT"), 0); }), // Alloy REDALLOY(GT_BranchDefinition.GTALLOY, "RedAlloy", false, new Color(0xE60000), new Color(0xB80000), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDALLOY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -801,7 +801,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), REDSTONEALLOY(GT_BranchDefinition.GTALLOY, "RedStoneAlloy", false, new Color(0xA50808), new Color(0xE80000), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONEALLOY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -814,7 +814,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), CONDUCTIVEIRON(GT_BranchDefinition.GTALLOY, "ConductiveIron", false, new Color(0xCEADA3), new Color(0x817671), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CONDUCTIVEIRON), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(WARM); @@ -828,7 +828,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), ENERGETICALLOY(GT_BranchDefinition.GTALLOY, "EnergeticAlloy", false, new Color(0xFF9933), new Color(0xFFAD5C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGETICALLOY), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -841,7 +841,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), VIBRANTALLOY(GT_BranchDefinition.GTALLOY, "VibrantAlloy", false, new Color(0x86A12D), new Color(0xC4F2AE), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.VIBRANTALLOY), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -860,7 +860,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), ELECTRICALSTEEL(GT_BranchDefinition.GTALLOY, "ElectricalSteel", false, new Color(0x787878), new Color(0xD8D8D8), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ELECTRICALSTEEL), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -872,7 +872,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource("blockElectricalSteel"); }), DARKSTEEL(GT_BranchDefinition.GTALLOY, "DarkSteel", false, new Color(0x252525), new Color(0x443B44), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DARKSTEEL), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); @@ -885,7 +885,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), PULSATINGIRON(GT_BranchDefinition.GTALLOY, "PulsatingIron", false, new Color(0x6DD284), new Color(0x006600), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PULSATINGIRON), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -939,13 +939,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(Explosive, DIAMOND, 2); if (ExtraUtilities.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.modID, "block_bedrockium"), 0); + tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.ID, "block_bedrockium"), 0); }), // thaumic THAUMIUMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, new Color(0x7A007A), new Color(0x5C005C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -985,7 +985,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // forest }), AMBER(GT_BranchDefinition.THAUMIC, "Amber", true, new Color(0xEE7700), new Color(0x774B15), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMBER), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1000,7 +1000,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), QUICKSILVER(GT_BranchDefinition.THAUMIC, "Quicksilver", true, new Color(0x7A007A), new Color(0x5C005C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUICKSILVER), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1013,7 +1013,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> dis.registerMutation(THAUMIUMDUST, SILVER, 10)), SALISMUNDUS(GT_BranchDefinition.THAUMIC, "SalisMundus", true, new Color(0xF7ADDE), new Color(0x592582), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1031,7 +1031,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // forest }), TAINTED(GT_BranchDefinition.THAUMIC, "Tainted", true, new Color(0x904BB8), new Color(0xE800FF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TAINTED), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1093,7 +1093,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), THAUMINITE(GT_BranchDefinition.THAUMIC, "Thauminite", true, new Color(0x2E2D79), new Color(0x7581E0), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "comb", 1, 19), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "comb", 1, 19), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMINITE), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1106,11 +1106,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCOrder"), THAUMIUMDUST, 8); if (ThaumicBases.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.modID, "thauminiteBlock"), 0); + tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.ID, "thauminiteBlock"), 0); }), SHADOWMETAL(GT_BranchDefinition.THAUMIC, "ShadowMetal", true, new Color(0x100322), new Color(0x100342), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "comb", 1, 20), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "comb", 1, 20), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SHADOWMETAL), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1132,7 +1132,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }), DIVIDED(GT_BranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 61), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 61), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIVIDED), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1145,7 +1145,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, IRON, 3); if (ExtraUtilities.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.modID, "decorativeBlock1"), 5); + tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.ID, "decorativeBlock1"), 5); }), CAELESTIS(GT_BranchDefinition.THAUMIC, "Caelestis", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISRED), 0.60f); @@ -1162,7 +1162,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> dis.registerMutation(DIAMOND, DIVIDED, 10)), SPARKELING(GT_BranchDefinition.THAUMIC, "NetherStar", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SPARKELING), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1184,7 +1184,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), ESSENTIA(GT_BranchDefinition.THAUMIC, "Essentia", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> { @@ -1195,7 +1195,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SHADOWMETAL, SPARKELING, 5); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 6); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 6); }), // radioctive @@ -1270,7 +1270,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NAQUADAH, THAUMIUMSHARD, 2); if (AdvancedSolarPanel.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(AdvancedSolarPanel.modID, "BlockAdvSolarPanel"), 2); + tMutation.requireResource(GameRegistry.findBlock(AdvancedSolarPanel.ID, "BlockAdvSolarPanel"), 2); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome }), THORIUM(GT_BranchDefinition.RADIOACTIVE, "Thorium", false, new Color(0x005000), new Color(0x001E00), beeSpecies -> { @@ -1389,7 +1389,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(HYDRA, THAUMIUMDUST, 5); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCosmeticSolid"), 4); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCosmeticSolid"), 4); tMutation.restrictTemperature(HELLISH); }), SNOWQUEEN(GT_BranchDefinition.TWILIGHT, "SnowQueen", true, new Color(0xD02001), new Color(0x9C0018), beeSpecies -> { @@ -1402,12 +1402,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> {}, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URGHAST, SALISMUNDUS, 4); if (ThaumicBases.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.modID, "blockSalisMundus"), 0); + tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.ID, "blockSalisMundus"), 0); tMutation.restrictTemperature(ICY); }), // HEE ENDDUST(GT_BranchDefinition.HEE, "End Dust", true, new Color(0xCC00FA), new Color(0x003A7D), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1417,11 +1417,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "end_powder_ore"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "end_powder_ore"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ENDIUM(GT_BranchDefinition.HEE, "Endium", true, new Color(0xa0ffff), new Color(0x2F5A6C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDIUM), 0.10f); beeSpecies.addSpecialty(GT_Bees.propolis.getStackForType(PropolisType.Endium), 0.15f); beeSpecies.addSpecialty(GT_Bees.drop.getStackForType(DropType.ENDERGOO), 0.10f); @@ -1435,7 +1435,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, new Color(0xffff00), new Color(0xDCBE13), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1448,11 +1448,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ZINC, 8); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "stardust_ore"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "stardust_ore"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, new Color(0xDCB0E5), new Color(0x381C40), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1465,12 +1465,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ENDDUST, 5); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "spooky_log"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "spooky_log"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ARCANESHARDS(GT_BranchDefinition.HEE, "Arcane Shards", true, new Color(0x9010AD), new Color(0x333D82), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1482,14 +1482,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMSHARD, ENDDUST, 5); tMutation.restrictHumidity(ARID); - if (HardcoreEnderExpansion.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(HardcoreEnderExpansion.modID, "laboratory_floor"), - 0); + if (HardcoreEnderExpansion.isModLoaded()) + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "laboratory_floor"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, new Color(0xFFA12B), new Color(0x911ECE), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1503,11 +1502,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, ARCANESHARDS, 4); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "essence_altar"), 1); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "essence_altar"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), FIREESSENCE(GT_BranchDefinition.HEE, "Fireessence", true, new Color(0xD41238), new Color(0xFFA157), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIREESSENSE), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); @@ -1521,11 +1520,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, ARCANESHARDS, 4); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "essence_altar"), 2); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "essence_altar"), 2); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ENDERMANHEAD(GT_BranchDefinition.HEE, "Enderman", true, new Color(0x161616), new Color(0x6200e7), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1539,11 +1538,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ENDERIUM, STARDUST, 4); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "ender_goo"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), SILVERFISH(GT_BranchDefinition.HEE, "Silverfisch", true, new Color(0xEE053D), new Color(0x000000), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1557,11 +1556,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, STARDUST, 5); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "ender_goo"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), RUNE(GT_BranchDefinition.HEE, "Rune", true, new Color(0xE31010), new Color(0x0104D9), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEI), 0.025f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEII), 0.0125f); beeSpecies.setHumidity(ARID); @@ -1577,7 +1576,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { .setIsSecret(); tMutation.restrictHumidity(ARID); if (EnderStorage.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(EnderStorage.modID, "enderChest"), 0); + tMutation.requireResource(GameRegistry.findBlock(EnderStorage.ID, "enderChest"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), // Walrus Bee, 100% Combchance, Parents: Catty and Watery @@ -1599,7 +1598,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 45, 2); if (ExtraCells2.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(ExtraCells2.modID, "walrus"), 0); + tMutation.requireResource(GameRegistry.findBlock(ExtraCells2.ID, "walrus"), 0); } }), // Space Bees @@ -1654,7 +1653,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Ledox"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim } }), @@ -1672,7 +1671,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, getSpecies(EXTRABEES, "freezing"), 7); if (NewHorizonsCoreMod.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.CallistoColdIce"), + GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.CallistoColdIce"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto // Dim @@ -1691,7 +1690,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(IO, MITHRIL, 6); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Mytryl"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Mytryl"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim } }), @@ -1708,7 +1707,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(VENUS, OSMIUM, 6); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Quantinum"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Quantinum"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim } }), @@ -1724,7 +1723,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OBERON, 5); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "metalsblock"), 6); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "metalsblock"), 6); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim } }), @@ -1742,7 +1741,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, EMERALD, 3); if (NewHorizonsCoreMod.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.MysteriousCrystal"), + GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus // Dim @@ -1762,7 +1761,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, PLUTONIUM, 2); if (NewHorizonsCoreMod.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.BlackPlutonium"), + GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.BlackPlutonium"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim } @@ -1786,9 +1785,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Planet Line MOON(GT_BranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.35f); - if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1, 0), - 0.10f); + if (NewHorizonsCoreMod.isModLoaded()) + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -1796,13 +1794,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SPACE, CLAY, 25); if (GalacticraftCore.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalacticraftCore.modID, "tile.moonBlock"), 4); + tMutation.requireResource(GameRegistry.findBlock(GalacticraftCore.ID, "tile.moonBlock"), 4); } tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim }), MARS(GT_BranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MarsStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1810,14 +1808,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MOON, IRON, 20); if (GalacticraftMars.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalacticraftMars.modID, "tile.mars"), 5); + tMutation.requireResource(GameRegistry.findBlock(GalacticraftMars.ID, "tile.mars"), 5); } tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim }), PHOBOS(GT_BranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PhobosStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); @@ -1825,51 +1823,41 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, MOON, 20); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "phobosblocks"), 2); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "phobosblocks"), 2); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(38, "Phobos")); // Phobos Dim }), DEIMOS(GT_BranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.DeimosStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, SPACE, 20); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "deimosblocks"), 1); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "deimosblocks"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(40, "Deimos")); // Deimos Dim }), CERES(GT_BranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CeresStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, METEORICIRON, 20); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "ceresblocks"), 1); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ceresblocks"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(42, "Ceres")); // Ceres Dim }), JUPITER(GT_BranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1, 0), 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1877,27 +1865,24 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, DESH, 15); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Ledox"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim }), IO(GT_BranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "volcanic"), 15); tMutation.restrictTemperature(HELLISH); - if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "ioblocks"), 0); + if (GalaxySpace.isModLoaded()) tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ioblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim }), EUROPA(GT_BranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), - 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -1905,137 +1890,115 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, IRON, 15); tMutation.restrictTemperature(ICY); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "europagrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "europagrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim }), GANYMEDE(GT_BranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TITANIUM, 15); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "ganymedeblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ganymedeblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(43, "Ganymede")); // Ganymede Dim }), CALLISTO(GT_BranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1, 0), - 0.10f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "artic"), 15); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "callistoblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "callistoblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim }), SATURN(GT_BranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, LEDOX, 25, 2); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Quantinum"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Quantinum"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim }), ENCELADUS(GT_BranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1, 0), - 0.10f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SATURN, CHROME, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "enceladusblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "enceladusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim }), TITAN(GT_BranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SATURN, NICKEL, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "titanblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "titanblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(44, "Titan")); // Titan Dim }), URANUS(GT_BranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SATURN, TRINIUM, 10); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "metalsblock"), 6); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "metalsblock"), 6); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim }), MIRANDA(GT_BranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANUS, TIN, 10); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "mirandablocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "mirandablocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(86, "Miranda")); // Miranda Dim }), OBERON(GT_BranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANUS, IRIDIUM, 10); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "oberonblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "oberonblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim }), NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -2043,41 +2006,37 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANUS, ORIHARUKON, 7); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.MysteriousCrystal"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim }), PROTEUS(GT_BranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, COPPER, 7); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "proteusblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "proteusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(47, "Proteus")); // Proteus Dim }), TRITON(GT_BranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, GOLD, 7); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tritonblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tritonblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(48, "Triton")); // Triton Dim }), PLUTO(GT_BranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTO), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2085,39 +2044,35 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, PLUTONIUM, 5); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "plutoblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "plutoblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim }), HAUMEA(GT_BranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADAH, 7, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "haumeablocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "haumeablocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim }), MAKEMAKE(GT_BranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MAKEMAKE), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MakeMakeStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADRIA, 7, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "makemakegrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "makemakegrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(25, "MakeMake")); // MakeMake Dim }), CENTAURI(GT_BranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.35f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); @@ -2125,13 +2080,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, DESH, 3); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "acentauribbgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "acentauribbgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim }), ACENTAURI(GT_BranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); @@ -2141,15 +2096,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CENTAURI, INFINITYCATALYST, 3); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "acentauribbgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "acentauribbgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(31, "aCentauri")); // aCentauri Dim } }), TCETI(GT_BranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); @@ -2157,29 +2110,25 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, HAUMEA, 5, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tcetieblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim }), TCETIE(GT_BranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(TCETI, getSpecies(MAGICBEES, "TCWater"), 5, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tcetieblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim }), // Parents: TCETI and TCETIE, 25% combchance, needs Damp Humidity and Normal temperature. Is Mycophilic SEAWEED(GT_BranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SEAWEED), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), - 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -2193,17 +2142,17 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(TCETI, TCETIE, 5, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tcetieblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim }), BARNARDA(GT_BranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.35f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); @@ -2211,7 +2160,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, THORIUM, 3, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaEgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim }), BARNARDAC(GT_BranchDefinition.PLANET, "BarnardaC", false, new Color(0x0D5A0D), new Color(0x473f0a), beeSpecies -> { @@ -2221,48 +2170,48 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, AMERICIUM, 3, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaEgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(32, "Barnarda C")); // Barnarda C Dim } }), BARNARDAE(GT_BranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, DIVIDED, 3, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaEgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(81, "Barnard E")); // "Barnard E Dim } }), BARNARDAF(GT_BranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, NEUTRONIUM, 3, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaFgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaFgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(82, "Barnard F")); // "Barnard F Dim } }), VEGA(GT_BranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, NAQUADAH, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "vegabgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "vegabgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt // Dim } @@ -2270,14 +2219,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { VEGAB(GT_BranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(VEGA, NAQUADRIA, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "vegabgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "vegabgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(84, "VegaB")); // VegaB Dim } }), @@ -2289,7 +2238,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TUNGSTEN, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "mercuryblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "mercuryblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(37, "Mercury")); // Mercury Dim }), VENUS(GT_BranchDefinition.PLANET, "Venus", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { @@ -2300,7 +2249,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, MITHRIL, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "venusblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "venusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim }), @@ -2317,7 +2266,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEUTRONIUM, BARNARDAF, 7, 10); if (Avaritia.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Avaritia.modID, "Resource_Block"), 0); + tMutation.requireResource(GameRegistry.findBlock(Avaritia.ID, "Resource_Block"), 0); }), INFINITYCATALYST(GT_BranchDefinition.PLANET, "InfinityCatalyst", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> { @@ -2335,7 +2284,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IMutationCustom tMutation = dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10) .setIsSecret(); if (Avaritia.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(Avaritia.modID, "Resource_Block"), 1); + tMutation.requireResource(GameRegistry.findBlock(Avaritia.ID, "Resource_Block"), 1); } }), INFINITY(GT_BranchDefinition.PLANET, "Infinity", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> { @@ -2349,7 +2298,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 10); if (AvaritiaAddons.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(AvaritiaAddons.modID, "InfinityChest"), 0); + tMutation.requireResource(GameRegistry.findBlock(AvaritiaAddons.ID, "InfinityChest"), 0); } }), KEVLAR(GT_BranchDefinition.IC2, "kevlar", false, new Color(0x2d542f), new Color(0xa2baa3), beeSpecies -> { @@ -2486,7 +2435,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 15); tMutation.restrictTemperature(HOT); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 0); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 0); }), FIRE(GT_BranchDefinition.INFUSEDSHARD, "Fire", false, new Color(0xED3801), new Color(0x3B0E00), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDIGNIS), 0.30f); @@ -2496,7 +2445,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), AIR, 15); tMutation.restrictTemperature(HELLISH); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 1); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 1); }), WATER(GT_BranchDefinition.INFUSEDSHARD, "Water", false, new Color(0x0090FF), new Color(0x002542), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAQUA), 0.30f); @@ -2506,7 +2455,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(FIRE, AIR, 15); tMutation.restrictTemperature(ICY); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 2); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 2); }), EARTH(GT_BranchDefinition.INFUSEDSHARD, "Earth", false, new Color(0x008600), new Color(0x003300), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDTERRA), 0.30f); @@ -2516,7 +2465,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(WATER, FIRE, 15); tMutation.restrictTemperature(WARM); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 3); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 3); }), ORDER(GT_BranchDefinition.INFUSEDSHARD, "Order", false, new Color(0x8A97B0), new Color(0x5C5F62), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDORDO), 0.30f); @@ -2526,7 +2475,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(EARTH, FIRE, 15); tMutation.restrictTemperature(ICY); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 4); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 4); }), CHAOS(GT_BranchDefinition.INFUSEDSHARD, "Chaos", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDPERDITIO), 0.30f); @@ -2536,7 +2485,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ORDER, FIRE, 15); tMutation.restrictTemperature(ICY); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 5); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 5); }), NETHERSHARD(GT_BranchDefinition.INFUSEDSHARD, "Nethershard", false, new Color(0xBE0135), new Color(0x350211), beeSpecies -> { @@ -2546,7 +2495,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(CHAOS, FIRE, 15); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem3"), 3); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockgem3"), 3); }), ENDSHARD(GT_BranchDefinition.INFUSEDSHARD, "Endshard", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> { @@ -2557,7 +2506,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NETHERSHARD, ENDDUST, 15); tMutation.restrictTemperature(ICY); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem1"), 7); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockgem1"), 7); }), // Organic branch 2.0 UNKNOWNWATER(GT_BranchDefinition.ORGANIC, "UnknownWater", false, new Color(0x4333A5), new Color(0x36ABFF), @@ -2571,13 +2520,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Endgame bees JAEGERMEISTER(GT_BranchDefinition.ENDGAME, "JaegerMeister", false, new Color(0x05AD18), new Color(0xE7DAC3), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("berriespp", "BppPotions", 1L, 8), 0.01f); + beeSpecies.addProduct(GT_ModHandler.getModItem(CropsPlusPlus.ID, "BppPotions", 1L, 8), 0.01f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, NAQUADRIA, 5); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockmachines"), 4684); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockmachines"), 4684); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(100, "Deep Dark")); // Deep Dark // dim }); diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index aba1fefc1b..49c5e7e1df 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -1,6 +1,6 @@ package gregtech.loaders.misc; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index ec380c5c32..43a0656ae4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; @@ -17,10 +19,10 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return; + if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return; switch (aMaterial.mName) { case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> { - if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) + if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID)) GT_ModHandler.removeRecipeByOutputDelayed(aStack); } case "Primitive", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index e56888c64f..2e9cb9a1d1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -1,6 +1,8 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BuildCraftSilicon; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -40,13 +42,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -89,13 +91,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -168,13 +170,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -217,13 +219,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0), 50, 120); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EtchedLowVoltageWiring", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0), 200, 16); GT_Values.RA.addLaserEngraverRecipe( @@ -317,13 +319,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -345,9 +347,9 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 50, 16); GT_Values.RA.addLaserEngraverRecipe( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L), 50, 16); GT_Values.RA.addLaserEngraverRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 04ef7c4731..7a6a3ec004 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -1,5 +1,6 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.util.GT_Utility.calculateRecipeEU; import net.minecraft.item.ItemStack; @@ -149,7 +150,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.addElectrolyzerRecipe( aStack, 0, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), null, null, null, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 4bb3dd2072..c3b57a61b7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.Railcraft; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -98,7 +100,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Creosote.getFluid(1000L), - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.cube", 1L, 8), null, null, null, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index de46e9d2f1..9d2bad9783 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -1,6 +1,6 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.Railcraft; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 72239056cd..7588139cfc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.Railcraft; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -77,7 +79,7 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_ModHandler.addPulverisationRecipe( GT_Utility.copyAmount(1L, aStack), GT_ModHandler.getModItem( - "Railcraft", + Railcraft.ID, "cube.crushed.obsidian", 1L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)), diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 464b84d11b..5cf6a56ce4 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.ModIDs.*; -import static gregtech.api.enums.ModIDs.GraviSuite; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Arrays; @@ -152,18 +152,18 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("dynamite", 1L)); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("industrialTnt", 1L)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 0)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 1)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 2)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 3)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 4)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 5)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 6)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 0)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 1)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 2)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 3)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 4)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 5)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 6)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 0)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 1)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 2)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 4)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 0)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 1)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 2)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 4)); ItemStack tStack = GT_ModHandler.removeRecipe( new ItemStack(Blocks.planks, 1, 0), @@ -2119,37 +2119,37 @@ public class GT_CraftingRecipeLoader implements Runnable { if (GraviSuite.isModLoaded()) { GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem(GraviSuite.modID, "advNanoChestPlate", 1, GT_Values.W)); + GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getModItem(GraviSuite.modID, "advNanoChestPlate", 1, GT_Values.W), + GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W), bits_no_remove_buffered, new Object[] { "CJC", "TNT", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Advanced), 'T', OrePrefixes.plate.get(Materials.TungstenSteel), 'J', - GT_ModHandler.getModItem(GraviSuite.modID, "advJetpack", 1, GT_Values.W), 'N', - GT_ModHandler.getModItem("IC2", "itemArmorNanoChestplate", 1, GT_Values.W), 'W', - OrePrefixes.wireGt12.get(Materials.Platinum), 'P', + GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W), 'N', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoChestplate", 1, GT_Values.W), + 'W', OrePrefixes.wireGt12.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Elite) }); GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem(GraviSuite.modID, "advLappack", 1, GT_Values.W)); + GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getModItem(GraviSuite.modID, "advLappack", 1, GT_Values.W), + GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W), bits_no_remove_buffered, new Object[] { "CEC", "EJE", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', - GT_ModHandler.getModItem("IC2", "itemArmorEnergypack", 1L, GT_Values.W), 'E', - GT_ModHandler.getModItem("IC2", "itemBatCrystal", 1L, GT_Values.W), 'W', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1L, GT_Values.W), 'E', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, GT_Values.W), 'W', OrePrefixes.wireGt04.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Data) }); GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem(GraviSuite.modID, "advJetpack", 1, GT_Values.W)); + GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getModItem(GraviSuite.modID, "advJetpack", 1, GT_Values.W), + GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W), bits_no_remove_buffered, new Object[] { "CJC", "EXE", "YZY", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', - GT_ModHandler.getModItem("IC2", "itemArmorJetpackElectric", 1, GT_Values.W), 'E', - OrePrefixes.plate.get(Materials.Titanium), 'X', - GT_ModHandler.getModItem("IC2", "itemArmorAlloyChestplate", 1L), 'Z', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GT_Values.W), + 'E', OrePrefixes.plate.get(Materials.Titanium), 'X', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAlloyChestplate", 1L), 'Z', OrePrefixes.circuit.get(Materials.Data), 'Y', OrePrefixes.wireGt02.get(Materials.Platinum) }); } @@ -2174,7 +2174,7 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), bits, new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', - GT_ModHandler.getModItem(BartWorks.modID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', OrePrefixes.frameGt.get(Materials.Chrome) }); } @@ -2189,8 +2189,8 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemList.Plank_Pine.get(2L), ItemList.Plank_Plum.get(2L), ItemList.Plank_Maple.get(2L), ItemList.Plank_Citrus.get(2L) }; for (int i = 0; i < coverIDs.length; i++) { - ItemStack slabWood = getModItem(Forestry.modID, "slabs", 1, i); - ItemStack slabWoodFireproof = getModItem(Forestry.modID, "slabsFireproof", 1, i); + ItemStack slabWood = getModItem(Forestry.ID, "slabs", 1, i); + ItemStack slabWoodFireproof = getModItem(Forestry.ID, "slabsFireproof", 1, i); GT_ModHandler.addCraftingRecipe( coverIDs[i], diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 2d9e2b859a..6053311f40 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.NotEnoughItems; import gregtech.api.enums.Materials; import gregtech.loaders.postload.chains.GT_BauxiteRefineChain; diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index c2af777700..5af192f33f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload; import static gregtech.api.enums.GT_Values.VP; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; @@ -245,7 +245,7 @@ public class GT_PostLoad { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1, Short.MAX_VALUE)) + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1, Short.MAX_VALUE)) .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), @@ -257,7 +257,7 @@ public class GT_PostLoad { if (GalacticraftMars.isModLoaded()) GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1, Short.MAX_VALUE)) + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1, Short.MAX_VALUE)) .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), @@ -270,7 +270,7 @@ public class GT_PostLoad { for (int i = 4; i < 9; i++) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] { GT_ModHandler.getModItem("GalaxySpace", "item.SchematicTier" + i, 1) + new ItemStack[] { GT_ModHandler.getModItem(GalaxySpace.ID, "item.SchematicTier" + i, 1) .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), @@ -573,7 +573,7 @@ public class GT_PostLoad { GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); if (Thaumcraft.isModLoaded()) { GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1)); } } diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index be48d7b45b..63e4ab98ea 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,7 +1,9 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; @@ -19,9 +21,9 @@ public class GT_NaniteChain { public static void run() { - ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 0); - ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.RadoxPolymerLens", 0); + ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0); + ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0); + ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens", 0); ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -66,7 +68,8 @@ public class GT_NaniteChain { // Carbon Nanites - Used to make more Nano Forge Controllers GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUVTierLens, getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), + new ItemStack[] { aUVTierLens, + getModItem(BartWorks.ID, "bw.werkstoffblockscasingadvanced.01", 8, 31776), ItemList.Circuit_Chip_SoC.get(64) }, new FluidStack[] { Materials.UUMatter.getFluid(200_000) }, new ItemStack[] { Materials.Carbon.getNanite(64), }, @@ -101,7 +104,7 @@ public class GT_NaniteChain { // Glowstone Nanites - Used in the optical circuit line GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.modID, "blockCompressedObsidian", 8, 7), // Double + new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 8, 7), // Double // compressed // glowstone // blocks @@ -143,13 +146,13 @@ public class GT_NaniteChain { // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto - // lens - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + new ItemStack[] { aUMVTierLens, getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming Materials.WhiteDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.modID, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), Materials.Space.getMolten(720), }, @@ -162,13 +165,13 @@ public class GT_NaniteChain { // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto - // lens - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + new ItemStack[] { aUMVTierLens, getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming Materials.BlackDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.modID, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), Materials.Time.getMolten(720), }, @@ -183,10 +186,10 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576), Materials.UUMatter.getFluid(1_000_000), }, diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 8cbdc42301..51f8c930bf 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,6 +1,7 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; import java.util.List; @@ -59,7 +60,7 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtCelestialTungsten", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), Materials.get("Quantum") .getPlates(6) }, null, @@ -67,7 +68,7 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtHypogen", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, Materials.SpaceTime.getMolten(144 * 8), @@ -608,7 +609,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), @@ -642,7 +643,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), @@ -676,7 +677,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index 779bd00d32..ae4f840c85 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -198,7 +198,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)) .noFluidInputs() .noFluidOutputs() @@ -207,7 +207,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -218,7 +218,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) @@ -229,7 +229,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)) .noFluidInputs() .noFluidOutputs() @@ -238,7 +238,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -249,7 +249,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L)) @@ -260,7 +260,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -269,7 +269,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)) .noFluidInputs() .noFluidOutputs() @@ -278,7 +278,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L)) @@ -289,7 +289,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)) .noFluidInputs() .noFluidOutputs() @@ -298,7 +298,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -309,7 +309,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L)) @@ -320,7 +320,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -329,7 +329,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -340,7 +340,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L)) @@ -351,7 +351,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)) .noFluidInputs() .noFluidOutputs() @@ -360,7 +360,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -371,7 +371,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L)) @@ -382,7 +382,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -391,7 +391,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -402,7 +402,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) @@ -413,7 +413,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -422,7 +422,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -433,7 +433,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) @@ -444,7 +444,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -453,7 +453,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -464,7 +464,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) @@ -475,7 +475,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -484,7 +484,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -495,7 +495,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 06c4ad1879..3ee78d3548 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; @@ -494,7 +494,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0), + getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0), new ItemStack(Items.lead, 1, 32767)) .itemOutputs(new ItemStack(Items.name_tag, 1, 0)) .fluidInputs(Materials.Glue.getFluid(72)) @@ -527,9 +527,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0), + getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -538,9 +538,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -549,9 +549,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -560,9 +560,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0), + getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -571,9 +571,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -582,9 +582,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -593,9 +593,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 23)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 23)) .fluidInputs(Materials.Redstone.getMolten(144)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -604,9 +604,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 24)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 24)) .fluidInputs(Materials.Redstone.getMolten(144)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -615,9 +615,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 22)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 22)) .fluidInputs(Materials.Redstone.getMolten(144)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -628,7 +628,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1), new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 0)) .noFluidInputs() .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -639,7 +639,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1), new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 600)) .noFluidInputs() .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -650,7 +650,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1), new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 1200)) .noFluidInputs() .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -659,7 +659,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Wax.get(6), new ItemStack(Items.string, 1, 32767)) - .itemOutputs(getModItem(Forestry.modID, "candle", 24L, 0)) + .itemOutputs(getModItem(Forestry.ID, "candle", 24L, 0)) .fluidInputs(Materials.Water.getFluid(600)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -668,7 +668,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Wax.get(2), ItemList.FR_Silk.get(1)) - .itemOutputs(getModItem(Forestry.modID, "candle", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "candle", 8L, 0)) .fluidInputs(Materials.Water.getFluid(200)) .noFluidOutputs() .duration(16 * TICKS) @@ -677,7 +677,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Silk.get(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 3)) + .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 3)) .fluidInputs(Materials.Water.getFluid(500)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -685,8 +685,8 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 1)) + .itemInputs(getModItem(Forestry.ID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 1)) .noFluidInputs() .noFluidOutputs() .duration(16 * TICKS) @@ -695,7 +695,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(Forestry.modID, "sturdyMachine", 1L, 0), + getModItem(Forestry.ID, "sturdyMachine", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4)) .itemOutputs(ItemList.FR_Casing_Hardened.get(1)) .fluidInputs(Materials.Water.getFluid(5000)) @@ -727,9 +727,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(Forestry.modID, "craftingMaterial", 5L, 1), - GT_Utility.getIntegratedCircuit(5)) + .itemInputs(getModItem(Forestry.ID, "craftingMaterial", 5L, 1), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)) .noFluidInputs() .noFluidOutputs() @@ -826,7 +824,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) + getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0)) .itemOutputs(new ItemStack(Items.book, 1, 0)) .fluidInputs(Materials.Glue.getFluid(20)) .noFluidOutputs() @@ -857,7 +855,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Paper_Printed_Pages.get(1), - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) + getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0)) .itemOutputs(new ItemStack(Items.written_book, 1, 0)) .fluidInputs(Materials.Glue.getFluid(20)) .noFluidOutputs() @@ -3213,7 +3211,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) @@ -3225,7 +3223,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) @@ -3237,7 +3235,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) @@ -3249,7 +3247,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) @@ -3315,7 +3313,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -3327,7 +3325,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -3339,7 +3337,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -3354,7 +3352,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -3366,7 +3364,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -3378,7 +3376,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -3393,7 +3391,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -3405,7 +3403,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -3420,7 +3418,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -3432,7 +3430,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -3447,7 +3445,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -3459,7 +3457,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -3474,7 +3472,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 5), + getModItem(IronChests.ID, "BlockIronChest", 2, 5), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -3489,7 +3487,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_UV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 6), + getModItem(IronChests.ID, "BlockIronChest", 2, 6), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_UV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) @@ -3504,7 +3502,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MAX.get(1), - getModItem(AvaritiaAddons.modID, "CompressedChest", 1), + getModItem(AvaritiaAddons.ID, "CompressedChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MAX.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) @@ -3534,7 +3532,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) @@ -3546,7 +3544,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) @@ -3558,7 +3556,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) @@ -3570,7 +3568,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) @@ -3640,7 +3638,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -3652,7 +3650,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -3664,7 +3662,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -3679,7 +3677,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -3691,7 +3689,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -3703,7 +3701,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -3718,7 +3716,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -3730,7 +3728,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -3745,7 +3743,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -3757,7 +3755,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -3772,7 +3770,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -3784,7 +3782,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -3799,7 +3797,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 5), + getModItem(IronChests.ID, "BlockIronChest", 2, 5), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -3814,7 +3812,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_UV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 6), + getModItem(IronChests.ID, "BlockIronChest", 2, 6), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) @@ -3833,7 +3831,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MAX.get(1), - getModItem(AvaritiaAddons.modID, "CompressedChest", 1), + getModItem(AvaritiaAddons.ID, "CompressedChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) @@ -3913,7 +3911,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) @@ -3925,7 +3923,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) @@ -3937,7 +3935,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) @@ -3949,7 +3947,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) @@ -3968,7 +3966,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -3980,7 +3978,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -3992,7 +3990,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -4007,7 +4005,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -4019,7 +4017,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -4031,7 +4029,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -4046,7 +4044,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -4058,7 +4056,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -4073,7 +4071,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -4085,7 +4083,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -4100,7 +4098,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -4112,7 +4110,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -4127,7 +4125,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronTanks.modID, "obsidianTank", 1), + getModItem(IronTanks.ID, "obsidianTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -4237,7 +4235,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) @@ -4249,7 +4247,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) @@ -4261,7 +4259,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) @@ -4273,7 +4271,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) @@ -4292,7 +4290,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -4304,7 +4302,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -4316,7 +4314,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -4331,7 +4329,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -4343,7 +4341,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -4355,7 +4353,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -4370,7 +4368,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -4382,7 +4380,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -4397,7 +4395,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -4409,7 +4407,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -4424,7 +4422,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -4436,7 +4434,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -4451,7 +4449,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronTanks.modID, "obsidianTank", 1), + getModItem(IronTanks.ID, "obsidianTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -4823,13 +4821,13 @@ public class AssemblerRecipes implements Runnable { .eut(48) .addTo(sAssemblerRecipes); - ItemStack tRailWood = getModItem(Railcraft.modID, "track", 64, 736); + ItemStack tRailWood = getModItem(Railcraft.ID, "track", 64, 736); if (tRailWood != null) { NBTTagCompound tTagWood = new NBTTagCompound(); tTagWood.setString("track", "railcraft:track.slow"); tRailWood.stackTagCompound = tTagWood; - ItemStack tRailWoodB = getModItem(Railcraft.modID, "track.slow", 16); + ItemStack tRailWoodB = getModItem(Railcraft.ID, "track.slow", 16); NBTTagCompound tTagWoodB = new NBTTagCompound(); tTagWoodB.setString("track", "railcraft:track.slow.boost"); tRailWoodB.stackTagCompound = tTagWoodB; @@ -4883,7 +4881,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailRe = getModItem(Railcraft.modID, "track", 64); + ItemStack tRailRe = getModItem(Railcraft.ID, "track", 64); NBTTagCompound tTagRe = new NBTTagCompound(); tTagRe.setString("track", "railcraft:track.reinforced"); tRailRe.stackTagCompound = tTagRe; @@ -4900,7 +4898,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailReB = getModItem(Railcraft.modID, "track.reinforced", 16); + ItemStack tRailReB = getModItem(Railcraft.ID, "track.reinforced", 16); NBTTagCompound tTagReB = new NBTTagCompound(); tTagReB.setString("track", "railcraft:track.reinforced.boost"); tRailReB.stackTagCompound = tTagReB; @@ -4917,7 +4915,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailEl = getModItem(Railcraft.modID, "track", 64); + ItemStack tRailEl = getModItem(Railcraft.ID, "track", 64); NBTTagCompound tTagEl = new NBTTagCompound(); tTagEl.setString("track", "railcraft:track.electric"); tRailEl.stackTagCompound = tTagEl; @@ -4934,7 +4932,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailHs = getModItem(Railcraft.modID, "track", 64, 816); + ItemStack tRailHs = getModItem(Railcraft.ID, "track", 64, 816); if (tRailHs != null) { NBTTagCompound tTagHs = new NBTTagCompound(); tTagHs.setString("track", "railcraft:track.speed"); @@ -4952,7 +4950,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); } - ItemStack tRailHsB = getModItem(Railcraft.modID, "track.speed", 16); + ItemStack tRailHsB = getModItem(Railcraft.ID, "track.speed", 16); NBTTagCompound tTagHsB = new NBTTagCompound(); tTagHsB.setString("track", "railcraft:track.speed.boost"); tRailHsB.stackTagCompound = tTagHsB; @@ -4970,7 +4968,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); // --- Wooden Switch Track --- - ItemStack tRailSS = getModItem(Railcraft.modID, "track.slow", 1, 19986); + ItemStack tRailSS = getModItem(Railcraft.ID, "track.slow", 1, 19986); if (tRailSS != null) { NBTTagCompound tTagSS = new NBTTagCompound(); tTagSS.setString("track", "railcraft:track.slow.switch"); @@ -5061,7 +5059,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Wooden Wye Track --- - ItemStack tRailSW = getModItem(Railcraft.modID, "track.slow", 1); + ItemStack tRailSW = getModItem(Railcraft.ID, "track.slow", 1); if (tRailSW != null) { NBTTagCompound tTagSW = new NBTTagCompound(); tTagSW.setString("track", "railcraft:track.slow.wye"); @@ -5152,7 +5150,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Wooden Junction Tack --- - ItemStack tRailSJ = getModItem(Railcraft.modID, "track.slow", 1); + ItemStack tRailSJ = getModItem(Railcraft.ID, "track.slow", 1); if (tRailSJ != null) { NBTTagCompound tTagSJ = new NBTTagCompound(); tTagSJ.setString("track", "railcraft:track.slow.junction"); @@ -5243,7 +5241,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Switch Tack --- - ItemStack tRailNS = getModItem(Railcraft.modID, "track", 1, 4767); + ItemStack tRailNS = getModItem(Railcraft.ID, "track", 1, 4767); if (tRailNS != null) { NBTTagCompound tTagNS = new NBTTagCompound(); tTagNS.setString("track", "railcraft:track.switch"); @@ -5335,7 +5333,7 @@ public class AssemblerRecipes implements Runnable { } // --- Wye Tack --- - ItemStack tRailNW = getModItem(Railcraft.modID, "track", 1, 2144); + ItemStack tRailNW = getModItem(Railcraft.ID, "track", 1, 2144); if (tRailNW != null) { NBTTagCompound tTagNW = new NBTTagCompound(); tTagNW.setString("track", "railcraft:track.wye"); @@ -5426,7 +5424,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Junction Tack --- - ItemStack tRailNJ = getModItem(Railcraft.modID, "track", 1); + ItemStack tRailNJ = getModItem(Railcraft.ID, "track", 1); if (tRailNJ != null) { NBTTagCompound tTagNJ = new NBTTagCompound(); tTagNJ.setString("track", "railcraft:track.junction"); @@ -5517,7 +5515,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Reinforced Switch Track --- - ItemStack tRailRS = getModItem(Railcraft.modID, "track.reinforced", 1); + ItemStack tRailRS = getModItem(Railcraft.ID, "track.reinforced", 1); if (tRailRS != null) { NBTTagCompound tTagRS = new NBTTagCompound(); tTagRS.setString("track", "railcraft:track.reinforced.switch"); @@ -5608,7 +5606,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Reinforced Wye Track --- - ItemStack tRailRW = getModItem(Railcraft.modID, "track.reinforced", 1); + ItemStack tRailRW = getModItem(Railcraft.ID, "track.reinforced", 1); if (tRailRW != null) { NBTTagCompound tTagRW = new NBTTagCompound(); tTagRW.setString("track", "railcraft:track.reinforced.wye"); @@ -5699,7 +5697,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Reinforced Junction Track --- - ItemStack tRailRJ = getModItem(Railcraft.modID, "track.reinforced", 1, 764); + ItemStack tRailRJ = getModItem(Railcraft.ID, "track.reinforced", 1, 764); if (tRailRJ != null) { NBTTagCompound tTagRJ = new NBTTagCompound(); tTagRJ.setString("track", "railcraft:track.reinforced.junction"); @@ -5790,7 +5788,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- H.S. Switch Track --- - ItemStack tRailSSw = getModItem(Railcraft.modID, "track.speed", 1, 7916); + ItemStack tRailSSw = getModItem(Railcraft.ID, "track.speed", 1, 7916); if (tRailSSw != null) { NBTTagCompound tTagRSSw = new NBTTagCompound(); tTagRSSw.setString("track", "railcraft:track.speed.switch"); @@ -5881,7 +5879,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- H.S. Wye Track --- - ItemStack tRailSWy = getModItem(Railcraft.modID, "track.speed", 1); + ItemStack tRailSWy = getModItem(Railcraft.ID, "track.speed", 1); if (tRailSWy != null) { NBTTagCompound tTagRSWy = new NBTTagCompound(); tTagRSWy.setString("track", "railcraft:track.speed.wye"); @@ -5972,7 +5970,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- H.S. Transition Track --- - ItemStack tRailSTt = getModItem(Railcraft.modID, "track.speed", 1, 26865); + ItemStack tRailSTt = getModItem(Railcraft.ID, "track.speed", 1, 26865); if (tRailSTt != null) { NBTTagCompound tTagRSTt = new NBTTagCompound(); tTagRSTt.setString("track", "railcraft:track.speed.transition"); @@ -6044,7 +6042,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Electric Switch Track --- - ItemStack tRailES = getModItem(Railcraft.modID, "track.electric", 1, 10488); + ItemStack tRailES = getModItem(Railcraft.ID, "track.electric", 1, 10488); if (tRailES != null) { NBTTagCompound tTagES = new NBTTagCompound(); tTagES.setString("track", "railcraft:track.electric.switch"); @@ -6135,7 +6133,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Electric Wye Track --- - ItemStack tRailEw = getModItem(Railcraft.modID, "track.electric", 1); + ItemStack tRailEw = getModItem(Railcraft.ID, "track.electric", 1); if (tRailEw != null) { NBTTagCompound tTagEw = new NBTTagCompound(); tTagEw.setString("track", "railcraft:track.electric.wye"); @@ -6226,7 +6224,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Electric Junction Track --- - ItemStack tRailEJ = getModItem(Railcraft.modID, "track.electric", 1); + ItemStack tRailEJ = getModItem(Railcraft.ID, "track.electric", 1); if (tRailEJ != null) { NBTTagCompound tTagREJ = new NBTTagCompound(); tTagREJ.setString("track", "railcraft:track.electric.junction"); @@ -6411,10 +6409,10 @@ public class AssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Plastic_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2), - getModItem(Railcraft.modID, "machine.alpha", 1L, 0), - getModItem(OpenComputers.modID, "item", 1L, 26), + getModItem(Railcraft.ID, "machine.alpha", 1L, 0), + getModItem(OpenComputers.ID, "item", 1L, 26), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(OpenComputers.modID, "item", 1L, 62)) + .itemOutputs(getModItem(OpenComputers.ID, "item", 1L, 62)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(12 * SECONDS + 10 * TICKS) @@ -6429,7 +6427,7 @@ public class AssemblerRecipes implements Runnable { ItemList.FR_Casing_Sturdy.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0)) .fluidInputs(Materials.SeedOil.getFluid(250)) .noFluidOutputs() .duration(5 * SECONDS) @@ -6442,7 +6440,7 @@ public class AssemblerRecipes implements Runnable { ItemList.FR_Casing_Sturdy.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0)) .fluidInputs(Materials.Lubricant.getFluid(125)) .noFluidOutputs() .duration(5 * SECONDS) @@ -6451,10 +6449,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(ExtraUtilities.modID, "trashcan", 1L, 0), + getModItem(ExtraUtilities.ID, "trashcan", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 11)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 11)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6463,10 +6461,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 7)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6475,10 +6473,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 8)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 8)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6487,10 +6485,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 9)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 9)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6504,7 +6502,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1, 0)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6515,7 +6513,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6527,7 +6525,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6537,9 +6535,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6551,7 +6549,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2), new ItemStack(Blocks.iron_bars, 2, 0), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6562,7 +6560,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6574,7 +6572,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6584,9 +6582,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6596,9 +6594,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6609,7 +6607,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6621,7 +6619,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6631,9 +6629,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6643,9 +6641,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2), - getModItem(NewHorizonsCoreMod.modID, "item.AluminiumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.AluminiumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6656,7 +6654,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6668,7 +6666,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6678,9 +6676,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6690,9 +6688,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6703,7 +6701,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6715,7 +6713,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6725,9 +6723,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6737,9 +6735,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.TitaniumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.TitaniumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6750,7 +6748,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6762,7 +6760,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6772,9 +6770,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6784,9 +6782,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6797,7 +6795,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6809,7 +6807,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6819,9 +6817,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6831,9 +6829,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.ChromeBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6844,7 +6842,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6856,7 +6854,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6866,9 +6864,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6878,9 +6876,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.IridiumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.IridiumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6891,7 +6889,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6903,7 +6901,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6913,9 +6911,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6925,9 +6923,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), - getModItem(NewHorizonsCoreMod.modID, "item.OsmiumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6938,7 +6936,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6950,7 +6948,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6960,9 +6958,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6972,9 +6970,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6987,7 +6985,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14)) .fluidInputs(Materials.Glue.getFluid(36)) .noFluidOutputs() .duration(10 * SECONDS) @@ -6998,7 +6996,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14)) .fluidInputs(Materials.Glue.getFluid(36)) .noFluidOutputs() .duration(10 * SECONDS) @@ -7009,7 +7007,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14)) .fluidInputs(Materials.Glue.getFluid(36)) .noFluidOutputs() .duration(10 * SECONDS) @@ -7020,7 +7018,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 3L, 14)) .fluidInputs(Materials.Glue.getFluid(72)) .noFluidOutputs() .duration(20 * SECONDS) @@ -7031,7 +7029,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 3L, 14)) .fluidInputs(Materials.Plastic.getMolten(36)) .noFluidOutputs() .duration(20 * SECONDS) @@ -7042,7 +7040,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 9L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 9L, 14)) .fluidInputs(Materials.Plastic.getMolten(72)) .noFluidOutputs() .duration(20 * SECONDS) @@ -7053,7 +7051,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 3)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -7062,7 +7060,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 4)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -7077,7 +7075,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(BartWorks.modID, "gt.bwMetaGeneratedplate", 6L, 88), + getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 6L, 88), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1)) .itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1)) .noFluidInputs() @@ -7108,7 +7106,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GalacticraftCore.modID, "item.heavyPlating", 1), + getModItem(GalacticraftCore.ID, "item.heavyPlating", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Ingot_Heavy2.get(1)) @@ -7120,7 +7118,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GalacticraftMars.modID, "item.null", 1L, 3), + getModItem(GalacticraftMars.ID, "item.null", 1L, 3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Ingot_Heavy3.get(1)) @@ -7291,7 +7289,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( ItemList.Electric_Pump_EV.get(4), ItemList.Field_Generator_EV.get(4), - getModItem(GTPlusPlus.modID, "itemPlateInconel690", 4), + getModItem(GTPlusPlus.ID, "itemPlateInconel690", 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), @@ -7313,7 +7311,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemVanillaMachineCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemVanillaMachineCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7324,7 +7322,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemInventoryScannerCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemInventoryScannerCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7335,7 +7333,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemEnergySensorLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemEnergySensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7346,7 +7344,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "RFSensorCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "RFSensorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7357,7 +7355,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) .noFluidInputs() @@ -7370,7 +7368,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 1), + getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) .noFluidInputs() @@ -7383,7 +7381,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 2), + getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7396,7 +7394,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemLiquidArrayLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemLiquidArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7409,7 +7407,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemEnergyArrayLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemEnergyArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7422,7 +7420,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemSensorLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) .noFluidInputs() @@ -7435,7 +7433,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "Item55ReactorCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "Item55ReactorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) .noFluidInputs() @@ -7446,7 +7444,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "CardAppeng", 1L, 0), + getModItem(IC2NuclearControl.ID, "CardAppeng", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index ddac3b5623..8a87e2ce2d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.BartWorks; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java index 0a9bbe203a..621900167a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; +import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; @@ -35,8 +35,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)) .outputChances(8000) .fluidInputs(Materials.Water.getFluid(200L)) .noFluidOutputs() @@ -45,8 +45,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)) .outputChances(8000) .fluidInputs(Materials.Water.getFluid(200L)) .noFluidOutputs() @@ -55,8 +55,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12)) .outputChances(8000) .fluidInputs(Materials.Water.getFluid(200L)) .noFluidOutputs() @@ -65,8 +65,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .noFluidOutputs() @@ -75,8 +75,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .noFluidOutputs() @@ -85,8 +85,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .noFluidOutputs() @@ -95,8 +95,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .noFluidOutputs() @@ -105,8 +105,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .noFluidOutputs() @@ -115,8 +115,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index a34015e5e1..c470a572b7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes; @@ -658,7 +658,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 1L, 78), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) .fluidInputs(Materials.Chlorine.getGas(3000)) @@ -672,7 +672,6 @@ public class BlastFurnaceRecipes implements Runnable { public void registerPrimitiveBlastFurnaceRecipes() { GT_Values.RA.stdBuilder() - .itemInputs(Materials.Iron.getIngots(1)) .itemOutputs(Materials.Steel.getIngots(1)) .noFluidInputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index 3149888354..d246a464f2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.IndustrialCraft2; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBrewingRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -518,7 +518,7 @@ public class BreweryRecipes implements Runnable { // biomass recipes { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4L, 0)) + .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4L, 0)) .noItemOutputs() .fluidInputs(getFluidStack(FluidRegistry.WATER.getUnlocalizedName(), 750)) .fluidOutputs(getFluidStack("biomass", 750)) @@ -527,7 +527,7 @@ public class BreweryRecipes implements Runnable { .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 16L, 0)) + .itemInputs(getModItem(Forestry.ID, "mulch", 16L, 0)) .noItemOutputs() .fluidInputs( getFluidStack( @@ -541,7 +541,7 @@ public class BreweryRecipes implements Runnable { .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 8L, 0)) + .itemInputs(getModItem(Forestry.ID, "mulch", 8L, 0)) .noItemOutputs() .fluidInputs(getFluidStack("juice", 500)) .fluidOutputs(getFluidStack("biomass", 750)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index b544eef76b..60fa4306eb 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.IndustrialCraft2; +import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index 6c4cebc91a..4eecdc63e2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -28,7 +28,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - getModItem(Thaumcraft.modID, "ItemResource", 2L, 14)) + getModItem(Thaumcraft.ID, "ItemResource", 2L, 14)) .outputChances(10000, 10000, 9000) .fluidInputs(Materials.Mercury.getFluid(200)) .noFluidOutputs() @@ -362,7 +362,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.meefRaw", 12L, 32767), + getModItem(TwilightForest.ID, "item.meefRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -373,7 +373,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.meefSteak", 16L, 32767), + getModItem(TwilightForest.ID, "item.meefSteak", 16L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -384,7 +384,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.venisonRaw", 12L, 32767), + getModItem(TwilightForest.ID, "item.venisonRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -395,7 +395,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.venisonCooked", 16L, 32767), + getModItem(TwilightForest.ID, "item.venisonCooked", 16L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -704,7 +704,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1), @@ -722,7 +722,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 36L, 45), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 36L, 45), GT_Utility.getIntegratedCircuit(2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 2), @@ -844,7 +844,7 @@ public class CentrifugeRecipes implements Runnable { // air GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)) .noFluidInputs() .noFluidOutputs() @@ -855,7 +855,7 @@ public class CentrifugeRecipes implements Runnable { // fire GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)) .noFluidInputs() .noFluidOutputs() @@ -866,7 +866,7 @@ public class CentrifugeRecipes implements Runnable { // aqua GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)) .noFluidInputs() .noFluidOutputs() @@ -877,7 +877,7 @@ public class CentrifugeRecipes implements Runnable { // terra GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)) .noFluidInputs() .noFluidOutputs() @@ -888,7 +888,7 @@ public class CentrifugeRecipes implements Runnable { // ordo GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)) .noFluidInputs() .noFluidOutputs() @@ -899,7 +899,7 @@ public class CentrifugeRecipes implements Runnable { // perditio GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)) .noFluidInputs() .noFluidOutputs() @@ -910,8 +910,8 @@ public class CentrifugeRecipes implements Runnable { // Nethershard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) @@ -921,8 +921,8 @@ public class CentrifugeRecipes implements Runnable { // Endshard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .noFluidInputs() .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) @@ -934,14 +934,14 @@ public class CentrifugeRecipes implements Runnable { // Caelestis red GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 2), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 10), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 14), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 1), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 12), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 6)) + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 2), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 10), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 14), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 1), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 12), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(25 * SECONDS + 12 * TICKS) @@ -951,13 +951,13 @@ public class CentrifugeRecipes implements Runnable { // Caelestis green GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 13), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 5), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 4), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 8), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 0), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 13), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 5), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 4), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 8), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 0), NI) .noFluidInputs() .noFluidOutputs() @@ -968,13 +968,13 @@ public class CentrifugeRecipes implements Runnable { // Caelestis blue GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 3), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 9), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 11), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 7), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 15), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 3), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 9), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 11), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 7), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 15), NI) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index fbcada3e7a..6b6f2526c7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.BuildCraftTransport; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.BuildCraftTransport; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -240,7 +240,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeRed.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 0)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 0)) .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -250,7 +250,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeBlue.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 1)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 1)) .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -260,7 +260,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeGreen.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 2)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 2)) .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -270,7 +270,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeYellow.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 3)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 3)) .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -369,7 +369,7 @@ public class ChemicalBathRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1)) - .itemOutputs(getModItem(Railcraft.modID, "cube", 1, 8)) + .itemOutputs(getModItem(Railcraft.ID, "cube", 1, 8)) .fluidInputs(Materials.Creosote.getFluid(100)) .noFluidOutputs() .duration(5 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 3f590b5f6d..3b7db2711c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes; @@ -115,7 +115,7 @@ public class ChemicalRecipes implements Runnable { .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GalaxySpace.modID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2)) + .itemInputs(getModItem(GalaxySpace.ID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2)) .itemOutputs(ItemList.Circuit_Chip_Stemcell.get(64)) .fluidInputs(Materials.GrowthMediumSterilized.getFluid(1000)) .fluidOutputs(getFluidStack("bacterialsludge", 1000)) @@ -1367,7 +1367,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( MaterialsKevlar.CobaltIINitrate.getDust(9), - getModItem(NewHorizonsCoreMod.modID, "item.PotassiumHydroxideDust", 6L, 0)) + getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6L, 0)) .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), Materials.Saltpeter.getDust(10)) .noFluidInputs() .noFluidOutputs() @@ -2682,7 +2682,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1)) - .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.glass", 6)) + .itemOutputs(getModItem(Railcraft.ID, "tile.railcraft.glass", 6)) .fluidInputs(Materials.Glass.getMolten(864)) .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) @@ -3905,7 +3905,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 3L, 63)) + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) .fluidOutputs(Materials.Hydrogen.getGas(2000)) .duration(45 * SECONDS) @@ -3920,7 +3920,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 6L, 10052)) + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052)) .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) .noFluidOutputs() .duration(20 * SECONDS) @@ -3947,7 +3947,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GTPlusPlus.modID, "Formaldehyde", 4), + getModItem(GTPlusPlus.ID, "Formaldehyde", 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), @@ -3979,7 +3979,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(GTPlusPlus.modID, "itemDustCalciumHydroxide", 5)) + .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5)) .fluidInputs(Materials.Water.getFluid(2000)) .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) .duration(15 * SECONDS) @@ -3994,7 +3994,7 @@ public class ChemicalRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) .itemOutputs( MaterialsKevlar.CobaltIIHydroxide.getDust(5), - getModItem(GTPlusPlus.modID, "itemDustSodiumNitrate", 10)) + getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -6216,7 +6216,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(1), - getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 1), + getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 1), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) .noItemOutputs() @@ -6231,7 +6231,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(9), - getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 7), + getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 7), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) .noItemOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 74f8ebc207..0be78dc630 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -37,7 +37,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Coated_Basic.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(15 * SECONDS) @@ -49,7 +49,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Coated_Basic.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(15 * SECONDS) @@ -60,8 +60,8 @@ public class CircuitAssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 2)) + getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(15 * SECONDS) @@ -73,7 +73,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Phenolic_Good.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(20 * SECONDS) @@ -85,7 +85,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Phenolic_Good.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(20 * SECONDS) @@ -96,8 +96,8 @@ public class CircuitAssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 2)) + getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(20 * SECONDS) @@ -109,7 +109,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Epoxy_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(25 * SECONDS) @@ -121,7 +121,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Epoxy_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(25 * SECONDS) @@ -132,8 +132,8 @@ public class CircuitAssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Epoxy_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 2)) + getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(25 * SECONDS) @@ -148,7 +148,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -163,7 +163,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -178,7 +178,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -193,7 +193,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -216,7 +216,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2)) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 0)) + .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, 0)) .fluidInputs(Materials.Glass.getMolten(576)) .noFluidOutputs() .duration(10 * SECONDS) @@ -231,7 +231,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2)) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 3)) + .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, 3)) .fluidInputs(Materials.Glass.getMolten(576)) .noFluidOutputs() .duration(10 * SECONDS) @@ -245,7 +245,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L), - getModItem(NewHorizonsCoreMod.modID, "item.LongObsidianRod", 2L, 0), + getModItem(NewHorizonsCoreMod.ID, "item.LongObsidianRod", 2L, 0), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L), @@ -261,7 +261,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), rodMaterials[metaid]) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, metaid)) + .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, metaid)) .fluidInputs(Materials.Glass.getMolten(576)) .noFluidOutputs() .duration(10 * SECONDS) @@ -282,7 +282,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -297,7 +297,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -312,7 +312,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -327,7 +327,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index ed86b3dd8b..353af1593b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -24,7 +24,7 @@ public class CompressorRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GTPlusPlus.modID, "blockRainforestOakSapling", 8, 0)) + .itemInputs(getModItem(GTPlusPlus.ID, "blockRainforestOakSapling", 8, 0)) .itemOutputs(ItemList.IC2_Plantball.get(1)) .noFluidInputs() .noFluidOutputs() @@ -106,7 +106,7 @@ public class CompressorRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -114,8 +114,8 @@ public class CompressorRecipes implements Runnable { .addTo(sCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 10)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 10)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -123,7 +123,7 @@ public class CompressorRecipes implements Runnable { .addTo(sCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 11)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)) .noFluidInputs() .noFluidOutputs() @@ -132,8 +132,8 @@ public class CompressorRecipes implements Runnable { .addTo(sCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 12)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockFluix", 1)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 12)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockFluix", 1)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java index 0461e331da..8f684f9a06 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -93,9 +93,9 @@ public class CuttingRecipes implements Runnable { if (TinkerConstruct.isModLoaded()) { recipeWithClassicFluids( - new ItemStack[] { getModItem(TinkerConstruct.modID, "GlassBlock", 3L, 0) }, - new ItemStack[] { getModItem(TinkerConstruct.modID, "GlassBlock", 3L, 0), - getModItem(TinkerConstruct.modID, "GlassPane", 8L, 0) }, + new ItemStack[] { getModItem(TinkerConstruct.ID, "GlassBlock", 3L, 0) }, + new ItemStack[] { getModItem(TinkerConstruct.ID, "GlassBlock", 3L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 8L, 0) }, 2 * SECONDS + 10 * TICKS, 8, false); @@ -199,8 +199,8 @@ public class CuttingRecipes implements Runnable { ItemList.Plank_Pine.get(2L), ItemList.Plank_Plum.get(2L), ItemList.Plank_Maple.get(2L), ItemList.Plank_Citrus.get(2L) }; for (int i = 0; i < coverIDs.length; i++) { - ItemStack slabWood = getModItem(Forestry.modID, "slabs", 1, i); - ItemStack slabWoodFireproof = getModItem(Forestry.modID, "slabsFireproof", 1, i); + ItemStack slabWood = getModItem(Forestry.ID, "slabs", 1, i); + ItemStack slabWoodFireproof = getModItem(Forestry.ID, "slabsFireproof", 1, i); recipeWithClassicFluids( new ItemStack[] { slabWood }, @@ -221,16 +221,11 @@ public class CuttingRecipes implements Runnable { if (BuildCraftTransport.isModLoaded()) { recipeWithClassicFluids( - new ItemStack[] { getModItem( - BuildCraftTransport.modID, - "item.buildcraftPipe.pipestructurecobblestone", - 1L, - 0) }, - new ItemStack[] { getModItem( - BuildCraftTransport.modID, - "item.buildcraftPipe.pipestructurecobblestone", - 1L, - 0), getModItem(BuildCraftTransport.modID, "pipePlug", 8L, 0) }, + new ItemStack[] { + getModItem(BuildCraftTransport.ID, "item.buildcraftPipe.pipestructurecobblestone", 1L, 0) }, + new ItemStack[] { + getModItem(BuildCraftTransport.ID, "item.buildcraftPipe.pipestructurecobblestone", 1L, 0), + getModItem(BuildCraftTransport.ID, "pipePlug", 8L, 0) }, 1 * SECONDS + 12 * TICKS, 16, false); diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 22d65e0634..1c7a5a411c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.TinkerConstruct; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index af2e1622ae..827d45cf00 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -156,7 +156,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Mercury.getFluid(1000L)) @@ -183,7 +183,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L, 0)) + .itemInputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.ReinforceGlass.getMolten(144)) @@ -192,7 +192,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.ReinforceGlass.getMolten(72)) @@ -201,7 +201,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassLense", 1L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassLense", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.ReinforceGlass.getMolten(54)) @@ -267,7 +267,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iron.getMolten(288)) @@ -276,7 +276,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iron.getMolten(144)) @@ -285,7 +285,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) .outputChances(10000) .noFluidInputs() @@ -295,7 +295,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Steel.getMolten(288)) @@ -304,7 +304,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Steel.getMolten(144)) @@ -313,7 +313,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Steel.getMolten(1836)) @@ -322,7 +322,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Aluminium.getMolten(288)) @@ -331,7 +331,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Aluminium.getMolten(144)) @@ -340,7 +340,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L)) .outputChances(10000) .noFluidInputs() @@ -350,7 +350,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.StainlessSteel.getMolten(288)) @@ -359,7 +359,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.StainlessSteel.getMolten(144)) @@ -368,7 +368,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.StainlessSteel.getMolten(1836)) @@ -377,7 +377,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Titanium.getMolten(288)) @@ -386,7 +386,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Titanium.getMolten(144)) @@ -395,7 +395,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Titanium.getMolten(1836)) @@ -404,7 +404,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.TungstenSteel.getMolten(288)) @@ -413,7 +413,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.TungstenSteel.getMolten(144)) @@ -422,7 +422,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.TungstenSteel.getMolten(1836)) @@ -431,7 +431,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Palladium.getMolten(288)) @@ -440,7 +440,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Palladium.getMolten(144)) @@ -449,7 +449,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) .outputChances(10000) .noFluidInputs() @@ -459,7 +459,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iridium.getMolten(288)) @@ -468,7 +468,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iridium.getMolten(144)) @@ -477,7 +477,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) .outputChances(10000) .noFluidInputs() @@ -487,7 +487,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Osmium.getMolten(288)) @@ -496,7 +496,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Osmium.getMolten(144)) @@ -505,7 +505,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) .outputChances(10000) .noFluidInputs() @@ -515,7 +515,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Neutronium.getMolten(288)) @@ -524,7 +524,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Neutronium.getMolten(144)) @@ -533,7 +533,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Neutronium.getMolten(1836)) @@ -605,7 +605,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "phosphor", 1L)) + .itemInputs(getModItem(Forestry.ID, "phosphor", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L)) .outputChances(1000) .noFluidInputs() @@ -618,7 +618,7 @@ public class FluidExtractorRecipes implements Runnable { if (BartWorks.isModLoaded()) { // xenon GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.modID, "gt.comb", 1L, 134), + getModItem(GregTech.ID, "gt.comb", 1L, 134), null, getFluidStack("xenon", 250), 100 * 100, @@ -626,7 +626,7 @@ public class FluidExtractorRecipes implements Runnable { 8192); // neon GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.modID, "gt.comb", 1L, 135), + getModItem(GregTech.ID, "gt.comb", 1L, 135), null, getFluidStack("neon", 250), 100 * 100, @@ -634,7 +634,7 @@ public class FluidExtractorRecipes implements Runnable { 8192); // krpton GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.modID, "gt.comb", 1L, 136), + getModItem(GregTech.ID, "gt.comb", 1L, 136), null, getFluidStack("krypton", 250), 100 * 100, diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index 49030f7eeb..ae21f1a311 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; @@ -50,7 +50,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) + .itemOutputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) .fluidInputs(Materials.Mercury.getFluid(1000L)) .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) @@ -230,7 +230,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) .fluidInputs(Materials.ReinforceGlass.getMolten(72)) .noFluidOutputs() .duration(8 * SECONDS) @@ -239,7 +239,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L)) + .itemOutputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L)) .fluidInputs(Materials.ReinforceGlass.getMolten(144)) .noFluidOutputs() .duration(8 * SECONDS) @@ -347,7 +347,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) - .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.anvil", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 0)) .fluidInputs(Materials.Steel.getMolten(4464L)) .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index cab48ac9b5..9f05b95aa0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -165,9 +165,7 @@ public class ForgeHammerRecipes implements Runnable { if (GTPlusPlus.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Tesseract.get(1L), - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) + .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) .noItemOutputs() .fluidInputs(Materials.SpaceTime.getMolten(2880L)) .fluidOutputs(Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)) @@ -178,7 +176,7 @@ public class ForgeHammerRecipes implements Runnable { if (HardcoreEnderExpansion.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) + .itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ore", 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java index c53e0df19e..0c0cd555c6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; -import static gregtech.api.enums.ModIDs.BuildCraftSilicon; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BuildCraftSilicon; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -22,8 +22,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -33,8 +33,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -44,8 +44,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 2)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -55,8 +55,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 3)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -66,8 +66,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 2L, 4)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -77,8 +77,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 5)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 5)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -88,8 +88,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Items.comparator, 1, 32767), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 6)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -100,9 +100,9 @@ public class FormingPressRecipes implements Runnable { if (AppliedEnergistics2.isModLoaded()) { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 13)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -112,8 +112,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 13)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -123,8 +123,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 14)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 14)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -134,8 +134,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 15)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 15)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -145,8 +145,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 19)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 19)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java index a412b822e1..bccafd3983 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; -import static gregtech.api.enums.ModIDs.ThaumicTinkerer; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; @@ -45,7 +45,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.modID, "ItemShard", 1L, 6)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemShard", 1L, 6)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -56,7 +56,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "GluttonyShard", 1L)) + .itemInputs(getModItem(ForbiddenMagic.ID, "GluttonyShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -67,7 +67,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "FMResource", 1L, 3)) + .itemInputs(getModItem(ForbiddenMagic.ID, "FMResource", 1L, 3)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -78,7 +78,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -89,7 +89,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 1)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 1)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -100,7 +100,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 2)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 2)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -111,7 +111,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 3)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 3)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -122,7 +122,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 4)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 4)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -133,7 +133,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 5)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 5)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -144,7 +144,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 6)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 6)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -155,7 +155,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(TaintedMagic.modID, "WarpedShard", 1L)) + .itemInputs(getModItem(TaintedMagic.ID, "WarpedShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -166,7 +166,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(TaintedMagic.modID, "FluxShard", 1L)) + .itemInputs(getModItem(TaintedMagic.ID, "FluxShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -177,7 +177,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(TaintedMagic.modID, "EldritchShard", 1L)) + .itemInputs(getModItem(TaintedMagic.ID, "EldritchShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -188,7 +188,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)) + .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -199,7 +199,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)) + .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java index c25262933c..f9d85db610 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.GalacticraftCore; -import static gregtech.api.enums.ModIDs.GalacticraftMars; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sImplosionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -38,19 +38,19 @@ public class ImplosionCompressorRecipes implements Runnable { addImplosionRecipe( ItemList.Ingot_Heavy1.get(1L), 8, - new ItemStack[] { getModItem(GalacticraftCore.modID, "item.heavyPlating", 1L), + new ItemStack[] { getModItem(GalacticraftCore.ID, "item.heavyPlating", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.StainlessSteel, 1L) }); addImplosionRecipe( ItemList.Ingot_Heavy2.get(1L), 16, - new ItemStack[] { getModItem(GalacticraftMars.modID, "item.null", 1L, 3), + new ItemStack[] { getModItem(GalacticraftMars.ID, "item.null", 1L, 3), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 2L) }); addImplosionRecipe( ItemList.Ingot_Heavy3.get(1L), 24, - new ItemStack[] { getModItem(GalacticraftMars.modID, "item.itemBasicAsteroids", 1L), + new ItemStack[] { getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 3L) }); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java index dc136d7f74..58e871713a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLatheRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -31,7 +31,7 @@ public class LatheRecipes implements Runnable { .addTo(sLatheRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "slabs", 1L, GT_Values.W)) + .itemInputs(getModItem(Forestry.ID, "slabs", 1L, GT_Values.W)) .itemOutputs( new ItemStack(Items.bowl, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index fa0c97c2d0..02828bf884 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -2,13 +2,13 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.NF; import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; -import static gregtech.api.enums.ModIDs.BiomesOPlanty; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.Natura; -import static gregtech.api.enums.ModIDs.PamsHarvestCraft; -import static gregtech.api.enums.ModIDs.Railcraft; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -645,7 +645,7 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) @@ -657,7 +657,7 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) @@ -672,7 +672,7 @@ public class MixerRecipes implements Runnable { ItemList.IC2_Fertilizer.get(1), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -684,7 +684,7 @@ public class MixerRecipes implements Runnable { ItemList.FR_Fertilizer.get(1), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -696,7 +696,7 @@ public class MixerRecipes implements Runnable { ItemList.FR_Compost.get(1), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -708,7 +708,7 @@ public class MixerRecipes implements Runnable { ItemList.FR_Mulch.get(8), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -720,7 +720,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.sand, 1, 32767), new ItemStack(Blocks.dirt, 1, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 2L, 1)) + .itemOutputs(getModItem(Forestry.ID, "soil", 2L, 1)) .fluidInputs(Materials.Water.getFluid(250)) .noFluidOutputs() .duration(16 * TICKS) @@ -1107,7 +1107,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(1000)) @@ -1120,7 +1120,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(750)) @@ -1133,7 +1133,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(500)) @@ -1146,7 +1146,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(400)) @@ -1159,7 +1159,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(300)) @@ -1172,7 +1172,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(200)) @@ -1283,7 +1283,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 32767), new ItemStack(Items.wheat, 4, 32767), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1295,7 +1295,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 2), new ItemStack(Items.wheat, 4, 32767), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1305,9 +1305,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(BiomesOPlanty.modID, "plants", 4, 6), + getModItem(BiomesOPlenty.ID, "plants", 4, 6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1317,9 +1317,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(BiomesOPlanty.modID, "plants", 4, 6), + getModItem(BiomesOPlenty.ID, "plants", 4, 6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1329,9 +1329,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "oatsItem", 4), + getModItem(PamsHarvestCraft.ID, "oatsItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1341,9 +1341,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "oatsItem", 4), + getModItem(PamsHarvestCraft.ID, "oatsItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1353,9 +1353,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "ryeItem", 4), + getModItem(PamsHarvestCraft.ID, "ryeItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1365,9 +1365,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "ryeItem", 4), + getModItem(PamsHarvestCraft.ID, "ryeItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1377,9 +1377,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "barleyItem", 4), + getModItem(PamsHarvestCraft.ID, "barleyItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1389,9 +1389,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "barleyItem", 4, 6), + getModItem(PamsHarvestCraft.ID, "barleyItem", 4, 6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1401,9 +1401,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(Natura.modID, "barleyFood", 4), + getModItem(Natura.ID, "barleyFood", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1413,9 +1413,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(Natura.modID, "barleyFood", 4), + getModItem(Natura.ID, "barleyFood", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1427,7 +1427,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1439,7 +1439,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1733,7 +1733,7 @@ public class MixerRecipes implements Runnable { .itemInputs( EnumCube.COKE_BLOCK.getItem(), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(300)) @@ -1746,7 +1746,7 @@ public class MixerRecipes implements Runnable { .itemInputs( EnumCube.COKE_BLOCK.getItem(), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(120)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java index 865bee813a..961488991c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java +++ b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.NotEnoughItems; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java index e45b160352..1b78bfd4e9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java +++ b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.util.GT_ModHandler.getModItem; import gregtech.api.enums.Materials; @@ -15,7 +15,7 @@ public class OreDictUnification implements Runnable { GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.HeeEndium, - getModItem(HardcoreEnderExpansion.modID, "endium_ingot", 1), + getModItem(HardcoreEnderExpansion.ID, "endium_ingot", 1), true, true); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index bc680c40e5..49e2c14011 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPlasmaForgeRecipes; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; @@ -32,13 +31,13 @@ public class PlasmaForgeRecipes implements Runnable { // Quantum anomaly recipe bypass for UXV. Avoids RNG. GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 1), - getModItem(GoodGenerator.modID, "huiCircuit", 1, 4)) + getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 1), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4)) .fluidInputs( Materials.WhiteDwarfMatter.getMolten(144), getFluidStack("molten.shirabon", 72), Materials.BlackDwarfMatter.getMolten(144)) - .itemOutputs(getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) + .itemOutputs(getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) .noFluidOutputs() .duration(50 * 20) .eut((int) TierEU.RECIPE_UXV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index c20609f8e0..0c800b0518 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; @@ -70,7 +70,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 18)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 18)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1)) .noFluidInputs() .noFluidOutputs() @@ -224,7 +224,7 @@ public class Pulverizer implements Runnable { // Iron GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2)) .noFluidInputs() .noFluidOutputs() @@ -233,7 +233,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -244,7 +244,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3)) @@ -257,7 +257,7 @@ public class Pulverizer implements Runnable { // Steel GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2)) .noFluidInputs() .noFluidOutputs() @@ -266,7 +266,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -277,7 +277,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3)) @@ -290,7 +290,7 @@ public class Pulverizer implements Runnable { // Aluminium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2)) .noFluidInputs() .noFluidOutputs() @@ -299,7 +299,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -310,7 +310,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3)) @@ -323,7 +323,7 @@ public class Pulverizer implements Runnable { // Stainless Steel GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2)) .noFluidInputs() .noFluidOutputs() @@ -332,7 +332,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -343,7 +343,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3)) @@ -356,7 +356,7 @@ public class Pulverizer implements Runnable { // Titanium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2)) .noFluidInputs() .noFluidOutputs() @@ -365,7 +365,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -376,7 +376,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3)) @@ -389,7 +389,7 @@ public class Pulverizer implements Runnable { // Tungesten Steel GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2)) .noFluidInputs() .noFluidOutputs() @@ -398,7 +398,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -409,7 +409,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3)) @@ -422,7 +422,7 @@ public class Pulverizer implements Runnable { // Palladium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2)) .noFluidInputs() .noFluidOutputs() @@ -431,7 +431,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -442,7 +442,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3)) @@ -455,7 +455,7 @@ public class Pulverizer implements Runnable { // Iridium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2)) .noFluidInputs() .noFluidOutputs() @@ -464,7 +464,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -475,7 +475,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3)) @@ -488,7 +488,7 @@ public class Pulverizer implements Runnable { // Osmium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2)) .noFluidInputs() .noFluidOutputs() @@ -497,7 +497,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -508,7 +508,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3)) @@ -521,7 +521,7 @@ public class Pulverizer implements Runnable { // Neutronium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2)) .noFluidInputs() .noFluidOutputs() @@ -530,7 +530,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -541,7 +541,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3)) @@ -552,7 +552,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "cube.crushed.obsidian", 1L)) + .itemInputs(getModItem(Railcraft.ID, "cube.crushed.obsidian", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) .noFluidInputs() .noFluidOutputs() @@ -563,8 +563,8 @@ public class Pulverizer implements Runnable { if (AppliedEnergistics2.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1L, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1L, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -572,8 +572,8 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyChest", 1L, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 45)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyChest", 1L, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 45)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -690,7 +690,7 @@ public class Pulverizer implements Runnable { if (HardcoreEnderExpansion.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) + .itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ore", 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java index 64201ce719..062df3d472 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -84,7 +84,7 @@ public class PyrolyseRecipes implements Runnable { if (Forestry.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .fluidInputs(Materials.Water.getFluid(4000)) .fluidOutputs(Materials.Biomass.getFluid(5000)) @@ -93,7 +93,7 @@ public class PyrolyseRecipes implements Runnable { .addTo(sPyrolyseRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(Forestry.ID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .fluidInputs(Materials.Water.getFluid(4000)) .fluidOutputs(Materials.Biomass.getFluid(5000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java index 52736232b9..cf2e88f364 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java +++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.recipes; +import static gregtech.api.enums.Mods.ExtraTrees; +import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Iterator; @@ -89,16 +91,16 @@ public class RecipeRemover implements Runnable { GT_Utility.removeSimpleIC2MachineRecipe( GT_Values.NI, GT_ModHandler.getMaceratorRecipeList(), - getModItem("IC2", "itemBiochaff", 1L)); + getModItem(IndustrialCraft2.ID, "itemBiochaff", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Blocks.cactus, 8, 0), GT_ModHandler.getCompressorRecipeList(), - getModItem("IC2", "itemFuelPlantBall", 1L)); + getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( - getModItem("ExtraTrees", "food", 8L, 24), + getModItem(ExtraTrees.ID, "food", 8L, 24), GT_ModHandler.getCompressorRecipeList(), - getModItem("IC2", "itemFuelPlantBall", 1L)); + getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( ItemList.Crop_Drop_BobsYerUncleRanks.get(1L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java index 43fca26e7a..9af6836ce3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Arrays; @@ -33,8 +33,8 @@ public class ThaumcraftRecipes implements Runnable { String tKey = "GT_BALANCE_SHARD_RECIPE"; GregTech_API.sThaumcraftCompat.addCrucibleRecipe( "TB.SM", - getModItem(Thaumcraft.modID, "ItemResource", 1L, 14), - getModItem(Thaumcraft.modID, "ItemShard", 1L, 6), + getModItem(Thaumcraft.ID, "ItemResource", 1L, 14), + getModItem(Thaumcraft.ID, "ItemShard", 1L, 6), Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))); @@ -560,7 +560,7 @@ public class ThaumcraftRecipes implements Runnable { "Transformation of obsidian into skystone", new String[] { "GT_ADVANCEDMETALLURGY" }, "ALCHEMY", - getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1), + getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1), 4, 0, 19, @@ -576,7 +576,7 @@ public class ThaumcraftRecipes implements Runnable { GregTech_API.sThaumcraftCompat.addCrucibleRecipe( tKey, new ItemStack(Blocks.obsidian), - getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1), + getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1), Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), @@ -951,11 +951,11 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 32L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 16L)), - new ItemStack[] { getModItem(Thaumcraft.modID, "ItemResource", 1L, 14), + new ItemStack[] { getModItem(Thaumcraft.ID, "ItemResource", 1L, 14), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1), - getModItem(Thaumcraft.modID, "ItemResource", 1L, 14), + getModItem(Thaumcraft.ID, "ItemResource", 1L, 14), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1) }) }); diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index db006d1ef5..0557d14640 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index 73ef51c411..2aad0220a2 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -1,6 +1,11 @@ package gregtech.loaders.preload; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TwilightForest; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -22,53 +27,53 @@ public class GT_Loader_ItemData implements Runnable { public void run() { GT_Log.out.println("GT_Mod: Loading Item Data Tags"); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.giantPick", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0), new ItemData(Materials.Stone, 696729600L, new MaterialStack(Materials.Wood, 464486400L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.giantSword", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0), new ItemData(Materials.Stone, 464486400L, new MaterialStack(Materials.Wood, 232243200L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "tile.GiantLog", 1L, 32767), + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767), new ItemData(Materials.Wood, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "tile.GiantCobble", 1L, 32767), + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767), new ItemData(Materials.Stone, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "tile.GiantObsidian", 1L, 32767), + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767), new ItemData(Materials.Obsidian, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.minotaurAxe", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0), new ItemData( Materials.Diamond, 14515200L, new MaterialStack(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 2L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.armorShards", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0), new ItemData(Materials.Knightmetal, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.shardCluster", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0), new ItemData(Materials.Knightmetal, 3628800L)); GT_OreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), new ItemData(Materials.CertusQuartz, 1814400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11), new ItemData(Materials.NetherQuartz, 1814400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 12), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12), new ItemData(Materials.Fluix, 1814400L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L, 32767), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzPillar", 1L, 32767), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L, 32767), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); GT_OreDictUnificator.addItemData( @@ -94,7 +99,7 @@ public class GT_Loader_ItemData implements Runnable { 14515200L, new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 5), + GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5), new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData( @@ -170,7 +175,7 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 8L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0), new ItemData(Materials.Steel, 10886400L)); GT_OreDictUnificator.addItemData( GT_ModHandler.getIC2Item("ironFurnace", 1L), @@ -184,13 +189,13 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Iron, 7257600L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 0), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 0), new ItemData(Materials.Steel, 108864000L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 1), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 1), new ItemData(Materials.Steel, 72576000L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 2), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 2), new ItemData(Materials.Steel, 36288000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L)); @@ -412,19 +417,19 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.dropper, 1, 32767), new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetChicken", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetBeef", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetPork", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetFish", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 1L, 0), - GT_ModHandler.getModItem("TwilightForest", "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( @@ -432,8 +437,8 @@ public class GT_Loader_ItemData implements Runnable { new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } - for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 1L, 0), - GT_ModHandler.getModItem("TwilightForest", "item.venisonCooked", 1L, 0), + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), new ItemStack(Items.cooked_chicken), new ItemStack(Items.cooked_fished) }) { if (tItem != null) { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 1a965607ea..780f2afeff 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -4,6 +4,12 @@ import static gregtech.api.enums.FluidState.GAS; import static gregtech.api.enums.FluidState.LIQUID; import static gregtech.api.enums.FluidState.MOLTEN; import static gregtech.api.enums.FluidState.SLURRY; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BloodArsenal; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TwilightForest; import java.util.Locale; @@ -626,18 +632,18 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity."); GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity"); FMLInterModComms.sendMessage( - "appliedenergistics2", + AppliedEnergistics2.ID, "whitelist-spatial", tBaseMetaTileEntity.getClass() .getName()); GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity."); GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity"); - FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", BaseMetaPipeEntity.class.getName()); + FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", BaseMetaPipeEntity.class.getName()); GT_Log.out.println("GT_Mod: Registering the Ore TileEntity."); GameRegistry.registerTileEntity(GT_TileEntity_Ores.class, "GT_TileEntity_Ores"); - FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", GT_TileEntity_Ores.class.getName()); + FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", GT_TileEntity_Ores.class.getName()); if (!GregTech_API.mIC2Classic) { GT_Log.out.println("GT_Mod: Registering Fluids."); Materials.ConstructionFoam.mFluid = GT_Utility.getFluidForFilledItem( @@ -2075,80 +2081,80 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.FierySteel, - GT_ModHandler.getModItem("TwilightForest", "item.fieryIngot", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryIngot", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Knightmetal, - GT_ModHandler.getModItem("TwilightForest", "item.knightMetal", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.knightMetal", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Steeleaf, - GT_ModHandler.getModItem("TwilightForest", "item.steeleafIngot", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.steeleafIngot", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.IronWood, - GT_ModHandler.getModItem("TwilightForest", "item.ironwoodIngot", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.ironwoodIngot", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedAir, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 0)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedFire, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 1)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 1)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedWater, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 2)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 2)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedEarth, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 3)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 3)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedOrder, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 4)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 4)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedEntropy, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 5)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 5)); GT_OreDictUnificator.set( OrePrefixes.nugget, Materials.Mercury, - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 5)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 5)); GT_OreDictUnificator.set( OrePrefixes.nugget, Materials.Thaumium, - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 6)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 6)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Thaumium, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 2)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 2)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.Mercury, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 3)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.Amber, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 6)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.Firestone, - GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); + GT_ModHandler.getModItem(Railcraft.ID, "firestone.raw", 1L)); GT_OreDictUnificator.set( OrePrefixes.nugget, Materials.Void, - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 7)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Void, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.BloodInfusedIron, - GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0)); + GT_ModHandler.getModItem(BloodArsenal.ID, "blood_infused_iron", 1L, 0)); if (GregTech_API.sUnification.get( ConfigCategories.specialunificationtargets + "." + "railcraft", @@ -2157,12 +2163,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Iron, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Iron, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0), false, false); } @@ -2174,12 +2180,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Steel, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Steel, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1), false, false); } @@ -2191,12 +2197,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.TinAlloy, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.TinAlloy, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2), false, false); } @@ -2208,12 +2214,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Copper, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Copper, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3), false, false); } @@ -2221,7 +2227,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.dust, Materials.Cocoa, - GT_ModHandler.getModItem("harvestcraft", "cocoapowderItem", 1L, 0)); + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "cocoapowderItem", 1L, 0)); GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L)); GregTech_API.registerMachineBlock( diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index d63647b2aa..ec1866b375 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1,6 +1,6 @@ package gregtech.loaders.preload; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -1346,22 +1346,22 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.reinforced", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar.reinforced", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.magic", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar.magic", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.void", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar.void", 1L, 0) }); ItemList.Hatch_AutoMaintenance.set( new GT_MetaTileEntity_Hatch_Maintenance( @@ -1475,7 +1475,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC bitsd, new Object[] { aTextPlate, "PTP", aTextPlateMotor, 'M', ItemList.Hull_HP, 'P', OrePrefixes.plate.get(Materials.Steel), 'T', - GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0) }); + GT_ModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Bronze_Boiler_Solar.get(1L), bitsd, @@ -1487,7 +1487,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC bitsd, new Object[] { "GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_HP_Bricks, 'P', OrePrefixes.pipeSmall.get(Materials.Steel), 'S', OrePrefixes.plateTriple.get(Materials.Silver), - 'G', GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L) }); + 'G', GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L) }); ItemList.Machine_Bronze_BlastFurnace.set( new GT_MetaTileEntity_BronzeBlastFurnace( @@ -5747,73 +5747,73 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC if (Gendustry.isModLoaded()) { GT_ModHandler.addShapelessCraftingRecipe( ItemList.Machine_IndustrialApiary.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "IndustrialApiary", 1, 0) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "IndustrialApiary", 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_Frame.get(1), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "UpgradeFrame", 1) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "UpgradeFrame", 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 0) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 17) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 17) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 11) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 11) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 2) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 2) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_WINTER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 20) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 20) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_DRYER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 5) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 5) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 14) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 14) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 4) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 4) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HELL.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 13) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 13) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 22) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 22) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_DESERT.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 16) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 16) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_COOLER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 7) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 7) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 1) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SEAL.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 10) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 10) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 19) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 19) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 18) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 18) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 3) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 3) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 21) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 21) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SKY.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 12) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 12) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HEATER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 6) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 6) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 15) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 15) }); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 6ea831b11f..cefc31eef6 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -1,6 +1,13 @@ package gregtech.loaders.preload; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.ThermalExpansion; +import static gregtech.api.enums.Mods.TwilightForest; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -29,7 +36,7 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.set( OrePrefixes.cell, Materials.Creosote, - GT_ModHandler.getModItem("Railcraft", "fluid.creosote.cell", 1L)); + GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.cell", 1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GT_ModHandler.getIC2Item("uuMatterCell", 1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GT_ModHandler.getIC2Item("CFCell", 1L)); @@ -105,14 +112,14 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1)); GT_OreDictUnificator.registerOre( OreDictNames.craftingAnvil, - GT_ModHandler.getModItem("Railcraft", "anvil", 1L, 0)); + GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0)); GT_OreDictUnificator.registerOre( OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.dust, Materials.Wood, - GT_ModHandler.getModItem("ThermalExpansion", "sawdust", 1L)); + GT_ModHandler.getModItem(ThermalExpansion.ID, "sawdust", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.glass, Materials.Reinforced, @@ -120,24 +127,24 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre( OrePrefixes.glass, Materials.Reinforced, - GT_ModHandler.getModItem("ThermalExpansion", "glassHardened", 1L)); + GT_ModHandler.getModItem(ThermalExpansion.ID, "glassHardened", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Basalt, - GT_ModHandler.getModItem("Railcraft", "cube", 1L, 6)); + GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 6)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Marble, - GT_ModHandler.getModItem("Railcraft", "cube", 1L, 7)); + GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 7)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Basalt, - GT_ModHandler.getModItem("Railcraft", "brick.abyssal", 1L, 32767)); + GT_ModHandler.getModItem(Railcraft.ID, "brick.abyssal", 1L, 32767)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Marble, - GT_ModHandler.getModItem("Railcraft", "brick.quarried", 1L, 32767)); + GT_ModHandler.getModItem(Railcraft.ID, "brick.quarried", 1L, 32767)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Obsidian, @@ -171,25 +178,25 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre( "paperResearchFragment", - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 9)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 9)); GT_OreDictUnificator.registerOre( "itemCertusQuartz", - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); GT_OreDictUnificator.registerOre( "itemCertusQuartz", - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); GT_OreDictUnificator.registerOre( "itemNetherQuartz", - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); GT_OreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L)); GT_OreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L)); GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); @@ -308,7 +315,7 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767)); GT_OreDictUnificator.registerOre( OreDictNames.craftingFeather, - GT_ModHandler.getModItem("TwilightForest", "item.tfFeather", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.tfFeather", 1L, 32767)); GT_OreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767)); GT_OreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767)); @@ -335,180 +342,180 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Copper, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 0)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Tin, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 1)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 1)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Bronze, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 2)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 2)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Gold, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 3)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 3)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Iron, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 4)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 4)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Steel, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 5)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 5)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Lead, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 6)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Osmium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OsmiumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Aluminium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.AluminiumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.StainlessSteel, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Tungsten, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TungstenItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Neutronium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.TungstenSteel, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Iridium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IridiumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Titanium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitaniumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Chrome, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ChromeItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0)); // Fake Circuits GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Primitive, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitULV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Basic, // GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, // "item.CircuitLV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Good, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitMV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Advanced, // GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, // "item.CircuitHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Data, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitEV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Elite, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitIV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Master, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitLuV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Ultimate, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitZPM", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Superconductor, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Infinite, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUHV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Bio, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUEV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Optical, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUIV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Exotic, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUMV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Cosmic, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUXV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Transcendent, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitMAX", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Manasteel, - GT_ModHandler.getModItem("Botania", "storage", 1L)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Terrasteel, - GT_ModHandler.getModItem("Botania", "storage", 1L, 1)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 1)); GT_OreDictUnificator.registerOre( OrePrefixes.ingot, MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 7)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 7)); GT_OreDictUnificator.registerOre( OrePrefixes.nugget, MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 19)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 19)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem("Botania", "storage", 1L, 2)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 2)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Livingrock, - GT_ModHandler.getModItem("Botania", "livingrock", 1L)); + GT_ModHandler.getModItem(Botania.ID, "livingrock", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.ingot, MaterialsBotania.GaiaSpirit, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 14)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 14)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Livingwood, - GT_ModHandler.getModItem("Botania", "livingwood", 1L)); + GT_ModHandler.getModItem(Botania.ID, "livingwood", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Dreamwood, - GT_ModHandler.getModItem("Botania", "dreamwood", 1L)); + GT_ModHandler.getModItem(Botania.ID, "dreamwood", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.gem, MaterialsBotania.ManaDiamond, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 2)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 2)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.ManaDiamond, - GT_ModHandler.getModItem("Botania", "storage", 1L, 3)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 3)); GT_OreDictUnificator.registerOre( OrePrefixes.gem, MaterialsBotania.BotaniaDragonstone, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 9)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 9)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.BotaniaDragonstone, - GT_ModHandler.getModItem("Botania", "storage", 1L, 4)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 4)); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index de1f6dec36..3fb0247162 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -1,7 +1,7 @@ package gregtech.loaders.preload; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import java.io.BufferedReader; import java.io.File; @@ -58,7 +58,7 @@ public class GT_PreLoad { for (short i = 0; i < tModList_sS; i = (short) (i + 1)) { ModContainer tMod = tModList.get(i); if (tMod.getModId() - .equalsIgnoreCase("gregtech")) { + .equalsIgnoreCase(GregTech.ID)) { tGregTech = tMod; } else { tNewModsList.add(tMod); diff --git a/src/main/java/gregtech/nei/IMCForNEI.java b/src/main/java/gregtech/nei/IMCForNEI.java index 36d05d8021..2fdda9893c 100644 --- a/src/main/java/gregtech/nei/IMCForNEI.java +++ b/src/main/java/gregtech/nei/IMCForNEI.java @@ -1,6 +1,7 @@ package gregtech.nei; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.NotEnoughItems; import net.minecraft.nbt.NBTTagCompound; @@ -42,7 +43,7 @@ public class IMCForNEI { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handler", aName); aNBT.setString("modName", "GregTech"); - aNBT.setString("modId", "gregtech"); + aNBT.setString("modId", GregTech.ID); aNBT.setBoolean("modRequired", true); aNBT.setString("itemName", aBlock); aNBT.setInteger("handlerHeight", 135); diff --git a/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java b/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java index d3c41ed822..01728e143a 100644 --- a/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java +++ b/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java @@ -1,6 +1,6 @@ package gregtech.nei.dumper; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; |