diff options
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/TAE.java | 16 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/EmptyRecipeMap.java | 61 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/FishPondFakeRecipe.java | 35 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GTPP_Recipe.java | 1049 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipe.java | 16 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipeMap.java | 14 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/HotFuel.java | 16 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/SemiFluidFuelHandler.java | 38 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/ThermalFuel.java | 17 |
9 files changed, 581 insertions, 681 deletions
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java index e45e9e4e58..4baafada2c 100644 --- a/src/main/java/gregtech/api/enums/TAE.java +++ b/src/main/java/gregtech/api/enums/TAE.java @@ -1,5 +1,9 @@ package gregtech.api.enums; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.HashSet; + import gregtech.api.interfaces.ITexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -8,9 +12,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.HashSet; public class TAE { @@ -31,8 +32,8 @@ public class TAE { /** * - * @param aPage - The Texture page (0-3) - * @param aID - The ID on the specified page (0-15) + * @param aPage - The Texture page (0-3) + * @param aID - The ID on the specified page (0-15) * @param GTPP_CopiedBlockTexture - The Texture to register * @return - Did it register correctly? */ @@ -90,8 +91,9 @@ public class TAE { if (h != null) { h[64][secondaryIndex++] = GTPP_CopiedBlockTexture; x.set(null, h); - Logger.INFO("[TAE} Registered Texture with ID " + (secondaryIndex - 1) - + " in secondary index."); + Logger.INFO( + "[TAE} Registered Texture with ID " + (secondaryIndex - 1) + + " in secondary index."); return true; } } 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<GT_Recipe> 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<GT_Recipe> 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<WeightedRandomFishable> fish = new ArrayList<WeightedRandomFishable>(); @@ -21,12 +23,10 @@ public class FishPondFakeRecipe { public static boolean generateFishPondRecipes() { try { - fish = (ArrayList<WeightedRandomFishable>) - ReflectionUtils.getField(FishingHooks.class, "fish").get(null); - junk = (ArrayList<WeightedRandomFishable>) - ReflectionUtils.getField(FishingHooks.class, "junk").get(null); - treasure = (ArrayList<WeightedRandomFishable>) - ReflectionUtils.getField(FishingHooks.class, "treasure").get(null); + fish = (ArrayList<WeightedRandomFishable>) ReflectionUtils.getField(FishingHooks.class, "fish").get(null); + junk = (ArrayList<WeightedRandomFishable>) ReflectionUtils.getField(FishingHooks.class, "junk").get(null); + treasure = (ArrayList<WeightedRandomFishable>) 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<GTPP_Recipe_Map_Internal> sMappingsEx = new ArrayList<>(); - public GTPP_Recipe_Map_Internal( - Collection<GT_Recipe> 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<GT_Recipe> 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<String> handleNEIItemInputTooltip(List<String> 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, |