From 9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca Mon Sep 17 00:00:00 2001 From: boubou19 Date: Tue, 4 Apr 2023 13:57:15 +0200 Subject: 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 --- src/main/java/gregtech/api/util/GT_Recipe.java | 189 +++++++++++++------------ 1 file changed, 96 insertions(+), 93 deletions(-) (limited to 'src/main/java/gregtech/api/util/GT_Recipe.java') 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 { */ public static final 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.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.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.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 { "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 { "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.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.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.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.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.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.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 { .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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 { } 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 { 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 { 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 { 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.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.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.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.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.craker", "Oil Cracker", null, - RES_PATH_GUI + "basicmachines/OilCracker", + GregTech.getResourcePath(TEXTURES_GUI_BASICMACHINES, "OilCracker"), 1, 1, 1, -- cgit