aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-11-26 01:56:28 +0900
committerGitHub <noreply@github.com>2022-11-25 17:56:28 +0100
commitcd2ba914a6b5b980ff56347455fcf43a9e3eea3b (patch)
tree9dfba22762592ee292edd9a6c2eb6e4c3d9c6e96 /src/main/java/gregtech/api/util
parent921527ce3cc5f92b067f180295fa55dae718461f (diff)
downloadGT5-Unofficial-cd2ba914a6b5b980ff56347455fcf43a9e3eea3b.tar.gz
GT5-Unofficial-cd2ba914a6b5b980ff56347455fcf43a9e3eea3b.tar.bz2
GT5-Unofficial-cd2ba914a6b5b980ff56347455fcf43a9e3eea3b.zip
Rewrite GUIs with ModularUI (#440)
* Update GT * NEI migration & cleanup Deprecate GTPP_Recipe_Map_Internal#sMappingsEx and delegate to GT_Recipe_Map#sMappings instead Remove recipe modification check * Boiler * Programmed Circuit & Super Bus * Lower the number of fluid slots for multi mixer NEI * Solar Generator * Crop Manager * Bronze Workbench & Advanced Workbench * Turbine Housing & Rotor Assembly * Iron Plated Blast Furnace * Player Safe * Advanced Muffler Hatch * spotlessApply * Auto Workbench * Breaker, Control Core, RTG Hatch, Steam Bus, some cleanup * Fix crash when removing Breaker * Data Orb Repository * Charging/Discharging Bus * Pollution Scrubber * Storage Crate, Shelf, TieredChest They're just broken in the first place, don't blame me * cleanup * Steam Condenser It's broken in the first place, never blame me! * Catalyst Housing, Ball Housing * Fluid Tank, generators, custom hatches, cleanup * Computer Cube MKII Many things are broken in the first place, I swear * Inventory Manager * Migrate multiblock dehydrator recipemap to ModularUI * Overflow cover * Redstone Circuit Block * Multiblock * cleanup * Update GT
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/FishPondFakeRecipe.java9
-rw-r--r--src/main/java/gregtech/api/util/GTPP_Recipe.java1678
2 files changed, 562 insertions, 1125 deletions
diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
index 14cd00d134..3c11c5f801 100644
--- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
+++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java
@@ -70,11 +70,8 @@ public class FishPondFakeRecipe {
new FluidStack[] {null},
100, // 1 Tick
0, // No Eu produced
- circuit // Magic Number
- );
- if (x != null) {
- Logger.INFO("Fishing [" + circuit + "]: " + ItemUtils.getArrayStackNames(outputItems));
- GTPP_Recipe.GTPP_Recipe_Map.sFishPondRecipes.addRecipe(x);
- }
+ 0);
+ Logger.INFO("Fishing [" + circuit + "]: " + ItemUtils.getArrayStackNames(outputItems));
+ GTPP_Recipe.GTPP_Recipe_Map.sFishPondRecipes.addRecipe(x, false, false, false);
}
}
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java
index 553a774147..766145c952 100644
--- a/src/main/java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java
@@ -2,15 +2,13 @@ package gregtech.api.util;
import static gregtech.api.enums.GT_Values.*;
-import codechicken.nei.PositionedStack;
-import gregtech.api.interfaces.tileentity.*;
-import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
+import com.gtnewhorizons.modularui.api.math.Pos2d;
+import com.gtnewhorizons.modularui.common.widget.ProgressBar;
+import gregtech.api.gui.modularui.GT_UITextures;
import gtPlusPlus.api.interfaces.IComparableRecipe;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
import java.util.*;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.*;
@@ -22,9 +20,6 @@ import net.minecraftforge.fluids.*;
*/
public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
- private final String mRecipeHash;
- private final AutoMap<Integer> mHashMap = new AutoMap<Integer>();
-
public GTPP_Recipe(
final boolean aOptimize,
final ItemStack[] aInputs,
@@ -49,84 +44,12 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
aSpecialValue);
// Logger.SPECIFIC_WARNING(this.getClass().getName()+" | [GregtechRecipe]", "Created new recipe instance for
// "+ItemUtils.getArrayStackNames(aInputs), 167);
- this.mRecipeHash = getRecipeHash(this);
- this.mHashMap.addAll(convertStringDataToInts(getEncodedRecipeData(this)));
}
public GTPP_Recipe(final ItemStack aInput1, final ItemStack aOutput1, final int aFuelValue, final int aType) {
this(aInput1, aOutput1, null, null, null, aFuelValue, aType);
}
- private static AutoMap<Integer> convertStringDataToInts(AutoMap<String> aData) {
- AutoMap<Integer> aMap = new AutoMap<Integer>();
- for (String string : aData) {
- aMap.add(string.hashCode());
- }
- return aMap;
- }
-
- private static AutoMap<String> getEncodedRecipeData(GTPP_Recipe aRecipe) {
- AutoMap<String> aData = new AutoMap<String>();
- aData.add(aRecipe.mRecipeHash);
- aData.add("" + aRecipe.mCanBeBuffered);
- aData.add("" + aRecipe.mHidden);
- aData.add("" + aRecipe.mEnabled);
- aData.add("" + aRecipe.mDuration);
- aData.add("" + aRecipe.mEUt);
- aData.add("" + aRecipe.mFakeRecipe);
- aData.add("" + aRecipe.mSpecialItems);
- aData.add(aRecipe.mChances.toString());
- aData.add(aRecipe.mInputs.toString());
- aData.add(aRecipe.mOutputs.toString());
- aData.add(aRecipe.mFluidInputs.toString());
- aData.add(aRecipe.mFluidOutputs.toString());
- return aData;
- }
-
- public static String getRecipeHash(GT_Recipe aRecipe) {
- String aEncoderString = aRecipe.toString();
- return aEncoderString;
- }
-
- private final void checkModified() {
- if (hasBeenModified()) {
- String[] aInfo = RecipeUtils.getRecipeInfo(this);
- for (String s : aInfo) {
- Logger.INFO(s);
- }
- CORE.crash(
- "Someone has edited an internal GT++ recipe, which is no longer allowed. Please complain to whoever has done this, not Alkalus.");
- }
- }
-
- private final boolean hasBeenModified() {
- String aEncoderString = this.toString();
- boolean aBasicHashCheck = this.mRecipeHash.equals(aEncoderString);
- if (!aBasicHashCheck) {
- Logger.INFO("This Recipe Hash: " + aEncoderString);
- Logger.INFO("Expected Hash Code: " + this.mRecipeHash);
- return true;
- }
- AutoMap<Integer> aData = new AutoMap<Integer>();
- aData.addAll(convertStringDataToInts(getEncodedRecipeData(this)));
- long aHashTotal = 0;
- long aExpectedHashTotal = 0;
- for (int a : aData) {
- aHashTotal += a;
- }
- for (int a : this.mHashMap) {
- aExpectedHashTotal += a;
- }
- if (aHashTotal != aExpectedHashTotal) {
- Logger.INFO("This Recipe Hash: " + aEncoderString);
- Logger.INFO("Expected Hash Code: " + this.mRecipeHash);
- Logger.INFO("This Recipe Hash: " + aHashTotal);
- Logger.INFO("Expected Hash Code: " + aExpectedHashTotal);
- return true;
- }
- return false;
- }
-
// aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000!
public GTPP_Recipe(
final ItemStack aInput1,
@@ -180,38 +103,14 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
}
}
- public static void reInit() {
- GT_Log.out.println("GT_Mod: Re-Unificating Recipes.");
- for (final GTPP_Recipe_Map_Internal tMapEntry : GTPP_Recipe_Map_Internal.sMappingsEx) {
- // tMapEntry.reInit();
- if (tMapEntry != null && tMapEntry.mRecipeList != null && !tMapEntry.mRecipeList.isEmpty()) {
- for (GT_Recipe aRecipe : tMapEntry.mRecipeList) {
- checkRecipeOwnership(aRecipe);
- }
- }
- }
- }
-
- private static final boolean checkRecipeOwnership(GT_Recipe aRecipe) {
- if (aRecipe != null && aRecipe instanceof GTPP_Recipe) {
- GTPP_Recipe nRecipe = (GTPP_Recipe) aRecipe;
- GTPP_Recipe_Map_Internal.mHashedRecipes.put(nRecipe.hashCode(), nRecipe);
- return true;
- }
- return false;
- }
-
- public static final void checkRecipeModifications() {
- for (GTPP_Recipe aRecipe : GTPP_Recipe_Map_Internal.mHashedRecipes.values()) {
- Logger.INFO("Checking recipe: " + aRecipe.hashCode());
- aRecipe.checkModified();
- }
- }
-
+ /**
+ * 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<>();
- private static final HashMap<Integer, GTPP_Recipe> mHashedRecipes = new HashMap<Integer, GTPP_Recipe>();
public GTPP_Recipe_Map_Internal(
Collection<GT_Recipe> aRecipeList,
@@ -245,153 +144,155 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
aNEISpecialValuePost,
aShowVoltageAmperageInNEI,
aNEIAllowed);
- GT_Recipe_Map.sMappings.remove(this);
- GTPP_Recipe_Map_Internal.sMappingsEx.add(this);
}
}
public static class GTPP_Recipe_Map {
- // public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200),
- // "gtpp.recipe.chemicalbath", "Chemical Bath", null, RES_PATH_GUI + "basicmachines/ChemicalBath", 1, 3, 1, 1,
- // 1, E, 1, E, true, true);
- public static final GTPP_Recipe_Map_Internal sCokeOvenRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(200),
- "gtpp.recipe.cokeoven",
- "Coke Oven",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 1,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
- public static final GTPP_Recipe_Map_Internal sMatterFab2Recipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(200),
- "gtpp.recipe.matterfab2",
- "Matter Fabricator",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 6,
- 6,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
- // public static final Gregtech_Recipe_Map sMatterFabRecipes = new Gregtech_Recipe_Map(new
- // HashSet<GregtechRecipe>(200), "gtpp.recipe.matterfab", "Matter Fabricator", null, RES_PATH_GUI +
- // "basicmachines/Massfabricator", 1, 3, 1, 1, 1, E, 1, E, true, true);
+ 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);
+ 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);
- public static final GT_Recipe_Map_Fuel sRocketFuels = new GT_Recipe_Map_Fuel(
- new HashSet<GT_Recipe>(10),
- "gtpp.recipe.rocketenginefuel",
- "Rocket Engine Fuel",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 1,
- 1,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 3000,
- " EU",
- true,
- 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);
- public static final GTPP_Recipe_Map_Internal sGeoThermalFuels = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(10),
- "gtpp.recipe.geothermalfuel",
- "GeoThermal Fuel",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 1,
- 1,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 1000,
- " EU",
- true,
- true);
- public static final GTPP_Recipe_Map_Internal sChemicalDehydratorRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(200),
- "gtpp.recipe.chemicaldehydrator",
- "Dehydrator",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
- public static final GTPP_Recipe_Map_Internal sVacuumFurnaceRecipes = new GTPP_Recipe_Map_MultiNoCell(
- new HashSet<GT_Recipe>(500),
- "gtpp.recipe.vacfurnace",
- "Vacuum Furnace",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 6,
- 6,
- 1,
- 0,
- 1,
- "Heat Capacity: ",
- 1,
- " K",
- false,
- true);
- public static final GTPP_Recipe_Map_Internal sAlloyBlastSmelterRecipes = new GTPP_Recipe_Map_MultiNoCell(
- new HashSet<GT_Recipe>(200),
- "gtpp.recipe.alloyblastsmelter",
- "Alloy Blast Smelter",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 9,
- 9,
- 1,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
- public static final GTPP_Recipe_Map_Internal sSteamTurbineFuels = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(10),
- "gtpp.recipe.steamturbinefuel",
- "GeoThermal Fuel",
- null,
- RES_PATH_GUI + "basicmachines/Default",
- 1,
- 1,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 1000,
- " EU",
- true,
- false);
+ 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);
+ 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);
+ 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);
+ 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);
// LFTR recipes
- public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipes =
- new GTPP_Recipe_Map_MultiNoCell(
- new HashSet<GT_Recipe>(50),
+ public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map_FluidOnly(
+ new HashSet<>(50),
"gtpp.recipe.lftr",
"Liquid Fluoride Thorium Reactor",
null,
@@ -405,119 +306,129 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
1,
" EU/t per Dynamo",
true,
- true);
+ false)
+ .setUsualFluidInputCount(6)
+ .setUsualFluidOutputCount(6);
// Ore Milling Map
- public static final GTPP_Recipe_Map_Internal sOreMillRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(10000),
- "gtpp.recipe.oremill",
- "Milling",
- null,
- RES_PATH_GUI + "basicmachines/LFTR",
- 3,
- 4,
- 1,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ public static final GT_Recipe_Map sOreMillRecipes = new GT_Recipe_Map(
+ new HashSet<>(10000),
+ "gtpp.recipe.oremill",
+ "Milling",
+ null,
+ RES_PATH_GUI + "basicmachines/LFTR",
+ 3,
+ 3,
+ 1,
+ 0,
+ 1,
+ E,
+ 1,
+ E,
+ true,
+ false)
+ .useModularUI(true);
// Fission Fuel Plant Recipes
- public static final GTPP_Recipe_Map_Internal sFissionFuelProcessing = new GTPP_Recipe_Map_MultiNoCell(
- new HashSet<GT_Recipe>(50),
- "gtpp.recipe.fissionfuel",
- "Nuclear Fuel Processing",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 0,
- 0,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ 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);
// Cold Trap
- public static final GTPP_Recipe_Map_Internal sColdTrapRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(10000),
- "gtpp.recipe.coldtrap",
- "Cold Trap",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ 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);
// Reactor Processing Unit
- public static final GTPP_Recipe_Map_Internal sReactorProcessingUnitRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(10000),
- "gtpp.recipe.reactorprocessingunit",
- "Reactor Processing Unit",
- null,
- RES_PATH_GUI + "basicmachines/Dehydrator",
- 2,
- 9,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ 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);
// Basic Washer Map
- public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(3),
- "gtpp.recipe.simplewasher",
- "Simple Dust Washer",
- null,
- RES_PATH_GUI + "basicmachines/PotionBrewer",
- 1,
- 1,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ 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)
+ .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE);
// Molecular Transformer Map
- public static final GTPP_Recipe_Map_Internal sMolecularTransformerRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(3),
- "gtpp.recipe.moleculartransformer",
- "Molecular Transformer",
- null,
- RES_PATH_GUI + "basicmachines/Scanner",
- 1,
- 1,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ 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);
// Elemental Duplicator Map
- public static final GTPP_Recipe_Map_Internal sElementalDuplicatorRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(3),
+ public static final GT_Recipe_Map sElementalDuplicatorRecipes = new GT_Recipe_Map(
+ new HashSet<>(3),
"gtpp.recipe.elementaldupe",
"Elemental Duplicator",
null,
@@ -533,18 +444,14 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
true,
false);
- // public static final GT_Recipe_Map sSimpleWasherRecipes_FakeFuckBW = new GT_Recipe_Map(new
- // HashSet<GT_Recipe>(3), "gtpp.recipe.simplewasher", "Fuck you Bart", null, RES_PATH_GUI +
- // "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, false);
-
- public static final GTPP_Recipe_Map_Internal sChemicalPlantRecipes = new GTPP_Recipe_Map_ChemicalPlant(
- new HashSet<GT_Recipe>(100),
+ public static final GT_Recipe_Map sChemicalPlantRecipes = new GTPP_Recipe_Map_ChemicalPlant(
+ new HashSet<>(100),
"gtpp.recipe.fluidchemicaleactor",
"Chemical Plant",
null,
CORE.MODID + ":textures/gui/FluidReactor",
- 0,
- 0,
+ 4,
+ 4,
0,
2,
1,
@@ -552,153 +459,163 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
1,
E,
true,
- true);
+ false);
// RTG Fuel Map
- public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new GTPP_Recipe.GT_Recipe_Map_Fuel(
- new HashSet<GT_Recipe>(10),
- "gtpp.recipe.RTGgenerators",
- "RTG",
- null,
- "gregtech:textures/gui/basicmachines/Default",
- 1,
- 1,
- 0,
- 0,
- 1,
- "Fuel Value: ",
- 365,
- " Minecraft Days",
- true,
- true);
+ 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);
// Thermal Boiler map
- public static final GTPP_Recipe_Map_Internal sThermalFuels = new GTPP_Recipe_Map_MultiNoCell(
- new HashSet<GT_Recipe>(10),
- "gtpp.recipe.thermalgeneratorfuel",
- "Thermal Generator Fuel",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 1,
- 1,
- 0,
- 0,
- 1,
- null,
- 1000,
- null,
- true,
- true);
+ 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);
// Solar Tower map
- public static final GTPP_Recipe_Map_Internal sSolarTowerRecipes = new GTPP_Recipe_Map_MultiNoCell(
- new HashSet<GT_Recipe>(10),
- "gtpp.recipe.solartower",
- "Solar Tower",
- null,
- RES_PATH_GUI + "basicmachines/FissionFuel",
- 1,
- 1,
- 0,
- 0,
- 1,
- null,
- 1000,
- null,
- true,
- true);
+ public static final GT_Recipe_Map sSolarTowerRecipes = new GT_Recipe_Map(
+ new HashSet<>(10),
+ "gtpp.recipe.solartower",
+ "Solar Tower",
+ null,
+ RES_PATH_GUI + "basicmachines/FissionFuel",
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ null,
+ 1000,
+ null,
+ true,
+ false)
+ .useModularUI(true);
// Cyclotron recipe map
- public static final GTPP_Recipe_Map_Internal sCyclotronRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(200),
- "gtpp.recipe.cyclotron",
- "COMET - Compact Cyclotron",
- null,
- RES_PATH_GUI + "basicmachines/BlastSmelter",
- 2,
- 16,
- 0,
- 0,
- 1,
- E,
- 1,
- E,
- true,
- true);
+ 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);
// Advanced Mixer
- public static final GTPP_Recipe_Map_Internal sAdvancedMixerRecipes = new GTPP_Recipe_Map_Internal(
- new HashSet<GT_Recipe>(1000),
- "gtpp.recipe.advanced.mixer",
- "Advanced Material Combiner",
- null,
- "gregtech:textures/gui/basicmachines/MixerAdvanced",
- 4,
- 4,
- 1,
- 0,
- 2,
- "",
- 1,
- "",
- true,
- true);
+ public static final GT_Recipe_Map sAdvancedMixerRecipes = new GT_Recipe_Map(
+ new HashSet<>(1000),
+ "gtpp.recipe.advanced.mixer",
+ "Advanced Material Combiner",
+ null,
+ "gregtech:textures/gui/basicmachines/MixerAdvanced",
+ 4,
+ 4,
+ 1,
+ 0,
+ 2,
+ "",