From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../java/gregtech/api/util/EmptyRecipeMap.java | 61 +- .../java/gregtech/api/util/FishPondFakeRecipe.java | 35 +- src/main/java/gregtech/api/util/GTPP_Recipe.java | 1049 +++++++++----------- .../java/gregtech/api/util/GasSpargingRecipe.java | 16 +- .../gregtech/api/util/GasSpargingRecipeMap.java | 14 +- src/main/java/gregtech/api/util/HotFuel.java | 16 +- .../gregtech/api/util/SemiFluidFuelHandler.java | 38 +- src/main/java/gregtech/api/util/ThermalFuel.java | 17 +- 8 files changed, 572 insertions(+), 674 deletions(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/EmptyRecipeMap.java b/src/main/java/gregtech/api/util/EmptyRecipeMap.java index 45a31b7c1d..6a6e786610 100644 --- a/src/main/java/gregtech/api/util/EmptyRecipeMap.java +++ b/src/main/java/gregtech/api/util/EmptyRecipeMap.java @@ -1,28 +1,18 @@ package gregtech.api.util; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import java.util.Collection; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; + public class EmptyRecipeMap extends GT_Recipe_Map { - public EmptyRecipeMap( - Collection aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, - boolean aNEIAllowed) { + public EmptyRecipeMap(Collection aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, + int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, + String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, aUnlocalizedName, @@ -42,42 +32,21 @@ public class EmptyRecipeMap extends GT_Recipe_Map { } @Override - public GT_Recipe addRecipe( - boolean aOptimize, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecial, - int[] aOutputChances, - FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, - int aDuration, - int aEUt, + public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, + int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { return null; } @Override - public GT_Recipe addRecipe( - int[] aOutputChances, - FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, - int aDuration, - int aEUt, - int aSpecialValue) { + public GT_Recipe addRecipe(int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, + int aDuration, int aEUt, int aSpecialValue) { return null; } @Override - public GT_Recipe addRecipe( - boolean aOptimize, - ItemStack[] aInputs, - ItemStack[] aOutputs, - Object aSpecial, - FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, - int aDuration, - int aEUt, - int aSpecialValue) { + public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, + FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { return null; } @@ -87,8 +56,8 @@ public class EmptyRecipeMap extends GT_Recipe_Map { } @Override - protected GT_Recipe addRecipe( - GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) { + protected GT_Recipe addRecipe(GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, + boolean aHidden) { return null; } diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java index 3c11c5f801..57e210a8f2 100644 --- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java @@ -1,16 +1,18 @@ package gregtech.api.util; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomFishable; import net.minecraftforge.common.FishingHooks; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.reflect.ReflectionUtils; + public class FishPondFakeRecipe { public static ArrayList fish = new ArrayList(); @@ -21,12 +23,10 @@ public class FishPondFakeRecipe { public static boolean generateFishPondRecipes() { try { - fish = (ArrayList) - ReflectionUtils.getField(FishingHooks.class, "fish").get(null); - junk = (ArrayList) - ReflectionUtils.getField(FishingHooks.class, "junk").get(null); - treasure = (ArrayList) - ReflectionUtils.getField(FishingHooks.class, "treasure").get(null); + fish = (ArrayList) ReflectionUtils.getField(FishingHooks.class, "fish").get(null); + junk = (ArrayList) ReflectionUtils.getField(FishingHooks.class, "junk").get(null); + treasure = (ArrayList) ReflectionUtils.getField(FishingHooks.class, "treasure") + .get(null); } catch (IllegalArgumentException | IllegalAccessException e) { Logger.INFO("Error generating Fish Pond Recipes. [1]"); e.printStackTrace(); @@ -43,10 +43,9 @@ public class FishPondFakeRecipe { if (f.get(e) != null) { WeightedRandomFishable u = f.get(e); try { - ItemStack t = - (ItemStack) ReflectionUtils.getField(WeightedRandomFishable.class, "field_150711_b") - .get(u); - addNewFishPondLoot(mType, new ItemStack[] {t}, new int[] {10000}); + ItemStack t = (ItemStack) ReflectionUtils + .getField(WeightedRandomFishable.class, "field_150711_b").get(u); + addNewFishPondLoot(mType, new ItemStack[] { t }, new int[] { 10000 }); } catch (IllegalArgumentException | IllegalAccessException e1) { Logger.INFO("Error generating Fish Pond Recipes. [2]"); e1.printStackTrace(); @@ -62,12 +61,12 @@ public class FishPondFakeRecipe { public static void addNewFishPondLoot(int circuit, ItemStack[] outputItems, int[] chances) { GTPP_Recipe x = new GTPP_Recipe( true, - new ItemStack[] {CI.getNumberedCircuit(circuit)}, + new ItemStack[] { CI.getNumberedCircuit(circuit) }, outputItems, null, chances, - new FluidStack[] {null}, - new FluidStack[] {null}, + new FluidStack[] { null }, + new FluidStack[] { null }, 100, // 1 Tick 0, // No Eu produced 0); diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index 94a0671a08..0ed296cd66 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -3,9 +3,15 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.*; import static net.minecraft.util.EnumChatFormatting.GRAY; +import java.util.*; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.*; + import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.ProgressBar; import com.gtnewhorizons.modularui.common.widget.ProgressBar.Direction; + import gregtech.api.gui.modularui.GT_UITextures; import gregtech.common.gui.modularui.UIHelper; import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack; @@ -17,28 +23,18 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import java.util.*; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.*; /** * Custom GT Recipe Class + * * @author Alkalus * */ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { - public GTPP_Recipe( - final boolean aOptimize, - final ItemStack[] aInputs, - final ItemStack[] aOutputs, - final Object aSpecialItems, - final int[] aChances, - final FluidStack[] aFluidInputs, - final FluidStack[] aFluidOutputs, - final int aDuration, - final int aEUt, - final int aSpecialValue) { + public GTPP_Recipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, + final Object aSpecialItems, final int[] aChances, final FluidStack[] aFluidInputs, + final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) { super( aOptimize, aInputs, @@ -59,18 +55,12 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { } // aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000! - public GTPP_Recipe( - final ItemStack aInput1, - final ItemStack aOutput1, - final ItemStack aOutput2, - final ItemStack aOutput3, - final ItemStack aOutput4, - final int aSpecialValue, - final int aType) { + public GTPP_Recipe(final ItemStack aInput1, final ItemStack aOutput1, final ItemStack aOutput2, + final ItemStack aOutput3, final ItemStack aOutput4, final int aSpecialValue, final int aType) { this( true, - new ItemStack[] {aInput1}, - new ItemStack[] {aOutput1, aOutput2, aOutput3, aOutput4}, + new ItemStack[] { aInput1 }, + new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 }, null, null, null, @@ -82,28 +72,28 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { Logger.WARNING("Switch case method for adding fuels"); if ((this.mInputs.length > 0) && (aSpecialValue > 0)) { switch (aType) { - // Diesel Generator + // Diesel Generator case 0: Logger.WARNING("Added fuel " + aInput1.getDisplayName() + " is ROCKET FUEL - continuing"); GTPP_Recipe_Map.sRocketFuels.addRecipe(this); break; - // Gas Turbine + // Gas Turbine case 1: GTPP_Recipe_Map.sGeoThermalFuels.addRecipe(this); break; - // Thermal Generator + // Thermal Generator case 2: GTPP_Recipe_Map.sRTGFuels.addRecipe(this); break; - // Plasma Generator + // Plasma Generator case 4: // Gregtech_Recipe_Map.sPlasmaFuels.addRecipe(this); break; - // Magic Generator + // Magic Generator case 5: // Gregtech_Recipe_Map.sMagicFuels.addRecipe(this); break; - // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator + // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator default: // Gregtech_Recipe_Map.sDenseLiquidFuels.addRecipe(this); break; @@ -112,29 +102,18 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { } /** - * Even though this is deprecated, it's still used to keep binary compatibility. - * (GoodGenerator and GTNHLanthanides reference to `sSimpleWasherRecipes` and `sChemicalDehydratorRecipes`) + * Even though this is deprecated, it's still used to keep binary compatibility. (GoodGenerator and GTNHLanthanides + * reference to `sSimpleWasherRecipes` and `sChemicalDehydratorRecipes`) */ public static class GTPP_Recipe_Map_Internal extends GT_Recipe_Map { @Deprecated public static final Collection sMappingsEx = new ArrayList<>(); - public GTPP_Recipe_Map_Internal( - Collection aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + public GTPP_Recipe_Map_Internal(Collection aRecipeList, String aUnlocalizedName, String aLocalName, + String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, @@ -156,196 +135,181 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { } public static class GTPP_Recipe_Map { + public static final GT_Recipe_Map sCokeOvenRecipes = new GT_Recipe_Map( - new HashSet<>(200), - "gtpp.recipe.cokeoven", - "Coke Oven", - null, - RES_PATH_GUI + "basicmachines/Dehydrator", - 2, - 9, - 1, - 0, - 1, - E, - 1, - E, - true, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); + new HashSet<>(200), + "gtpp.recipe.cokeoven", + "Coke Oven", + null, + RES_PATH_GUI + "basicmachines/Dehydrator", + 2, + 9, + 1, + 0, + 1, + E, + 1, + E, + true, + true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); public static final GT_Recipe_Map sMatterFab2Recipes = new GT_Recipe_Map( - new HashSet<>(200), - "gtpp.recipe.matterfab2", - "Matter Fabricator", - null, - RES_PATH_GUI + "basicmachines/Default", - 2, - 0, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .useModularUI(true); + new HashSet<>(200), + "gtpp.recipe.matterfab2", + "Matter Fabricator", + null, + RES_PATH_GUI + "basicmachines/Default", + 2, + 0, + 0, + 0, + 1, + E, + 1, + E, + true, + true).useModularUI(true); public static final GT_Recipe_Map sRocketFuels = new GT_Recipe_Map_Fuel( - new HashSet<>(10), - "gtpp.recipe.rocketenginefuel", - "Rocket Engine Fuel", - null, - RES_PATH_GUI + "basicmachines/Default", - 0, - 0, - 0, - 0, - 1, - "Fuel Value: ", - 3000, - " EU", - true, - true) - .useModularUI(true); + new HashSet<>(10), + "gtpp.recipe.rocketenginefuel", + "Rocket Engine Fuel", + null, + RES_PATH_GUI + "basicmachines/Default", + 0, + 0, + 0, + 0, + 1, + "Fuel Value: ", + 3000, + " EU", + true, + true).useModularUI(true); public static final GT_Recipe_Map sQuantumForceTransformerRecipes = new GT_Recipe_Map_LargeNEI( - new HashSet<>(20), - "gtpp.recipe.quantumforcesmelter", - "Quantum Force Transformer", - null, - RES_PATH_GUI + "basicmachines/LCRNEI", - 6, - 6, - 1, - 0, - 1, - "Tier: ", - 1, - E, - true, - true) - .useModularUI(true) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, Direction.RIGHT) - .setUsualFluidInputCount(6) - .setUsualFluidOutputCount(6); + new HashSet<>(20), + "gtpp.recipe.quantumforcesmelter", + "Quantum Force Transformer", + null, + RES_PATH_GUI + "basicmachines/LCRNEI", + 6, + 6, + 1, + 0, + 1, + "Tier: ", + 1, + E, + true, + true).useModularUI(true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, Direction.RIGHT) + .setUsualFluidInputCount(6).setUsualFluidOutputCount(6); public static final GT_Recipe_Map sGeoThermalFuels = new GT_Recipe_Map( - new HashSet<>(10), - "gtpp.recipe.geothermalfuel", - "GeoThermal Fuel", - null, - RES_PATH_GUI + "basicmachines/Default", - 1, - 1, - 0, - 0, - 1, - "Fuel Value: ", - 1000, - " EU", - true, - true) - .useModularUI(true); - public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes = - (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal( - new HashSet<>(200), - "gtpp.recipe.chemicaldehydrator", - "Dehydrator", - null, - RES_PATH_GUI + "basicmachines/Dehydrator", - 2, - 9, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); + new HashSet<>(10), + "gtpp.recipe.geothermalfuel", + "GeoThermal Fuel", + null, + RES_PATH_GUI + "basicmachines/Default", + 1, + 1, + 0, + 0, + 1, + "Fuel Value: ", + 1000, + " EU", + true, + true).useModularUI(true); + public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes = (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal( + new HashSet<>(200), + "gtpp.recipe.chemicaldehydrator", + "Dehydrator", + null, + RES_PATH_GUI + "basicmachines/Dehydrator", + 2, + 9, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); public static final GT_Recipe_Map sVacuumFurnaceRecipes = new GT_Recipe_Map_LargeNEI( - new HashSet<>(500), - "gtpp.recipe.vacfurnace", - "Vacuum Furnace", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 9, - 9, - 1, - 0, - 1, - "Heat Capacity: ", - 1, - " K", - false, - true) - .setUsualFluidInputCount(3) - .setUsualFluidOutputCount(3); + new HashSet<>(500), + "gtpp.recipe.vacfurnace", + "Vacuum Furnace", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 9, + 9, + 1, + 0, + 1, + "Heat Capacity: ", + 1, + " K", + false, + true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3); public static final GT_Recipe_Map sAlloyBlastSmelterRecipes = new GT_Recipe_Map_LargeNEI( - new HashSet<>(200), - "gtpp.recipe.alloyblastsmelter", - "Alloy Blast Smelter", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 9, - 9, - 1, - 0, - 1, - E, - 1, - E, - true, - true) - .setUsualFluidInputCount(3) - .setUsualFluidOutputCount(3); + new HashSet<>(200), + "gtpp.recipe.alloyblastsmelter", + "Alloy Blast Smelter", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 9, + 9, + 1, + 0, + 1, + E, + 1, + E, + true, + true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3); public static final GT_Recipe_Map sSteamTurbineFuels = new GT_Recipe_Map( - new HashSet<>(10), - "gtpp.recipe.steamturbinefuel", - "GeoThermal Fuel", - null, - RES_PATH_GUI + "basicmachines/Default", - 1, - 1, - 0, - 0, - 1, - "Fuel Value: ", - 1000, - " EU", - true, - false) - .useModularUI(true); + new HashSet<>(10), + "gtpp.recipe.steamturbinefuel", + "GeoThermal Fuel", + null, + RES_PATH_GUI + "basicmachines/Default", + 1, + 1, + 0, + 0, + 1, + "Fuel Value: ", + 1000, + " EU", + true, + false).useModularUI(true); // LFTR recipes public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map_FluidOnly( - new HashSet<>(50), - "gtpp.recipe.lftr", - "Liquid Fluoride Thorium Reactor", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 0, - 0, - 0, - 2, - 0, - "Power: ", - 1, - " EU/t per Dynamo", - true, - true) - .setUsualFluidInputCount(6) - .setUsualFluidOutputCount(6) - .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { - final long tEUt = recipeInfo.recipe.mSpecialValue; - final int tDuration = recipeInfo.recipe.mDuration; - return Arrays.asList( - applyPrefixAndSuffix.apply(recipeInfo.recipe.mSpecialValue), - "Dynamo: " + MathUtils.formatNumbers(tDuration * tEUt) + " EU", - "Total: " + MathUtils.formatNumbers(tDuration * tEUt * 4) + " EU"); - }); + new HashSet<>(50), + "gtpp.recipe.lftr", + "Liquid Fluoride Thorium Reactor", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 0, + 0, + 0, + 2, + 0, + "Power: ", + 1, + " EU/t per Dynamo", + true, + true).setUsualFluidInputCount(6).setUsualFluidOutputCount(6) + .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { + final long tEUt = recipeInfo.recipe.mSpecialValue; + final int tDuration = recipeInfo.recipe.mDuration; + return Arrays.asList( + applyPrefixAndSuffix.apply(recipeInfo.recipe.mSpecialValue), + "Dynamo: " + MathUtils.formatNumbers(tDuration * tEUt) + " EU", + "Total: " + MathUtils.formatNumbers(tDuration * tEUt * 4) + " EU"); + }); // Ore Milling Map public static final GT_Recipe_Map sOreMillRecipes = new GT_Recipe_Map( @@ -364,6 +328,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { E, true, true) { + @Override protected List handleNEIItemInputTooltip(List currentTip, FixedPositionedStack pStack) { if (ItemUtils.isMillingBall(pStack.item)) { @@ -386,101 +351,94 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { // Fission Fuel Plant Recipes public static final GT_Recipe_Map sFissionFuelProcessing = new GT_Recipe_Map_FluidOnly( - new HashSet<>(50), - "gtpp.recipe.fissionfuel", - "Nuclear Fuel Processing", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 0, - 0, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .setUsualFluidInputCount(6) - .setUsualFluidOutputCount(6); + new HashSet<>(50), + "gtpp.recipe.fissionfuel", + "Nuclear Fuel Processing", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 0, + 0, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setUsualFluidInputCount(6).setUsualFluidOutputCount(6); // Cold Trap public static final GT_Recipe_Map sColdTrapRecipes = new GT_Recipe_Map( - new HashSet<>(10000), - "gtpp.recipe.coldtrap", - "Cold Trap", - null, - RES_PATH_GUI + "basicmachines/Dehydrator", - 2, - 9, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); + new HashSet<>(10000), + "gtpp.recipe.coldtrap", + "Cold Trap", + null, + RES_PATH_GUI + "basicmachines/Dehydrator", + 2, + 9, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); // Reactor Processing Unit public static final GT_Recipe_Map sReactorProcessingUnitRecipes = new GT_Recipe_Map( - new HashSet<>(10000), - "gtpp.recipe.reactorprocessingunit", - "Reactor Processing Unit", - null, - RES_PATH_GUI + "basicmachines/Dehydrator", - 2, - 9, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); + new HashSet<>(10000), + "gtpp.recipe.reactorprocessingunit", + "Reactor Processing Unit", + null, + RES_PATH_GUI + "basicmachines/Dehydrator", + 2, + 9, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN); // Basic Washer Map - public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = - (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal( - new HashSet<>(3), - "gtpp.recipe.simplewasher", - "Simple Dust Washer", - null, - RES_PATH_GUI + "basicmachines/PotionBrewer", - 1, - 1, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON) + public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = (GTPP_Recipe_Map_Internal) new GTPP_Recipe_Map_Internal( + new HashSet<>(3), + "gtpp.recipe.simplewasher", + "Simple Dust Washer", + null, + RES_PATH_GUI + "basicmachines/PotionBrewer", + 1, + 1, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON) .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE); // Molecular Transformer Map public static final GT_Recipe_Map sMolecularTransformerRecipes = new GT_Recipe_Map( - new HashSet<>(3), - "gtpp.recipe.moleculartransformer", - "Molecular Transformer", - null, - RES_PATH_GUI + "basicmachines/Scanner", - 1, - 1, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_MICROSCOPE); + new HashSet<>(3), + "gtpp.recipe.moleculartransformer", + "Molecular Transformer", + null, + RES_PATH_GUI + "basicmachines/Scanner", + 1, + 1, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_MICROSCOPE); // Elemental Duplicator Map public static final GT_Recipe_Map sElementalDuplicatorRecipes = new GT_Recipe_Map( @@ -519,142 +477,134 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { // RTG Fuel Map public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = (GT_Recipe_Map_Fuel) new GT_Recipe_Map_Fuel( - new HashSet<>(10), - "gtpp.recipe.RTGgenerators", - "RTG", - null, - "gregtech:textures/gui/basicmachines/Default", - 1, - 0, - 0, - 0, - 1, - "Fuel Value: ", - 365, - " Minecraft Days", - true, - true) - .useModularUI(true); + new HashSet<>(10), + "gtpp.recipe.RTGgenerators", + "RTG", + null, + "gregtech:textures/gui/basicmachines/Default", + 1, + 0, + 0, + 0, + 1, + "Fuel Value: ", + 365, + " Minecraft Days", + true, + true).useModularUI(true); // Thermal Boiler map public static final GT_Recipe_Map sThermalFuels = new GT_Recipe_Map_LargeNEI( - new HashSet<>(10), - "gtpp.recipe.thermalgeneratorfuel", - "Thermal Generator Fuel", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 9, - 9, - 0, - 0, - 1, - null, - 1000, - null, - true, - true) - .setUsualFluidInputCount(3) - .setUsualFluidOutputCount(3); + new HashSet<>(10), + "gtpp.recipe.thermalgeneratorfuel", + "Thermal Generator Fuel", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 9, + 9, + 0, + 0, + 1, + null, + 1000, + null, + true, + true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3); // Solar Tower map public static final GT_Recipe_Map sSolarTowerRecipes = new GT_Recipe_Map_FluidOnly( - new HashSet<>(10), - "gtpp.recipe.solartower", - "Solar Tower", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 0, - 0, - 0, - 0, - 1, - null, - 1000, - null, - true, - true) - .useModularUI(true) - .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> Arrays.asList( - "Solar Heater rings boost tier", - "R1:T1, R2:T2, R3:T4, R4:T8, R5:T16", - "Input Amount = 1000 x T")); + new HashSet<>(10), + "gtpp.recipe.solartower", + "Solar Tower", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 0, + 0, + 0, + 0, + 1, + null, + 1000, + null, + true, + true).useModularUI(true).setNEISpecialInfoFormatter( + (recipeInfo, applyPrefixAndSuffix) -> Arrays.asList( + "Solar Heater rings boost tier", + "R1:T1, R2:T2, R3:T4, R4:T8, R5:T16", + "Input Amount = 1000 x T")); // Cyclotron recipe map public static final GT_Recipe_Map sCyclotronRecipes = new GT_Recipe_Map( - new HashSet<>(200), - "gtpp.recipe.cyclotron", - "COMET - Compact Cyclotron", - null, - RES_PATH_GUI + "basicmachines/BlastSmelter", - 9, - 9, - 0, - 0, - 1, - E, - 1, - E, - true, - true) - .useModularUI(true); + new HashSet<>(200), + "gtpp.recipe.cyclotron", + "COMET - Compact Cyclotron", + null, + RES_PATH_GUI + "basicmachines/BlastSmelter", + 9, + 9, + 0, + 0, + 1, + E, + 1, + E, + true, + true).useModularUI(true); // Mini Fusion public static final GT_Recipe_Map sSlowFusionRecipes = new GT_Recipe_Map( - new HashSet<>(50), - "gtpp.recipe.slowfusionreactor", - "Mimir - Slow Fusion", - null, - "gregtech:textures/gui/basicmachines/LFTR", - 0, - 0, - 0, - 2, - 1, - "Start: ", - 1, - " EU", - true, - true) - .useModularUI(true); + new HashSet<>(50), + "gtpp.recipe.slowfusionreactor", + "Mimir - Slow Fusion", + null, + "gregtech:textures/gui/basicmachines/LFTR", + 0, + 0, + 0, + 2, + 1, + "Start: ", + 1, + " EU", + 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); + 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, - 0, - 1, - E, - 1, - E, - true, - true) - .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE); + new HashSet<>(3), + "gtpp.recipe.fishpond", + "Zhuhai - Fishing Port", + null, + RES_PATH_GUI + "basicmachines/PotionBrewer", + 1, + 1, + 0, + 0, + 1, + E, + 1, + E, + true, + true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE); public static final GT_Recipe_Map sSpargeTowerRecipes = new GT_Recipe_Map( new HashSet<>(10000), "gtpp.recipe.spargetower", @@ -673,60 +623,55 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { false); public static final GT_Recipe_Map sAdvFreezerRecipes_GT = new GT_Recipe_Map( - new HashSet<>(2000), - "gtpp.recipe.cryogenicfreezer", - "Cryogenic Freezer", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 1, - 1, - 0, - 0, - 1, - "", - 0, - "", - false, - true) - .setUsualFluidInputCount(2); + new HashSet<>(2000), + "gtpp.recipe.cryogenicfreezer", + "Cryogenic Freezer", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 1, + 1, + 0, + 0, + 1, + "", + 0, + "", + false, + true).setUsualFluidInputCount(2); public static final GT_Recipe_Map sMultiblockCentrifugeRecipes_GT = new GT_Recipe_Map_LargeNEI( - new HashSet<>(2000), - "gtpp.recipe.multicentrifuge", - "Multiblock Centrifuge", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 6, - 6, - 0, - 0, - 1, - "", - 0, - "", - false, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT) - .setUsualFluidInputCount(6) - .setUsualFluidOutputCount(6); + new HashSet<>(2000), + "gtpp.recipe.multicentrifuge", + "Multiblock Centrifuge", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 6, + 6, + 0, + 0, + 1, + "", + 0, + "", + false, + true).setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT).setUsualFluidInputCount(6) + .setUsualFluidOutputCount(6); public static final GT_Recipe_Map sMultiblockElectrolyzerRecipes_GT = new GT_Recipe_Map_LargeNEI( - new HashSet<>(2000), - "gtpp.recipe.multielectro", - "Multiblock Electrolyzer", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 6, - 6, - 0, - 0, - 1, - "", - 0, - "", - false, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT) - .setUsualFluidInputCount(6) - .setUsualFluidOutputCount(6); + new HashSet<>(2000), + "gtpp.recipe.multielectro", + "Multiblock Electrolyzer", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 6, + 6, + 0, + 0, + 1, + "", + 0, + "", + false, + true).setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT).setUsualFluidInputCount(6) + .setUsualFluidOutputCount(6); // internal copy of sChemicalPlantRecipes public static final GT_Recipe_Map sChemicalPlant_GT = new GT_Recipe_Map( @@ -746,81 +691,75 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { false, false); public static final GT_Recipe_Map sMultiblockMixerRecipes_GT = new GT_Recipe_Map_LargeNEI( - new HashSet<>(2000), - "gtpp.recipe.multimixer", - "Multiblock Mixer", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 9, - 9, - 0, - 0, - 1, - "", - 0, - "", - false, - true) - .setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) - .setUsualFluidInputCount(6) - .setUsualFluidOutputCount(6); + new HashSet<>(2000), + "gtpp.recipe.multimixer", + "Multiblock Mixer", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 9, + 9, + 0, + 0, + 1, + "", + 0, + "", + false, + true).setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW) + .setUsualFluidInputCount(6).setUsualFluidOutputCount(6); public static final GT_Recipe_Map sMultiblockChemicalDehydratorRecipes = new GT_Recipe_Map_LargeNEI( - new HashSet<>(2000), - "gtpp.recipe.multidehydrator", - "Multiblock Dehydrator", - null, - RES_PATH_GUI + "basicmachines/FissionFuel", - 6, - 9, - 0, - 0, - 1, - "", - 0, - "", - false, - true) - .setUsualFluidInputCount(3) - .setUsualFluidOutputCount(3); + new HashSet<>(2000), + "gtpp.recipe.multidehydrator", + "Multiblock Dehydrator", + null, + RES_PATH_GUI + "basicmachines/FissionFuel", + 6, + 9, + 0, + 0, + 1, + "", + 0, + "", + false, + true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3); // Semi-Fluid Fuel Map public static final GT_Recipe_Map_Fuel sSemiFluidLiquidFuels = (GT_Recipe_Map_Fuel) new GT_Recipe_Map_Fuel( - new HashSet<>(10), - "gtpp.recipe.semifluidgeneratorfuels", - "Semifluid Generator Fuels", - null, - RES_PATH_GUI + "basicmachines/Default", - 0, - 0, - 0, - 0, - 1, - "Fuel Value: ", - 1000, - " EU", - true, - true) - .useModularUI(true); + new HashSet<>(10), + "gtpp.recipe.semifluidgeneratorfuels", + "Semifluid Generator Fuels", + null, + RES_PATH_GUI + "basicmachines/Default", + 0, + 0, + 0, + 0, + 1, + "Fuel Value: ", + 1000, + " EU", + true, + true).useModularUI(true); // Flotation Cell public static final GT_Recipe_Map sFlotationCellRecipes = new GT_Recipe_Map( - new HashSet<>(10000), - "gtpp.recipe.flotationcell", - "Flotation Cell", - null, - RES_PATH_GUI + "basicmachines/LFTR", - 6, - 0, - 1, - 1, - 1, - "", - 1, - E, - true, - true) - .useModularUI(true); + new HashSet<>(10000), + "gtpp.recipe.flotationcell", + "Flotation Cell", + null, + RES_PATH_GUI + "basicmachines/LFTR", + 6, + 0, + 1, + 1, + 1, + "", + 1, + E, + true, + true).useModularUI(true); // Tree Growth Simulator public static final GT_Recipe_Map sTreeSimFakeRecipes = new GT_Recipe_Map( @@ -839,6 +778,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { "", false, true) { + @Override protected void drawNEIEnergyInfo(NEIRecipeInfo recipeInfo) {} @@ -848,8 +788,8 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { @Override protected List handleNEIItemOutputTooltip(List currentTip, FixedPositionedStack pStack) { if (ModItems.fluidFertBasic != null && pStack.isChanceBased()) { - currentTip.add( - GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided"); + currentTip + .add(GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided"); } else { super.handleNEIItemOutputTooltip(currentTip, pStack); } @@ -881,21 +821,10 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { "Laurenium", "Botmium"); - public GTPP_Recipe_Map_ChemicalPlant( - Collection aRecipeList, - String aUnlocalizedName, - String aLocalName, - String aNEIName, - String aNEIGUIPath, - int aUsualInputCount, - int aUsualOutputCount, - int aMinimalInputItems, - int aMinimalInputFluids, - int aAmperage, - String aNEISpecialValuePre, - int aNEISpecialValueMultiplier, - String aNEISpecialValuePost, - boolean aShowVoltageAmperageInNEI, + public GTPP_Recipe_Map_ChemicalPlant(Collection aRecipeList, String aUnlocalizedName, + String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, + int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, + int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) { super( aRecipeList, diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java index 578ec687a0..304dd24384 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -1,10 +1,11 @@ package gregtech.api.util; +import net.minecraftforge.fluids.FluidStack; + import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.data.ArrayUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import net.minecraftforge.fluids.FluidStack; public class GasSpargingRecipe implements Comparable { @@ -17,16 +18,12 @@ public class GasSpargingRecipe implements Comparable { public final int mDuration; public final int mEUt; - public GasSpargingRecipe( - FluidStack aSpargeGas, - FluidStack aSpentFuel, - FluidStack aSpargedFuel, - FluidStack[] aOutputs, - int[] aMaxOutputQuantity) { + public GasSpargingRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, + FluidStack[] aOutputs, int[] aMaxOutputQuantity) { mInputGas = aSpargeGas; mInputSpentFuel = aSpentFuel; mOutputSpargedFuel = aSpargedFuel; - mFluidInputs = new FluidStack[] {mInputGas, mInputSpentFuel}; + mFluidInputs = new FluidStack[] { mInputGas, mInputSpentFuel }; aOutputs = ArrayUtils.insertElementAtIndex(aOutputs, 0, aSpargeGas); aOutputs = ArrayUtils.insertElementAtIndex(aOutputs, 1, aSpargedFuel); mFluidOutputs = aOutputs; @@ -60,8 +57,7 @@ public class GasSpargingRecipe implements Comparable { } public boolean isValid() { - if (mInputGas == null - || mInputGas.amount <= 0 + if (mInputGas == null || mInputGas.amount <= 0 || mInputSpentFuel == null || mInputSpentFuel.amount <= 0 || mFluidOutputs == null diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index ec124ae422..f6618cb1f8 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -2,9 +2,10 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; -import gtPlusPlus.api.objects.data.AutoMap; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.api.objects.data.AutoMap; + public class GasSpargingRecipeMap extends AutoMap { public static final AutoMap mRecipes = new AutoMap(); @@ -13,14 +14,9 @@ public class GasSpargingRecipeMap extends AutoMap { public static final String mNEIDisplayName = "LFTR Gas Sparging"; public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png"; - public static boolean addRecipe( - FluidStack aSpargeGas, - FluidStack aSpentFuel, - FluidStack aSpargedFuel, - FluidStack[] aOutputs, - int[] aMaxOutputs) { - if (aSpargeGas == null - || aSpargeGas.amount <= 0 + public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, + FluidStack[] aOutputs, int[] aMaxOutputs) { + if (aSpargeGas == null || aSpargeGas.amount <= 0 || aSpentFuel == null || aSpentFuel.amount <= 0 || aSpargedFuel == null diff --git a/src/main/java/gregtech/api/util/HotFuel.java b/src/main/java/gregtech/api/util/HotFuel.java index 53ab85a455..b8fcef1308 100644 --- a/src/main/java/gregtech/api/util/HotFuel.java +++ b/src/main/java/gregtech/api/util/HotFuel.java @@ -5,20 +5,20 @@ import net.minecraftforge.fluids.FluidStack; public class HotFuel { - public static void addNewHotFuel( - FluidStack aInput1, FluidStack aOutput1, ItemStack[] outputItems, int[] chances, int aSpecialValue) { + public static void addNewHotFuel(FluidStack aInput1, FluidStack aOutput1, ItemStack[] outputItems, int[] chances, + int aSpecialValue) { GTPP_Recipe.GTPP_Recipe_Map.sThermalFuels.addRecipe( true, null, outputItems, null, chances, - new FluidStack[] {aInput1}, - new FluidStack[] {aOutput1}, + new FluidStack[] { aInput1 }, + new FluidStack[] { aOutput1 }, 1, // 1 Tick 0, // No Eu produced aSpecialValue // Magic Number - ); + ); } public static void addNewHotFuel(FluidStack aInput1, FluidStack aOutput1, FluidStack aOutput2, int aSpecialValue) { @@ -28,11 +28,11 @@ public class HotFuel { null, null, null, - new FluidStack[] {aInput1}, - new FluidStack[] {aOutput1, aOutput2}, + new FluidStack[] { aInput1 }, + new FluidStack[] { aOutput1, aOutput2 }, 20, // 1 Second 0, // No Eu produced aSpecialValue // Magic Number - ); + ); } } diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java index 08a9dbf3af..2a40cad100 100644 --- a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java +++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java @@ -2,14 +2,16 @@ package gregtech.api.util; import static gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map.sSemiFluidLiquidFuels; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.minecraft.FluidUtils; import java.util.HashMap; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.util.minecraft.FluidUtils; + public class SemiFluidFuelHandler { public static boolean addSemiFluidFuel(ItemStack aFuelItem, int aFuelValue) { @@ -31,15 +33,17 @@ public class SemiFluidFuelHandler { new ItemStack[] {}, null, new int[] {}, - new FluidStack[] {p}, + new FluidStack[] { p }, null, 0, 0, aFuelValue); if (aRecipe.mSpecialValue > 0) { - Logger.INFO("Added " + aRecipe.mFluidInputs[0].getLocalizedName() - + " to the Semi-Fluid Generator fuel map. Fuel Produces " + (aRecipe.mSpecialValue * 1000) - + "EU per 1000L."); + Logger.INFO( + "Added " + aRecipe.mFluidInputs[0].getLocalizedName() + + " to the Semi-Fluid Generator fuel map. Fuel Produces " + + (aRecipe.mSpecialValue * 1000) + + "EU per 1000L."); sSemiFluidLiquidFuels.add(aRecipe); return true; } @@ -53,8 +57,7 @@ public class SemiFluidFuelHandler { final FluidStack aCreosote = FluidUtils.getFluidStack("creosote", 1000); final FluidStack aHeavyFuel = FluidUtils.getFluidStack("liquid_heavy_fuel", 1000); final FluidStack aHeavyOil = FluidUtils.getFluidStack("liquid_heavy_oil", 1000); - final HashMap> aFoundFluidsFromItems = - new HashMap>(); + final HashMap> aFoundFluidsFromItems = new HashMap>(); // Find Fluids From items for (final GT_Recipe r : gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDenseLiquidFuels.mRecipeList) { @@ -76,8 +79,11 @@ public class SemiFluidFuelHandler { } } g.mSpecialValue *= aContainsCreosote ? 6 : 3; - Logger.INFO("Added " + g.mFluidInputs[0].getLocalizedName() - + " to the Semi-Fluid Generator fuel map. Fuel Produces " + g.mSpecialValue + "EU per 1000L."); + Logger.INFO( + "Added " + g.mFluidInputs[0].getLocalizedName() + + " to the Semi-Fluid Generator fuel map. Fuel Produces " + + g.mSpecialValue + + "EU per 1000L."); sSemiFluidLiquidFuels.add(g); } } @@ -99,15 +105,17 @@ public class SemiFluidFuelHandler { new ItemStack[] {}, null, new int[] {}, - new FluidStack[] {p.getKey()}, + new FluidStack[] { p.getKey() }, null, 0, 0, aFuelValue); if (aRecipe.mSpecialValue > 0) { - Logger.INFO("Added " + aRecipe.mFluidInputs[0].getLocalizedName() - + " to the Semi-Fluid Generator fuel map. Fuel Produces " - + (aRecipe.mSpecialValue * 1000) + "EU per 1000L."); + Logger.INFO( + "Added " + aRecipe.mFluidInputs[0].getLocalizedName() + + " to the Semi-Fluid Generator fuel map. Fuel Produces " + + (aRecipe.mSpecialValue * 1000) + + "EU per 1000L."); sSemiFluidLiquidFuels.add(aRecipe); } } else { diff --git a/src/main/java/gregtech/api/util/ThermalFuel.java b/src/main/java/gregtech/api/util/ThermalFuel.java index f5f882dafb..7bfb2b6a07 100644 --- a/src/main/java/gregtech/api/util/ThermalFuel.java +++ b/src/main/java/gregtech/api/util/ThermalFuel.java @@ -1,24 +1,25 @@ package gregtech.api.util; -import gtPlusPlus.core.util.math.MathUtils; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.core.util.math.MathUtils; + public class ThermalFuel { - public static void addThermalFuel( - FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int euValue, int aSpecialValue) { + public static void addThermalFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int euValue, + int aSpecialValue) { GTPP_Recipe x = new GTPP_Recipe( true, null, null, null, null, - new FluidStack[] {aInput1, aInput2}, - new FluidStack[] {aOutput1}, + new FluidStack[] { aInput1, aInput2 }, + new FluidStack[] { aOutput1 }, 20, // 1 Tick euValue, // No Eu produced aSpecialValue // Magic Number - ); + ); GTPP_Recipe.GTPP_Recipe_Map.sGeoThermalFuels.addRecipe(x); } @@ -29,12 +30,12 @@ public class ThermalFuel { null, null, null, - new FluidStack[] {aInput1}, + new FluidStack[] { aInput1 }, null, 20, // 1 Tick MathUtils.findPercentageOfInt((aInput1.amount / 2), 95), // No Eu produced 0 // Magic Number - ); + ); GTPP_Recipe.GTPP_Recipe_Map.sSteamTurbineFuels.addRecipe(x); } } -- cgit