diff options
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/util/GTPP_Recipe.java | 92 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipeMap.java | 4 |
2 files changed, 39 insertions, 57 deletions
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index 9e3d7f7102..f5bd29947d 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -1,8 +1,6 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; -import static gregtech.api.enums.Mods.GTPlusPlus; import static net.minecraft.util.EnumChatFormatting.GRAY; import java.util.ArrayList; @@ -146,7 +144,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cokeoven", "Coke Oven", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 1, @@ -162,7 +160,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.matterfab2", "Matter Fabricator", null, - RES_PATH_GUI + "basicmachines/Default", + "", 2, 0, 0, @@ -179,7 +177,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.rocketenginefuel", "Rocket Engine Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 0, 0, 0, @@ -196,7 +194,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.quantumforcesmelter", "Quantum Force Transformer", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + "", 6, 6, 1, @@ -214,7 +212,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.geothermalfuel", "GeoThermal Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 1, 1, 0, @@ -230,7 +228,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.chemicaldehydrator", "Dehydrator", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -246,7 +244,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.vacfurnace", "Vacuum Furnace", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 1, @@ -262,7 +260,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 1, @@ -278,7 +276,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.steamturbinefuel", "GeoThermal Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 1, 1, 0, @@ -296,7 +294,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -321,7 +319,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.nuclearsaltprocessingplant", "Nuclear Salt Processing Plant", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 6, 0, @@ -339,7 +337,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.oremill", "Milling", null, - RES_PATH_GUI + "basicmachines/LFTR", + "", 3, 3, 1, @@ -377,7 +375,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.fissionfuel", "Nuclear Fuel Processing", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -395,7 +393,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.coldtrap", "Cold Trap", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -413,7 +411,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.reactorprocessingunit", "Reactor Processing Unit", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -431,7 +429,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.simplewasher", "Simple Dust Washer", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 1, 1, 0, @@ -450,7 +448,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.moleculartransformer", "Molecular Transformer", null, - RES_PATH_GUI + "basicmachines/Scanner", + "", 1, 1, 0, @@ -468,7 +466,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.elementaldupe", "Elemental Duplicator", null, - RES_PATH_GUI + "basicmachines/Replicator", + "", 1, 1, 0, @@ -485,7 +483,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.fluidchemicaleactor", "Chemical Plant", null, - GTPlusPlus.ID + ":textures/gui/FluidReactor", + "", 4, 4, 0, @@ -503,7 +501,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.RTGgenerators", "RTG", null, - "gregtech:textures/gui/basicmachines/Default", + "", 1, 0, 0, @@ -521,7 +519,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -539,7 +537,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.solartower", "Solar Tower", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -561,7 +559,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cyclotron", "COMET - Compact Cyclotron", null, - RES_PATH_GUI + "basicmachines/BlastSmelter", + "", 9, 9, 0, @@ -579,7 +577,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.slowfusionreactor", "Mimir - Slow Fusion", null, - "gregtech:textures/gui/basicmachines/LFTR", + "", 0, 0, 0, @@ -591,31 +589,13 @@ public class GTPP_Recipe extends GT_Recipe { true, true).useModularUI(true); - // Component Assembler - public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler( - new HashSet<>(300), - "gtpp.recipe.componentassembler", - "Component Assembler", - null, - RES_PATH_GUI + "basicmachines/Assembler", - 6, - 1, - 1, - 0, - 1, - E, - 1, - E, - true, - true).useModularUI(true); - // Special Maps for Multis public static final GT_Recipe_Map sFishPondRecipes = new GT_Recipe_Map( new HashSet<>(3), "gtpp.recipe.fishpond", "Zhuhai - Fishing Port", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 1, 1, 0, @@ -632,7 +612,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.spargetower", "Sparging", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -649,7 +629,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cryogenicfreezer", "Cryogenic Freezer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 1, 1, 0, @@ -665,7 +645,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multicentrifuge", "Multiblock Centrifuge", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 6, 0, @@ -682,7 +662,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multielectro", "Multiblock Electrolyzer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 6, 0, @@ -701,7 +681,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.temp4", "temp4", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 0, 0, 0, @@ -717,7 +697,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multimixer", "Multiblock Mixer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -735,7 +715,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multidehydrator", "Multiblock Dehydrator", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 9, 0, @@ -753,7 +733,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.semifluidgeneratorfuels", "Semifluid Generator Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + "", 0, 0, 0, @@ -771,7 +751,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.flotationcell", "Flotation Cell", null, - RES_PATH_GUI + "basicmachines/LFTR", + "", 6, 0, 1, @@ -789,7 +769,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.treefarm", "Tree Growth Simulator", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 1, 2, 1, @@ -810,6 +790,7 @@ public class GTPP_Recipe extends GT_Recipe { @Override protected List<String> handleNEIItemOutputTooltip(List<String> currentTip, FixedPositionedStack pStack) { if (ModItems.fluidFertBasic != null && pStack.isChanceBased()) { + // noinspection deprecation currentTip .add(GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided"); } else { @@ -824,6 +805,7 @@ public class GTPP_Recipe extends GT_Recipe { List<String> result = new ArrayList<>(); if (ModItems.fluidFertBasic != null) { result.add("The sapling is not consumed."); + // noinspection deprecation result.add("If " + ModItems.fluidFertBasic.getLocalizedName() + " is provided,"); result.add("Saplings are made instead"); } diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index f6618cb1f8..094ef5a08c 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -1,6 +1,6 @@ package gregtech.api.util; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraftforge.fluids.FluidStack; @@ -12,7 +12,7 @@ public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> { public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; - public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png"; + public static final String mNEIGUIPath = GregTech.getResourcePath("textures", "gui/basicmachines/FissionFuel.png"); public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, FluidStack[] aOutputs, int[] aMaxOutputs) { |