aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gregtech/api/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gregtech/api/util')
-rw-r--r--src/Java/gregtech/api/util/CustomRecipeMap.java76
-rw-r--r--src/Java/gregtech/api/util/FishPondFakeRecipe.java4
-rw-r--r--src/Java/gregtech/api/util/GTPP_Recipe.java (renamed from src/Java/gregtech/api/util/Recipe_GT.java)280
-rw-r--r--src/Java/gregtech/api/util/HotFuel.java4
-rw-r--r--src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java4
-rw-r--r--src/Java/gregtech/api/util/SemiFluidFuelHandler.java6
-rw-r--r--src/Java/gregtech/api/util/ThermalFuel.java8
7 files changed, 212 insertions, 170 deletions
diff --git a/src/Java/gregtech/api/util/CustomRecipeMap.java b/src/Java/gregtech/api/util/CustomRecipeMap.java
index ba0ab3dd29..dd137aa527 100644
--- a/src/Java/gregtech/api/util/CustomRecipeMap.java
+++ b/src/Java/gregtech/api/util/CustomRecipeMap.java
@@ -14,36 +14,36 @@ import gtPlusPlus.api.objects.Logger;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
-public class CustomRecipeMap/* extends GT_Recipe_Map*/{
+public class CustomRecipeMap/* extends GTPP_Recipe_Map*/{
/**
* Contains all Recipe Maps
*/
public static final Collection<CustomRecipeMap> sMappings = new ArrayList<>();
- //public static final CustomRecipeMap sOreWasherRecipes = new GT_Recipe_Map_OreWasher(new HashSet<GT_Recipe>(0), "ic.recipe.orewasher", "Ore Washer", "ic2.blockOreWashingPlant", RES_PATH_GUI + "basicmachines/OreWasher", 1, 3, 1, 1, 1, E, 1, E, true, false);
+ //public static final CustomRecipeMap sOreWasherRecipes = new GTPP_Recipe_Map_OreWasher(new HashSet<GTPP_Recipe>(0), "ic.recipe.orewasher", "Ore Washer", "ic2.blockOreWashingPlant", RES_PATH_GUI + "basicmachines/OreWasher", 1, 3, 1, 1, 1, E, 1, E, true, false);
//Fission Fuel Plant Recipes
- public static final CustomRecipeMap sFissionFuelProcessing = new CustomRecipeMap(new HashSet<GT_Recipe>(50), "gt.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 4, 1, E, 1, E, true, true);
+ public static final CustomRecipeMap sFissionFuelProcessing = new CustomRecipeMap(new HashSet<GTPP_Recipe>(50), "gt.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 4, 1, E, 1, E, true, true);
- public static final CustomRecipeMap mMultiWireMill = new CustomRecipeMap(new HashSet<GT_Recipe>(500), "gt.recipe.multi.wiremill", "Multiblock Wiremill", null, RES_PATH_GUI + "basicmachines/FissionFuel", 1, 1, 0, 0, 1, E, 1, E, true, true);
- public static final CustomRecipeMap mMultiMacerator = new CustomRecipeMap(new HashSet<GT_Recipe>(500), "gt.recipe.multi.macerator", "Maceration Stack", null, RES_PATH_GUI + "basicmachines/FissionFuel", 1, 3, 0, 0, 1, E, 1, E, true, true);
- public static final CustomRecipeMap mMultiCentrifuge = new CustomRecipeMap(new HashSet<GT_Recipe>(500), "gt.recipe.multi.centrifuge", "Multiblock Centrifuge", null, RES_PATH_GUI + "basicmachines/FissionFuel", 2, 6, 0, 0, 1, E, 1, E, true, true);
- public static final CustomRecipeMap mMultiElectrolyzer = new CustomRecipeMap(new HashSet<GT_Recipe>(500), "gt.recipe.multi.electrolyzer", "Multiblock Electrolyzer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 2, 6, 0, 0, 1, E, 1, E, true, true);
+ public static final CustomRecipeMap mMultiWireMill = new CustomRecipeMap(new HashSet<GTPP_Recipe>(500), "gt.recipe.multi.wiremill", "Multiblock Wiremill", null, RES_PATH_GUI + "basicmachines/FissionFuel", 1, 1, 0, 0, 1, E, 1, E, true, true);
+ public static final CustomRecipeMap mMultiMacerator = new CustomRecipeMap(new HashSet<GTPP_Recipe>(500), "gt.recipe.multi.macerator", "Maceration Stack", null, RES_PATH_GUI + "basicmachines/FissionFuel", 1, 3, 0, 0, 1, E, 1, E, true, true);
+ public static final CustomRecipeMap mMultiCentrifuge = new CustomRecipeMap(new HashSet<GTPP_Recipe>(500), "gt.recipe.multi.centrifuge", "Multiblock Centrifuge", null, RES_PATH_GUI + "basicmachines/FissionFuel", 2, 6, 0, 0, 1, E, 1, E, true, true);
+ public static final CustomRecipeMap mMultiElectrolyzer = new CustomRecipeMap(new HashSet<GTPP_Recipe>(500), "gt.recipe.multi.electrolyzer", "Multiblock Electrolyzer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 2, 6, 0, 0, 1, E, 1, E, true, true);
/**
* HashMap of Recipes based on their Items
*/
- public final Map<GT_ItemStack, Collection<GT_Recipe>> mRecipeItemMap = new HashMap<>();
+ public final Map<GT_ItemStack, Collection<GTPP_Recipe>> mRecipeItemMap = new HashMap<>();
/**
* HashMap of Recipes based on their Fluids
*/
- public final Map<Fluid, Collection<GT_Recipe>> mRecipeFluidMap = new HashMap<>();
+ public final Map<Fluid, Collection<GTPP_Recipe>> mRecipeFluidMap = new HashMap<>();
/**
* The List of all Recipes
*/
- public final Collection<GT_Recipe> mRecipeList;
+ public final Collection<GTPP_Recipe> mRecipeList;
/**
* String used as an unlocalised Name.
*/
@@ -74,7 +74,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
* @param aNEISpecialValuePost the String after the Special Value. Usually for a Unit or something.
* @param aNEIAllowed if NEI is allowed to display this Recipe Handler in general.
*/
- public CustomRecipeMap(final Collection<GT_Recipe> aRecipeList, final String aUnlocalizedName, final String aLocalName, final String aNEIName, final String aNEIGUIPath, final int aUsualInputCount, final int aUsualOutputCount, final int aMinimalInputItems, final int aMinimalInputFluids, final int aAmperage, final String aNEISpecialValuePre, final int aNEISpecialValueMultiplier, final String aNEISpecialValuePost, final boolean aShowVoltageAmperageInNEI, final boolean aNEIAllowed) {
+ public CustomRecipeMap(final Collection<GTPP_Recipe> aRecipeList, final String aUnlocalizedName, final String aLocalName, final String aNEIName, final String aNEIGUIPath, final int aUsualInputCount, final int aUsualOutputCount, final int aMinimalInputItems, final int aMinimalInputFluids, final int aAmperage, final String aNEISpecialValuePre, final int aNEISpecialValueMultiplier, final String aNEISpecialValuePost, final boolean aShowVoltageAmperageInNEI, final boolean aNEIAllowed) {
//super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
sMappings.add(this);
this.mNEIAllowed = aNEIAllowed;
@@ -95,23 +95,23 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
GT_LanguageManager.addStringLocalization(this.mUnlocalizedName = aUnlocalizedName, aLocalName);
}
- public GT_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new GT_Recipe(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
- public GT_Recipe addRecipe(final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new GT_Recipe(false, null, null, null, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue), false, false, false);
+ public GTPP_Recipe addRecipe(final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(false, null, null, null, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue), false, false, false);
}
- public GT_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new GT_Recipe(aOptimize, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(aOptimize, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
- public GT_Recipe addRecipe(final GT_Recipe aRecipe) {
+ public GTPP_Recipe addRecipe(final GTPP_Recipe aRecipe) {
return this.addRecipe(aRecipe, true, false, false);
}
- public GT_Recipe addRecipe(final GT_Recipe aRecipe, final boolean aCheckForCollisions, final boolean aFakeRecipe, final boolean aHidden) {
+ public GTPP_Recipe addRecipe(final GTPP_Recipe aRecipe, final boolean aCheckForCollisions, final boolean aFakeRecipe, final boolean aHidden) {
aRecipe.mHidden = aHidden;
aRecipe.mFakeRecipe = aFakeRecipe;
if ((aRecipe.mFluidInputs.length < this.mMinimalInputFluids) && (aRecipe.mInputs.length < this.mMinimalInputItems)) {
@@ -126,29 +126,29 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
/**
* Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
*/
- public GT_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addFakeRecipe(aCheckForCollisions, new GT_Recipe(false, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addFakeRecipe(aCheckForCollisions, new GTPP_Recipe(false, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
/**
* Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
*/
- public GT_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addFakeRecipe(aCheckForCollisions, new GT_Recipe(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addFakeRecipe(aCheckForCollisions, new GTPP_Recipe(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
/**
* Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
*/
- public GT_Recipe addFakeRecipe(final boolean aCheckForCollisions, final GT_Recipe aRecipe) {
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final GTPP_Recipe aRecipe) {
return this.addRecipe(aRecipe, aCheckForCollisions, true, false);
}
- public GT_Recipe add(final GT_Recipe aRecipe) {
+ public GTPP_Recipe add(final GTPP_Recipe aRecipe) {
this.mRecipeList.add(aRecipe);
for (final FluidStack aFluid : aRecipe.mFluidInputs) {
if (aFluid != null) {
- Collection<GT_Recipe> tList = this.mRecipeFluidMap.get(aFluid.getFluid());
+ Collection<GTPP_Recipe> tList = this.mRecipeFluidMap.get(aFluid.getFluid());
if (tList == null) {
this.mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet<>(1));
}
@@ -159,11 +159,11 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
}
public void reInit() {
- final Map<GT_ItemStack, Collection<GT_Recipe>> tMap = this.mRecipeItemMap;
+ final Map<GT_ItemStack, Collection<GTPP_Recipe>> tMap = this.mRecipeItemMap;
if (tMap != null) {
tMap.clear();
}
- for (final GT_Recipe tRecipe : this.mRecipeList) {
+ for (final GTPP_Recipe tRecipe : this.mRecipeList) {
GT_OreDictUnificator.setStackArray(true, tRecipe.mInputs);
GT_OreDictUnificator.setStackArray(true, tRecipe.mOutputs);
if (tMap != null) {
@@ -193,11 +193,11 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
return (aFluid != null) && this.mRecipeFluidMap.containsKey(aFluid);
}
- public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
+ public GTPP_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, null, aInputs);
}
- public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
+ public GTPP_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GTPP_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, aRecipe, aNotUnificated, aVoltage, aFluids, null, aInputs);
}
@@ -213,7 +213,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
* @param aInputs the Item Inputs
* @return the Recipe it has found or null for no matching Recipe
*/
- public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) {
+ public GTPP_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GTPP_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) {
// No Recipes? Well, nothing to be found then.
if (this.mRecipeList.isEmpty()) {
Logger.WARNING("BAD RECIPE");
@@ -277,11 +277,11 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
Logger.WARNING("BAD RECIPE [b1]");
if (tStack != null) {
Logger.WARNING("BAD RECIPE [b2] | "+tStack.getDisplayName());
- Collection<GT_Recipe>
+ Collection<GTPP_Recipe>
tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(tStack));
if (tRecipes != null) {
Logger.WARNING("BAD RECIPE [b3]");
- for (final GT_Recipe tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
Logger.WARNING("BAD RECIPE [b4]");
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
Logger.WARNING("BAD RECIPE [b5]");
@@ -293,7 +293,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack)));
if (tRecipes != null) {
Logger.WARNING("BAD RECIPE [b7]");
- for (final GT_Recipe tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
Logger.WARNING("BAD RECIPE [b8]");
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
Logger.WARNING("BAD RECIPE [b9]");
@@ -312,11 +312,11 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
Logger.WARNING("BAD RECIPE [c1]");
if (aFluid != null) {
Logger.WARNING("BAD RECIPE [c2]");
- final Collection<GT_Recipe>
+ final Collection<GTPP_Recipe>
tRecipes = this.mRecipeFluidMap.get(aFluid.getFluid());
if (tRecipes != null) {
Logger.WARNING("BAD RECIPE [c3]");
- for (final GT_Recipe tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
Logger.WARNING("BAD RECIPE [c4]");
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
Logger.WARNING("BAD RECIPE [c5]");
@@ -333,11 +333,11 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{
return null;
}
- protected GT_Recipe addToItemMap(final GT_Recipe aRecipe) {
+ protected GTPP_Recipe addToItemMap(final GTPP_Recipe aRecipe) {
for (final ItemStack aStack : aRecipe.mInputs) {
if (aStack != null) {
final GT_ItemStack tStack = new GT_ItemStack(aStack);
- Collection<GT_Recipe> tList = this.mRecipeItemMap.get(tStack);
+ Collection<GTPP_Recipe> tList = this.mRecipeItemMap.get(tStack);
if (tList == null) {
this.mRecipeItemMap.put(tStack, tList = new HashSet<>(1));
}
diff --git a/src/Java/gregtech/api/util/FishPondFakeRecipe.java b/src/Java/gregtech/api/util/FishPondFakeRecipe.java
index 5d74329135..bc7cdb4701 100644
--- a/src/Java/gregtech/api/util/FishPondFakeRecipe.java
+++ b/src/Java/gregtech/api/util/FishPondFakeRecipe.java
@@ -59,7 +59,7 @@ public class FishPondFakeRecipe {
}
public static void addNewFishPondLoot(int circuit, ItemStack[] outputItems, int[] chances) {
- GT_Recipe x = new GT_Recipe(
+ GTPP_Recipe x = new GTPP_Recipe(
true,
new ItemStack[]{CI.getNumberedCircuit(circuit)},
outputItems,
@@ -73,7 +73,7 @@ public class FishPondFakeRecipe {
);
if (x != null) {
Logger.INFO("Fishing ["+circuit+"]: "+ItemUtils.getArrayStackNames(outputItems));
- Recipe_GT.Gregtech_Recipe_Map.sFishPondRecipes.addRecipe(x);
+ GTPP_Recipe.GTPP_Recipe_Map.sFishPondRecipes.addRecipe(x);
}
}
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/GTPP_Recipe.java
index 7bed2ee4ec..107fa89510 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/GTPP_Recipe.java
@@ -32,19 +32,36 @@ import net.minecraftforge.fluids.FluidStack;
* @author Alkalus
*
*/
-public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
+public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
- public Recipe_GT(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) {
+ private final int mRecipeHash;
+
+ 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, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
//Logger.SPECIFIC_WARNING(this.getClass().getName()+" | [GregtechRecipe]", "Created new recipe instance for "+ItemUtils.getArrayStackNames(aInputs), 167);
+ mRecipeHash = getRecipeHash(this);
}
- public Recipe_GT(final ItemStack aInput1, final ItemStack aOutput1, final int aFuelValue, final int aType) {
+ public GTPP_Recipe(final ItemStack aInput1, final ItemStack aOutput1, final int aFuelValue, final int aType) {
this(aInput1, aOutput1, null, null, null, aFuelValue, aType);
}
+
+ public static int getRecipeHash(GT_Recipe aRecipe) {
+ return aRecipe.hashCode();
+ }
+
+ public final void checkModified() {
+ if (hasBeenModified()) {
+ 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() {
+ return mRecipeHash != this.hashCode();
+ }
// aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000!
- public Recipe_GT(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}, null, null, null, null, 0, 0, Math.max(1, aSpecialValue));
Logger.WARNING("Switch case method for adding fuels");
@@ -53,15 +70,15 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
// Diesel Generator
case 0:
Logger.WARNING("Added fuel "+aInput1.getDisplayName()+" is ROCKET FUEL - continuing");
- Gregtech_Recipe_Map.sRocketFuels.addRecipe(this);
+ GTPP_Recipe_Map.sRocketFuels.addRecipe(this);
break;
// Gas Turbine
case 1:
- Gregtech_Recipe_Map.sGeoThermalFuels.addRecipe(this);
+ GTPP_Recipe_Map.sGeoThermalFuels.addRecipe(this);
break;
// Thermal Generator
case 2:
- Gregtech_Recipe_Map.sRTGFuels.addRecipe(this);
+ GTPP_Recipe_Map.sRTGFuels.addRecipe(this);
break;
// Plasma Generator
case 4:
@@ -80,21 +97,21 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
//Custom Recipe Handlers
- public Recipe_GT(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, final int aDuration, final int aEUt) {
+ public GTPP_Recipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, final int aDuration, final int aEUt) {
this(true, new ItemStack[]{aInput}, aOutput.clone(), null, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0);
if ((this.mInputs.length > 0) && (this.mOutputs[0] != null)) {
- Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(this);
+ GTPP_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(this);
}
}
- public Recipe_GT(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aOutput1, final int aDuration, final int aEUt, final int aSpecialValue) {
+ public GTPP_Recipe(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aOutput1, final int aDuration, final int aEUt, final int aSpecialValue) {
this(true, null, null, null, null, new FluidStack[]{aInput1, aInput2}, new FluidStack[]{aOutput1}, Math.max(aDuration, 1), aEUt, Math.max(Math.min(aSpecialValue, 160000000), 0));
if (this.mInputs.length > 1) {
- Gregtech_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(this);
+ GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(this);
}
}
- public Recipe_GT(
+ public GTPP_Recipe(
final FluidStack aInput1, final FluidStack aInput2, final FluidStack aInput3,
final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6,
final FluidStack aInput7, final FluidStack aInput8, final FluidStack aInput9,
@@ -116,13 +133,37 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
public static void reInit() {
GT_Log.out.println("GT_Mod: Re-Unificating Recipes.");
- for (final Gregtech_Recipe_Map tMapEntry : Gregtech_Recipe_Map.sMappings) {
+ for (final GTPP_Recipe_Map tMapEntry : GTPP_Recipe_Map.sMappings) {
tMapEntry.reInit();
+ if (tMapEntry != null && tMapEntry.mRecipeList != null && !tMapEntry.mRecipeList.isEmpty()) {
+ for (GT_Recipe aRecipe : tMapEntry.mRecipeList) {
+ checkRecipeOwnership(aRecipe);
+ }
+ }
}
- for (final GTPP_Recipe_Map tMapEntry : GTPP_Recipe_Map.sMappingsEx) {
+ 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 final static 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 final static void checkRecipeModifications() {
+ for (GTPP_Recipe aRecipe : GTPP_Recipe_Map_Internal.mHashedRecipes.values()) {
+ aRecipe.checkModified();
}
-
}
@Override
@@ -240,51 +281,52 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
return true;
}
- public static class GTPP_Recipe_Map extends GT_Recipe_Map {
+ public static class GTPP_Recipe_Map_Internal extends GT_Recipe_Map {
- public static final Collection<GTPP_Recipe_Map> sMappingsEx = new ArrayList<>();
+ 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(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 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, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
GT_Recipe_Map.sMappings.remove(this);
- GTPP_Recipe_Map.sMappingsEx.add(this);
+ GTPP_Recipe_Map_Internal.sMappingsEx.add(this);
}
}
- public static class Gregtech_Recipe_Map {
+ public static class GTPP_Recipe_Map {
/**
* Contains all Recipe Maps
*/
- public static final Collection<Gregtech_Recipe_Map> sMappings = new ArrayList<>();
+ public static final Collection<GTPP_Recipe_Map> sMappings = new ArrayList<>();
//public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.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 sCokeOvenRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 2, 1, 0, 1, E, 1, E, true, true);
- public static final GTPP_Recipe_Map sMatterFab2Recipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.matterfab2", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Default", 9, 9, 0, 0, 1, E, 1, E, true, true);
+ public static final GTPP_Recipe_Map_Internal sCokeOvenRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 2, 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), "gt.recipe.matterfab2", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Default", 9, 9, 0, 0, 1, E, 1, E, true, true);
//public static final Gregtech_Recipe_Map sMatterFabRecipes = new Gregtech_Recipe_Map(new HashSet<GregtechRecipe>(200), "gt.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_Fuel sRocketFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.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 GTPP_Recipe_Map sGeoThermalFuels = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(10), "gt.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 sChemicalDehydratorRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.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 sVacuumFurnaceRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(500), "gt.recipe.vacfurnace", "Vacuum Furnace", null, "gregtech:textures/gui/basicmachines/Default", 6, 6, 1, 0, 1, "Heat Capacity: ", 1, " K", false, true);
- public static final GTPP_Recipe_Map sAlloyBlastSmelterRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 9, 9, 1, 0, 1, E, 1, E, true, true);
- public static final GTPP_Recipe_Map sSteamTurbineFuels = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(10), "gt.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 sGeoThermalFuels = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10), "gt.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), "gt.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_Internal(new HashSet<GT_Recipe>(500), "gt.recipe.vacfurnace", "Vacuum Furnace", null, "gregtech:textures/gui/basicmachines/Default", 6, 6, 1, 0, 1, "Heat Capacity: ", 1, " K", false, true);
+ public static final GTPP_Recipe_Map_Internal sAlloyBlastSmelterRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 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), "gt.recipe.geothermalfuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
//LFTR recipes
- public static final GTPP_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
- public static final GTPP_Recipe_Map sLiquidFluorineThoriumReactorRecipesEx = new GTPP_Recipe_Map(new NoConflictGTRecipeMap(), "gt.recipe.lftr.2", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
+ public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gt.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
+ public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipesEx = new GTPP_Recipe_Map_Internal(new NoConflictGTRecipeMap(), "gt.recipe.lftr.2", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
// Ore Milling Map
- public static final GTPP_Recipe_Map sOreMillRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(10000), "gt.recipe.oremill", "Milling", null, RES_PATH_GUI + "basicmachines/LFTR", 3, 4, 1, 0, 1, E, 1, E, true, false);
+ public static final GTPP_Recipe_Map_Internal sOreMillRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gt.recipe.oremill", "Milling", null, RES_PATH_GUI + "basicmachines/LFTR", 3, 4, 1, 0, 1, E, 1, E, true, false);
//Fission Fuel Plant Recipes
//public static final GTPP_Recipe_Map sFissionFuelProcessing = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.fissionfuel", "Fission Fuel Processing", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 9, 1, E, 1, E, true, true);
//Basic Washer Map
- public static final GTPP_Recipe_Map sSimpleWasherRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(3), "gt.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 = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gt.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true);
- public static final Gregtech_Recipe_Map sChemicalPlantRecipes = new Gregtech_Recipe_Map(
- new HashSet<Recipe_GT>(100),
+ public static final GTPP_Recipe_Map sChemicalPlantRecipes = new GTPP_Recipe_Map(
+ new HashSet<GTPP_Recipe>(100),
"gt.recipe.fluidchemicaleactor",
"Chemical Plant",
null,
@@ -302,7 +344,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
//RTG Fuel Map
- public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new Recipe_GT.GT_Recipe_Map_Fuel(
+ public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new GTPP_Recipe.GT_Recipe_Map_Fuel(
new HashSet<GT_Recipe>(10), "gt.recipe.RTGgenerators", "RTG", null,
"gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 365, " Minecraft Days", true, true);
@@ -312,15 +354,15 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
"Fuel Value: ", 1000, " EU", true, false);
//Cyclotron recipe map
- public static final GTPP_Recipe_Map sCyclotronRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.cyclotron", "COMET - Compact Cyclotron", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 2, 16, 0, 0, 1, E, 1, E, true, true);
+ public static final GTPP_Recipe_Map_Internal sCyclotronRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gt.recipe.cyclotron", "COMET - Compact Cyclotron", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 2, 16, 0, 0, 1, E, 1, E, true, true);
//Advanced Mixer
- public static final GTPP_Recipe_Map sAdvancedMixerRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(1000), "gt.recipe.advanced.mixer",
+ public static final GTPP_Recipe_Map_Internal sAdvancedMixerRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(1000), "gt.recipe.advanced.mixer",
"Advanced Material Combiner", null, "gregtech:textures/gui/basicmachines/MixerAdvanced", 4, 4, 1, 0, 2, "", 1, "", true, true);
//Mini Fusion
- public static final GTPP_Recipe_Map sSlowFusionRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.slowfusionreactor",
+ public static final GTPP_Recipe_Map_Internal sSlowFusionRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gt.recipe.slowfusionreactor",
"Mimir - Slow Fusion", null, "gregtech:textures/gui/basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1,
" EU", true, true);
@@ -329,20 +371,20 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet<GT_Recipe>(300), "gt.recipe.componentassembler", "Component Assembler", null, RES_PATH_GUI + "basicmachines/Assembler", 6, 1, 1, 0, 1, E, 1, E, true, true);
//Special Maps for Multis
- public static final GTPP_Recipe_Map sFishPondRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(3), "gt.recipe.fishpond", "Zhuhai - Fishing Port", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 1, 0, 0, 1, "Requires Circuit: ", 1, ".", true, true);
- public static final Gregtech_Recipe_Map sMultiblockCentrifugeRecipes = new GT_Recipe_Map_LargeCentrifuge();
- public static final Gregtech_Recipe_Map sMultiblockElectrolyzerRecipes = new GT_Recipe_Map_LargeElectrolyzer();
- public static final Gregtech_Recipe_Map sAdvFreezerRecipes = new GT_Recipe_Map_AdvancedVacuumFreezer();
- public static final GTPP_Recipe_Map sAdvFreezerRecipes_GT = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(2000), "gt.recipe.temp", "temp", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
- public static final GTPP_Recipe_Map sMultiblockCentrifugeRecipes_GT = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(2000), "gt.recipe.temp2", "temp2", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
- public static final GTPP_Recipe_Map sMultiblockElectrolyzerRecipes_GT = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(2000), "gt.recipe.temp3", "temp3", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
- public static final GTPP_Recipe_Map sChemicalPlant_GT = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(2000), "gt.recipe.temp4", "temp4", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
+ public static final GTPP_Recipe_Map_Internal sFishPondRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gt.recipe.fishpond", "Zhuhai - Fishing Port", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 1, 0, 0, 1, "Requires Circuit: ", 1, ".", true, true);
+ public static final GTPP_Recipe_Map sMultiblockCentrifugeRecipes = new GT_Recipe_Map_LargeCentrifuge();
+ public static final GTPP_Recipe_Map sMultiblockElectrolyzerRecipes = new GT_Recipe_Map_LargeElectrolyzer();
+ public static final GTPP_Recipe_Map sAdvFreezerRecipes = new GT_Recipe_Map_AdvancedVacuumFreezer();
+ public static final GTPP_Recipe_Map_Internal sAdvFreezerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.temp", "temp", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
+ public static final GTPP_Recipe_Map_Internal sMultiblockCentrifugeRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.temp2", "temp2", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
+ public static final GTPP_Recipe_Map_Internal sMultiblockElectrolyzerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.temp3", "temp3", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
+ public static final GTPP_Recipe_Map_Internal sChemicalPlant_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.temp4", "temp4", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 0, 0, 0, 0, "", 0, "", false, false);
//Semi-Fluid Fuel Map
public static final GT_Recipe_Map_Fuel sSemiFluidLiquidFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.semifluidgeneratorfuels", "Semifluid Generator Fuels", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);
// Flotation Cell
- public static final GTPP_Recipe_Map sFlotationCellRecipes = new GTPP_Recipe_Map(new HashSet<GT_Recipe>(10000), "gt.recipe.flotationcell", "Flotation Cell", null, RES_PATH_GUI + "basicmachines/LFTR", 6, 4, 1, 1, 1, "Ore Key: ", 1, E, true, false);
+ public static final GTPP_Recipe_Map_Internal sFlotationCellRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gt.recipe.flotationcell", "Flotation Cell", null, RES_PATH_GUI + "basicmachines/LFTR", 6, 4, 1, 1, 1, "Ore Key: ", 1, E, true, false);
@@ -350,15 +392,15 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
/**
* HashMap of Recipes based on their Items
*/
- public final Map<GT_ItemStack, Collection<Recipe_GT>> mRecipeItemMap = new HashMap<>();
+ public final Map<GT_ItemStack, Collection<GTPP_Recipe>> mRecipeItemMap = new HashMap<>();
/**
* HashMap of Recipes based on their Fluids
*/
- public final Map<Fluid, Collection<Recipe_GT>> mRecipeFluidMap = new HashMap<>();
+ public final Map<Fluid, Collection<GTPP_Recipe>> mRecipeFluidMap = new HashMap<>();
/**
* The List of all Recipes
*/
- public final Collection<Recipe_GT> mRecipeList;
+ public final Collection<GTPP_Recipe> mRecipeList;
/**
* String used as an unlocalised Name.
*/
@@ -389,7 +431,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
* @param aNEISpecialValuePost the String after the Special Value. Usually for a Unit or something.
* @param aNEIAllowed if NEI is allowed to display this Recipe Handler in general.
*/
- public Gregtech_Recipe_Map(final Collection<Recipe_GT> aRecipeList,
+ public GTPP_Recipe_Map(final Collection<GTPP_Recipe> aRecipeList,
final String aUnlocalizedName, final String aLocalName, final String aNEIName,
final String aNEIGUIPath, final int aUsualInputCount,
final int aUsualOutputCount, final int aMinimalInputItems,
@@ -416,20 +458,20 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
GT_LanguageManager.addStringLocalization(this.mUnlocalizedName = aUnlocalizedName, aLocalName);
}
- public Recipe_GT addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new Recipe_GT(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
- public Recipe_GT addRecipe(final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new Recipe_GT(false, null, null, null, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue), false, false, false);
+ public GTPP_Recipe addRecipe(final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(false, null, null, null, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue), false, false, false);
}
- public Recipe_GT addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new Recipe_GT(aOptimize, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(aOptimize, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
- public Recipe_GT addRecipe(final boolean aOptimize, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addRecipe(new Recipe_GT(aOptimize, null, null, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addRecipe(new GTPP_Recipe(aOptimize, null, null, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
/*public GregtechRecipe addRecipe(boolean aOptimize, FluidStack aInput1, FluidStack aOutput1, ItemStack[] bInput1, ItemStack[] bOutput1, int aDuration, int aEUt, int aSpecialValue) {
@@ -437,12 +479,12 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}*/
- public Recipe_GT addRecipe(final Recipe_GT aRecipe) {
+ public GTPP_Recipe addRecipe(final GTPP_Recipe aRecipe) {
Logger.WARNING("Adding Recipe Method 1");
return this.addRecipe(aRecipe, true, false, false);
}
- protected Recipe_GT addRecipe(final Recipe_GT aRecipe, final boolean aCheckForCollisions, final boolean aFakeRecipe, final boolean aHidden) {
+ protected GTPP_Recipe addRecipe(final GTPP_Recipe aRecipe, final boolean aCheckForCollisions, final boolean aFakeRecipe, final boolean aHidden) {
Logger.WARNING("Adding Recipe Method 2 - This Checks if hidden, fake or if duplicate recipes exists, I think.");
aRecipe.mHidden = aHidden;
aRecipe.mFakeRecipe = aFakeRecipe;
@@ -465,31 +507,31 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
/**
* Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
*/
- public Recipe_GT addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addFakeRecipe(aCheckForCollisions, new Recipe_GT(false, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addFakeRecipe(aCheckForCollisions, new GTPP_Recipe(false, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
/**
* Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
*/
- public Recipe_GT addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
- return this.addFakeRecipe(aCheckForCollisions, new Recipe_GT(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ return this.addFakeRecipe(aCheckForCollisions, new GTPP_Recipe(false, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
}
/**
* Only used for fake Recipe Handlers to show something in NEI, do not use this for adding actual Recipes! findRecipe wont find fake Recipes, containsInput WILL find fake Recipes
*/
- public Recipe_GT addFakeRecipe(final boolean aCheckForCollisions, final Recipe_GT aRecipe) {
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final GTPP_Recipe aRecipe) {
return this.addRecipe(aRecipe, aCheckForCollisions, true, false);
}
- public Recipe_GT add(final Recipe_GT aRecipe) {
+ public GTPP_Recipe add(final GTPP_Recipe aRecipe) {
Logger.WARNING("Adding Recipe Method 3");
this.mRecipeList.add(aRecipe);
for (final FluidStack aFluid : aRecipe.mFluidInputs) {
if (aFluid != null) {
Logger.WARNING("Fluid is valid - getting some kind of fluid instance to add to the recipe hashmap.");
- Collection<Recipe_GT> tList = this.mRecipeFluidMap.get(aFluid.getFluid());
+ Collection<GTPP_Recipe> tList = this.mRecipeFluidMap.get(aFluid.getFluid());
if (tList == null) {
this.mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet<>(1));
}
@@ -500,11 +542,11 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
public void reInit() {
- final Map<GT_ItemStack, Collection<Recipe_GT>> tMap = this.mRecipeItemMap;
+ final Map<GT_ItemStack, Collection<GTPP_Recipe>> tMap = this.mRecipeItemMap;
if (tMap != null) {
tMap.clear();
}
- for (final Recipe_GT tRecipe : this.mRecipeList) {
+ for (final GTPP_Recipe tRecipe : this.mRecipeList) {
GT_OreDictUnificator.setStackArray(true, tRecipe.mInputs);
GT_OreDictUnificator.setStackArray(true, tRecipe.mOutputs);
if (tMap != null) {
@@ -534,11 +576,11 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
return (aFluid != null) && this.mRecipeFluidMap.containsKey(aFluid);
}
- public Recipe_GT findRecipe(final IHasWorldObjectAndCoords aTileEntity, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
+ public GTPP_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, null, aInputs);
}
- public Recipe_GT findRecipe(final IHasWorldObjectAndCoords aTileEntity, final Recipe_GT aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
+ public GTPP_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GTPP_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack... aInputs) {
return this.findRecipe(aTileEntity, aRecipe, aNotUnificated, aVoltage, aFluids, null, aInputs);
}
@@ -554,7 +596,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
* @param aInputs the Item Inputs
* @return the Recipe it has found or null for no matching Recipe
*/
- public Recipe_GT findRecipe(final IHasWorldObjectAndCoords aTileEntity, final Recipe_GT aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) {
+ public GTPP_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GTPP_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) {
// No Recipes? Well, nothing to be found then.
if (this.mRecipeList.isEmpty()) {
return null;
@@ -609,10 +651,10 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
if ((this.mUsualInputCount > 0) && (aInputs != null)) {
for (final ItemStack tStack : aInputs) {
if (tStack != null) {
- Collection<Recipe_GT>
+ Collection<GTPP_Recipe>
tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(tStack));
if (tRecipes != null) {
- for (final Recipe_GT tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
}
@@ -620,7 +662,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack)));
if (tRecipes != null) {
- for (final Recipe_GT tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
}
@@ -634,10 +676,10 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
if ((this.mMinimalInputItems == 0) && (aFluids != null)) {
for (final FluidStack aFluid : aFluids) {
if (aFluid != null) {
- final Collection<Recipe_GT>
+ final Collection<GTPP_Recipe>
tRecipes = this.mRecipeFluidMap.get(aFluid.getFluid());
if (tRecipes != null) {
- for (final Recipe_GT tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
}
@@ -651,14 +693,14 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
return null;
}
- protected Recipe_GT addToItemMap(final Recipe_GT aRecipe) {
+ protected GTPP_Recipe addToItemMap(final GTPP_Recipe aRecipe) {
Logger.WARNING("Adding Recipe Method 4");
for (final ItemStack aStack : aRecipe.mInputs) {
if (aStack != null) {
Logger.WARNING("Method 4 - Manipulating "+aStack.getDisplayName());
final GT_ItemStack tStack = new GT_ItemStack(aStack);
Logger.WARNING("Method 4 - Made gt stack of item "+tStack.toStack().getDisplayName());
- Collection<Recipe_GT> tList = this.mRecipeItemMap.get(tStack);
+ Collection<GTPP_Recipe> tList = this.mRecipeItemMap.get(tStack);
if (tList != null){
Logger.WARNING("Method 4 - Gt Recipe Hashmap: "+tList.toString());
}
@@ -679,7 +721,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
return aRecipe;
}
- public Recipe_GT findRecipe(final IGregTechTileEntity baseMetaTileEntity, final Recipe_GT aRecipe, final boolean aNotUnificated,
+ public GTPP_Recipe findRecipe(final IGregTechTileEntity baseMetaTileEntity, final GTPP_Recipe aRecipe, final boolean aNotUnificated,
final long aVoltage, final FluidStack[] aFluids, final FluidStack[] fluidStacks) {
ItemStack aInputs[] = null;
@@ -737,10 +779,10 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
if ((this.mUsualInputCount > 0) && (aInputs != null)) {
for (final ItemStack tStack : aInputs) {
if (tStack != null) {
- Collection<Recipe_GT>
+ Collection<GTPP_Recipe>
tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(tStack));
if (tRecipes != null) {
- for (final Recipe_GT tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
}
@@ -748,7 +790,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack)));
if (tRecipes != null) {
- for (final Recipe_GT tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
}
@@ -762,10 +804,10 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
if ((this.mMinimalInputItems == 0) && (aFluids != null)) {
for (final FluidStack aFluid : aFluids) {
if (aFluid != null) {
- final Collection<Recipe_GT>
+ final Collection<GTPP_Recipe>
tRecipes = this.mRecipeFluidMap.get(aFluid.getFluid());
if (tRecipes != null) {
- for (final Recipe_GT tRecipe : tRecipes) {
+ for (final GTPP_Recipe tRecipe : tRecipes) {
if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
}
@@ -787,8 +829,8 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
/**
* Abstract Class for general Recipe Handling of non GT Recipes
*/
- public static abstract class GT_Recipe_Map_NonGTRecipes extends Gregtech_Recipe_Map {
- public GT_Recipe_Map_NonGTRecipes(final Collection<Recipe_GT> aRecipeList, final String aUnlocalizedName, final String aLocalName, final String aNEIName, final String aNEIGUIPath, final int aUsualInputCount, final int aUsualOutputCount, final int aMinimalInputItems, final int aMinimalInputFluids, final int aAmperage, final String aNEISpecialValuePre, final int aNEISpecialValueMultiplier, final String aNEISpecialValuePost, final boolean aShowVoltageAmperageInNEI, final boolean aNEIAllowed) {
+ public static abstract class GT_Recipe_Map_NonGTRecipes extends GTPP_Recipe_Map {
+ public GT_Recipe_Map_NonGTRecipes(final Collection<GTPP_Recipe> aRecipeList, final String aUnlocalizedName, final String aLocalName, final String aNEIName, final String aNEIGUIPath, final int aUsualInputCount, final int aUsualOutputCount, final int aMinimalInputItems, final int aMinimalInputFluids, final int aAmperage, final String aNEISpecialValuePre, final int aNEISpecialValueMultiplier, final String aNEISpecialValuePost, final boolean aShowVoltageAmperageInNEI, final boolean aNEIAllowed) {
super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
}
@@ -808,37 +850,37 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
@Override
- public Recipe_GT addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
return null;
}
@Override
- public Recipe_GT addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ public GTPP_Recipe addRecipe(final boolean aOptimize, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
return null;
}
@Override
- public Recipe_GT addRecipe(final Recipe_GT aRecipe) {
+ public GTPP_Recipe addRecipe(final GTPP_Recipe aRecipe) {
return null;
}
@Override
- public Recipe_GT addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final int[] aOutputChances, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
return null;
}
@Override
- public Recipe_GT addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final ItemStack[] aInputs, final ItemStack[] aOutputs, final Object aSpecial, final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
return null;
}
@Override
- public Recipe_GT addFakeRecipe(final boolean aCheckForCollisions, final Recipe_GT aRecipe) {
+ public GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final GTPP_Recipe aRecipe) {
return null;
}
@Override
- public Recipe_GT add(final Recipe_GT aRecipe) {
+ public GTPP_Recipe add(final GTPP_Recipe aRecipe) {
return null;
}
@@ -846,7 +888,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
public void reInit() {/**/}
@Override
- protected Recipe_GT addToItemMap(final Recipe_GT aRecipe) {
+ protected GTPP_Recipe addToItemMap(final GTPP_Recipe aRecipe) {
return null;
}
}
@@ -854,51 +896,51 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
/**
* Just a Recipe Map with Utility specifically for Fuels.
*/
- public static class Gregtech_Recipe_Map_Fuel extends Gregtech_Recipe_Map {
- public Gregtech_Recipe_Map_Fuel(final Collection<Recipe_GT> aRecipeList, final String aUnlocalizedName, final String aLocalName, final String aNEIName, final String aNEIGUIPath, final int aUsualInputCount, final int aUsualOutputCount, final int aMinimalInputItems, final int aMinimalInputFluids, final int aAmperage, final String aNEISpecialValuePre, final int aNEISpecialValueMultiplier, final String aNEISpecialValuePost, final boolean aShowVoltageAmperageInNEI, final boolean aNEIAllowed) {
+ public static class Gregtech_Recipe_Map_Fuel extends GTPP_Recipe_Map {
+ public Gregtech_Recipe_Map_Fuel(final Collection<GTPP_Recipe> aRecipeList, final String aUnlocalizedName, final String aLocalName, final String aNEIName, final String aNEIGUIPath, final int aUsualInputCount, final int aUsualOutputCount, final int aMinimalInputItems, final int aMinimalInputFluids, final int aAmperage, final String aNEISpecialValuePre, final int aNEISpecialValueMultiplier, final String aNEISpecialValuePost, final boolean aShowVoltageAmperageInNEI, final boolean aNEIAllowed) {
super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
}
- public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final int aFuelValueInEU) {
+ public GTPP_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final int aFuelValueInEU) {
Logger.WARNING("Adding Fuel using method 1");
return this.addFuel(aInput, aOutput, null, null, 10000, aFuelValueInEU);
}
- public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final int aChance, final int aFuelValueInEU) {
+ public GTPP_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final int aChance, final int aFuelValueInEU) {
Logger.WARNING("Adding Fuel using method 2");
return this.addFuel(aInput, aOutput, null, null, aChance, aFuelValueInEU);
}
- public Recipe_GT addFuel(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) {
+ public GTPP_Recipe addFuel(final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) {
Logger.WARNING("Adding Fuel using method 3");
return this.addFuel(null, null, aFluidInput, aFluidOutput, 10000, aFuelValueInEU);
}
- public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) {
+ public GTPP_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aFuelValueInEU) {
Logger.WARNING("Adding Fuel using method 4");
return this.addFuel(aInput, aOutput, aFluidInput, aFluidOutput, 10000, aFuelValueInEU);
}
- public Recipe_GT addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aChance, final int aFuelValueInEU) {
+ public GTPP_Recipe addFuel(final ItemStack aInput, final ItemStack aOutput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final int aChance, final int aFuelValueInEU) {
Logger.WARNING("Adding Fuel using method 5");
return this.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, 0, 0, aFuelValueInEU);
}
}
- public static class GT_Recipe_Map_LargeCentrifuge extends Gregtech_Recipe_Map {
+ public static class GT_Recipe_Map_LargeCentrifuge extends GTPP_Recipe_Map {
private static int INPUT_COUNT;
private static int OUTPUT_COUNT;
private static int FLUID_INPUT_COUNT;
private static int FLUID_OUTPUT_COUNT;
public GT_Recipe_Map_LargeCentrifuge() {
- super(new HashSet<Recipe_GT>(2000), "gt.recipe.largecentrifuge", "Large Centrifuge", null,
+ super(new HashSet<GTPP_Recipe>(2000), "gt.recipe.largecentrifuge", "Large Centrifuge", null,
RES_PATH_GUI + "basicmachines/FissionFuel", GT_Recipe_Map_LargeCentrifuge.INPUT_COUNT,
GT_Recipe_Map_LargeCentrifuge.OUTPUT_COUNT, 0, 0, 1, "", 1, "", true, true);
}
@Override
- public Recipe_GT addRecipe(final boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs,
+ public GTPP_Recipe addRecipe(final boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs,
final Object aSpecial, final int[] aOutputChances, FluidStack[] aFluidInputs,
FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
final ArrayList<ItemStack> adjustedInputs = new ArrayList<ItemStack>();
@@ -972,7 +1014,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]);
aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]);
- Recipe_GT mNew = new GT_Recipe_LargeCentrifuge(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
+ GTPP_Recipe mNew = new GT_Recipe_LargeCentrifuge(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) {
return this.addRecipe(mNew);
}
@@ -988,7 +1030,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
GT_Recipe_Map_LargeCentrifuge.FLUID_OUTPUT_COUNT = 4;
}
- private static class GT_Recipe_LargeCentrifuge extends Recipe_GT {
+ private static class GT_Recipe_LargeCentrifuge extends GTPP_Recipe {
protected GT_Recipe_LargeCentrifuge(final boolean aOptimize, final ItemStack[] aInputs,
final ItemStack[] aOutputs, final Object aSpecialItems, final int[] aChances,
final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration,
@@ -1050,20 +1092,20 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
}
- public static class GT_Recipe_Map_LargeElectrolyzer extends Gregtech_Recipe_Map {
+ public static class GT_Recipe_Map_LargeElectrolyzer extends GTPP_Recipe_Map {
private static int INPUT_COUNT;
private static int OUTPUT_COUNT;
private static int FLUID_INPUT_COUNT;
private static int FLUID_OUTPUT_COUNT;
public GT_Recipe_Map_LargeElectrolyzer() {
- super(new HashSet<Recipe_GT>(2000), "gt.recipe.largeelectrolyzer", "Large Electrolyzer", null,
+ super(new HashSet<GTPP_Recipe>(2000), "gt.recipe.largeelectrolyzer", "Large Electrolyzer", null,
RES_PATH_GUI + "basicmachines/FissionFuel", GT_Recipe_Map_LargeElectrolyzer.INPUT_COUNT,
GT_Recipe_Map_LargeElectrolyzer.OUTPUT_COUNT, 0, 0, 1, "", 1, "", true, true);
}
@Override
- public Recipe_GT addRecipe(final boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs,
+ public GTPP_Recipe addRecipe(final boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs,
final Object aSpecial, final int[] aOutputChances, FluidStack[] aFluidInputs,
FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
final ArrayList<ItemStack> adjustedInputs = new ArrayList<ItemStack>();
@@ -1137,7 +1179,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]);
aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]);
- Recipe_GT mNew = new GT_Recipe_LargeElectrolyzer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
+ GTPP_Recipe mNew = new GT_Recipe_LargeElectrolyzer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) {
return this.addRecipe(mNew);
}
@@ -1153,7 +1195,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
GT_Recipe_Map_LargeElectrolyzer.FLUID_OUTPUT_COUNT = 4;
}
- private static class GT_Recipe_LargeElectrolyzer extends Recipe_GT {
+ private static class GT_Recipe_LargeElectrolyzer extends GTPP_Recipe {
protected GT_Recipe_LargeElectrolyzer(final boolean aOptimize, final ItemStack[] aInputs,
final ItemStack[] aOutputs, final Object aSpecialItems, final int[] aChances,
final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration,
@@ -1217,20 +1259,20 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
}
}
- public static class GT_Recipe_Map_AdvancedVacuumFreezer extends Gregtech_Recipe_Map {
+ public static class GT_Recipe_Map_AdvancedVacuumFreezer extends GTPP_Recipe_Map {
private static int INPUT_COUNT;
private static int OUTPUT_COUNT;
private static int FLUID_INPUT_COUNT;
private static int FLUID_OUTPUT_COUNT;
public GT_Recipe_Map_AdvancedVacuumFreezer() {
- super(new HashSet<Recipe_GT>(2000), "gt.recipe.advfreezer", "Adv. Cryogenic Freezer", null,
+ super(new HashSet<GTPP_Recipe>(2000), "gt.recipe.advfreezer", "Adv. Cryogenic Freezer", null,
RES_PATH_GUI + "basicmachines/FissionFuel", GT_Recipe_Map_AdvancedVacuumFreezer.INPUT_COUNT,
GT_Recipe_Map_AdvancedVacuumFreezer.OUTPUT_COUNT, 0, 0, 1, "", 1, "", true, true);
}
@Override
- public Recipe_GT addRecipe(final boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs,
+ public GTPP_Recipe addRecipe(final boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs,
final Object aSpecial, final int[] aOutputChances, FluidStack[] aFluidInputs,
FluidStack[] aFluidOutputs, final int aDuration, final int aEUt, final int aSpecialValue) {
final ArrayList<ItemStack> adjustedInputs = new ArrayList<ItemStack>();
@@ -1305,7 +1347,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]);
aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]);
- Recipe_GT mNew = new GT_Recipe_AdvFreezer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
+ GTPP_Recipe mNew = new GT_Recipe_AdvFreezer(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
if (RecipeUtils.doesGregtechRecipeHaveEqualCells(mNew)) {
return this.addRecipe(mNew);
}
@@ -1321,7 +1363,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
GT_Recipe_Map_AdvancedVacuumFreezer.FLUID_OUTPUT_COUNT = 4;
}
- private static class GT_Recipe_AdvFreezer extends Recipe_GT {
+ private static class GT_Recipe_AdvFreezer extends GTPP_Recipe {
protected GT_Recipe_AdvFreezer(final boolean aOptimize, final ItemStack[] aInputs,
final ItemStack[] aOutputs, final Object aSpecialItems, final int[] aChances,
final FluidStack[] aFluidInputs, final FluidStack[] aFluidOutputs, final int aDuration,
@@ -1380,7 +1422,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
return null;
}
- public int compareTo(Recipe_GT recipe) {
+ public int compareTo(GTPP_Recipe recipe) {
// first lowest tier recipes
// then fastest
// then with lowest special value
diff --git a/src/Java/gregtech/api/util/HotFuel.java b/src/Java/gregtech/api/util/HotFuel.java
index 746ff68382..c9a6dcf7c5 100644
--- a/src/Java/gregtech/api/util/HotFuel.java
+++ b/src/Java/gregtech/api/util/HotFuel.java
@@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidStack;
public class HotFuel {
public static void addNewHotFuel(FluidStack aInput1, FluidStack aOutput1, ItemStack[] outputItems, int[] chances, int aSpecialValue) {
- GT_Recipe x = new GT_Recipe(
+ GTPP_Recipe x = new GTPP_Recipe(
true,
null,
outputItems,
@@ -19,7 +19,7 @@ public class HotFuel {
0, //No Eu produced
aSpecialValue //Magic Number
);
- Recipe_GT.Gregtech_Recipe_Map.sThermalFuels.addRecipe(x);
+ GTPP_Recipe.GTPP_Recipe_Map.sThermalFuels.addRecipe(x);
}
diff --git a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java
index 7f241b1178..8b79705fe6 100644
--- a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java
+++ b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java
@@ -139,7 +139,7 @@ public class MultiblockRecipeMapHandler{
final Collection<GT_Recipe> x = r.mRecipeList;
for (final GT_Recipe newBo : x) {
int duration = MathUtils.findPercentageOfInt(newBo.mDuration, 80);
- if (newMap.addRecipe(new GT_Recipe(true, newBo.mInputs, newBo.mOutputs, newBo.mSpecialItems, newBo.mChances, newBo.mFluidInputs, newBo.mFluidOutputs, duration, newBo.mEUt, newBo.mSpecialValue), false, true, true) != null){
+ if (newMap.addRecipe(new GTPP_Recipe(true, newBo.mInputs, newBo.mOutputs, newBo.mSpecialItems, newBo.mChances, newBo.mFluidInputs, newBo.mFluidOutputs, duration, newBo.mEUt, newBo.mSpecialValue), false, true, true) != null){
Logger.INFO("Successfully added a simple recipe to the "+newMap.mNEIName+" map.");
}
else {
@@ -181,7 +181,7 @@ public class MultiblockRecipeMapHandler{
}
}
}
- if (newMap.addRecipe(new GT_Recipe(true, mInputs, mOutputs, newBo.mSpecialItems, outputChances, mFluidInputs, mFluidOutputs, duration, newBo.mEUt, newBo.mSpecialValue), false, true, true) != null){
+ if (newMap.addRecipe(new GTPP_Recipe(true, mInputs, mOutputs, newBo.mSpecialItems, outputChances, mFluidInputs, mFluidOutputs, duration, newBo.mEUt, newBo.mSpecialValue), false, true, true) != null){
Logger.INFO("Successfully added a recipe to the "+newMap.mNEIName+" map.");
}
else {
diff --git a/src/Java/gregtech/api/util/SemiFluidFuelHandler.java b/src/Java/gregtech/api/util/SemiFluidFuelHandler.java
index c5b1065831..fa01ea9b5d 100644
--- a/src/Java/gregtech/api/util/SemiFluidFuelHandler.java
+++ b/src/Java/gregtech/api/util/SemiFluidFuelHandler.java
@@ -1,6 +1,6 @@
package gregtech.api.util;
-import static gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map.sSemiFluidLiquidFuels;
+import static gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map.sSemiFluidLiquidFuels;
import java.util.HashMap;
@@ -29,7 +29,7 @@ public class SemiFluidFuelHandler {
FluidStack p = aFuel;
if (p != null && aFuelValue > 0) {
GT_Recipe aRecipe =
- new Recipe_GT(true,
+ new GTPP_Recipe(true,
new ItemStack[] {},
new ItemStack[] {},
null,
@@ -100,7 +100,7 @@ public class SemiFluidFuelHandler {
}
if (aFuelValue <= (128*3)) {
- GT_Recipe aRecipe = new Recipe_GT(true, new ItemStack[] {}, new ItemStack[] {}, null, new int[] {},
+ GT_Recipe aRecipe = new GTPP_Recipe(true, new ItemStack[] {}, new ItemStack[] {}, null, new int[] {},
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.");
diff --git a/src/Java/gregtech/api/util/ThermalFuel.java b/src/Java/gregtech/api/util/ThermalFuel.java
index 4f6637e13f..d7b732ce5d 100644
--- a/src/Java/gregtech/api/util/ThermalFuel.java
+++ b/src/Java/gregtech/api/util/ThermalFuel.java
@@ -6,7 +6,7 @@ import net.minecraftforge.fluids.FluidStack;
public class ThermalFuel {
public static void addThermalFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int euValue, int aSpecialValue) {
- GT_Recipe x = new GT_Recipe(
+ GTPP_Recipe x = new GTPP_Recipe(
true,
null,
null,
@@ -18,11 +18,11 @@ public class ThermalFuel {
euValue, //No Eu produced
aSpecialValue //Magic Number
);
- Recipe_GT.Gregtech_Recipe_Map.sGeoThermalFuels.addRecipe(x);
+ GTPP_Recipe.GTPP_Recipe_Map.sGeoThermalFuels.addRecipe(x);
}
public static void addSteamTurbineFuel(FluidStack aInput1) {
- GT_Recipe x = new GT_Recipe(
+ GTPP_Recipe x = new GTPP_Recipe(
true,
null,
null,
@@ -34,7 +34,7 @@ public class ThermalFuel {
MathUtils.findPercentageOfInt((aInput1.amount/2), 95), //No Eu produced
0 //Magic Number
);
- Recipe_GT.Gregtech_Recipe_Map.sSteamTurbineFuels.addRecipe(x);
+ GTPP_Recipe.GTPP_Recipe_Map.sSteamTurbineFuels.addRecipe(x);
}
generated by cgit (git 2.46.0) at 2025-03-09 17:21:28 +0000