aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gregtech')
-rw-r--r--src/Java/gregtech/api/util/CustomRecipeMap.java349
-rw-r--r--src/Java/gregtech/api/util/GTPP_Recipe.java525
-rw-r--r--src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java195
3 files changed, 6 insertions, 1063 deletions
diff --git a/src/Java/gregtech/api/util/CustomRecipeMap.java b/src/Java/gregtech/api/util/CustomRecipeMap.java
deleted file mode 100644
index dd137aa527..0000000000
--- a/src/Java/gregtech/api/util/CustomRecipeMap.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package gregtech.api.util;
-
-import static gregtech.api.enums.GT_Values.*;
-
-import java.util.*;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
-import gregtech.api.objects.GT_ItemStack;
-
-import gtPlusPlus.api.objects.Logger;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-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 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<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<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<GTPP_Recipe>> mRecipeItemMap = new HashMap<>();
- /**
- * HashMap of Recipes based on their Fluids
- */
- public final Map<Fluid, Collection<GTPP_Recipe>> mRecipeFluidMap = new HashMap<>();
- /**
- * The List of all Recipes
- */
- public final Collection<GTPP_Recipe> mRecipeList;
- /**
- * String used as an unlocalised Name.
- */
- public final String mUnlocalizedName;
- /**
- * String used in NEI for the Recipe Lists. If null it will use the unlocalised Name instead
- */
- public final String mNEIName;
- /**
- * GUI used for NEI Display. Usually the GUI of the Machine itself
- */
- public final String mNEIGUIPath;
- public final String mNEISpecialValuePre, mNEISpecialValuePost;
- public final int mUsualInputCount, mUsualOutputCount, mNEISpecialValueMultiplier, mMinimalInputItems, mMinimalInputFluids, mAmperage;
- public final boolean mNEIAllowed, mShowVoltageAmperageInNEI;
-
- /**
- * Initialises a new type of Recipe Handler.
- *
- * @param aRecipeList a List you specify as Recipe List. Usually just an ArrayList with a pre-initialised Size.
- * @param aUnlocalizedName the unlocalised Name of this Recipe Handler, used mainly for NEI.
- * @param aLocalName the displayed Name inside the NEI Recipe GUI.
- * @param aNEIGUIPath the displayed GUI Texture, usually just a Machine GUI. Auto-Attaches ".png" if forgotten.
- * @param aUsualInputCount the usual amount of Input Slots this Recipe Class has.
- * @param aUsualOutputCount the usual amount of Output Slots this Recipe Class has.
- * @param aNEISpecialValuePre the String in front of the Special Value in NEI.
- * @param aNEISpecialValueMultiplier the Value the Special Value is getting Multiplied with before displaying
- * @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<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;
- this.mShowVoltageAmperageInNEI = aShowVoltageAmperageInNEI;
- this.mRecipeList = aRecipeList;
- this.mNEIName = aNEIName == null ? aUnlocalizedName : aNEIName;
- this.mNEIGUIPath = aNEIGUIPath.endsWith(".png") ? aNEIGUIPath : aNEIGUIPath + ".png";
- this.mNEISpecialValuePre = aNEISpecialValuePre;
- this.mNEISpecialValueMultiplier = aNEISpecialValueMultiplier;
- this.mNEISpecialValuePost = aNEISpecialValuePost;
- this.mAmperage = aAmperage;
- this.mUsualInputCount = aUsualInputCount;
- this.mUsualOutputCount = aUsualOutputCount;
- this.mMinimalInputItems = aMinimalInputItems;
- this.mMinimalInputFluids = aMinimalInputFluids;
- GregTech_API.sFluidMappings.add(this.mRecipeFluidMap);
- GregTech_API.sItemStackMappings.add(this.mRecipeItemMap);
- GT_LanguageManager.addStringLocalization(this.mUnlocalizedName = aUnlocalizedName, aLocalName);
- }
-
- 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 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 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 GTPP_Recipe addRecipe(final GTPP_Recipe aRecipe) {
- return this.addRecipe(aRecipe, true, false, false);
- }
-
- 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)) {
- return null;
- }
- if (aCheckForCollisions && (this.findRecipe(null, false, Long.MAX_VALUE, aRecipe.mFluidInputs, aRecipe.mInputs) != null)) {
- return null;
- }
- return this.add(aRecipe);
- }
-
- /**
- * 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 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 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 GTPP_Recipe addFakeRecipe(final boolean aCheckForCollisions, final GTPP_Recipe aRecipe) {
- return this.addRecipe(aRecipe, aCheckForCollisions, true, false);
- }
-
- public GTPP_Recipe add(final GTPP_Recipe aRecipe) {
- this.mRecipeList.add(aRecipe);
- for (final FluidStack aFluid : aRecipe.mFluidInputs) {
- if (aFluid != null) {
- Collection<GTPP_Recipe> tList = this.mRecipeFluidMap.get(aFluid.getFluid());
- if (tList == null) {
- this.mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet<>(1));
- }
- tList.add(aRecipe);
- }
- }
- return this.addToItemMap(aRecipe);
- }
-
- public void reInit() {
- final Map<GT_ItemStack, Collection<GTPP_Recipe>> tMap = this.mRecipeItemMap;
- if (tMap != null) {
- tMap.clear();
- }
- for (final GTPP_Recipe tRecipe : this.mRecipeList) {
- GT_OreDictUnificator.setStackArray(true, tRecipe.mInputs);
- GT_OreDictUnificator.setStackArray(true, tRecipe.mOutputs);
- if (tMap != null) {
- this.addToItemMap(tRecipe);
- }
- }
- }
-
- /**
- * @return if this Item is a valid Input for any for the Recipes
- */
- public boolean containsInput(final ItemStack aStack) {
- return (aStack != null) && (this.mRecipeItemMap.containsKey(new GT_ItemStack(aStack)) || this.mRecipeItemMap.containsKey(new GT_ItemStack(GT_Utility.copyMetaData(W, aStack))));
- }
-
- /**
- * @return if this Fluid is a valid Input for any for the Recipes
- */
- public boolean containsInput(final FluidStack aFluid) {
- return (aFluid != null) && this.containsInput(aFluid.getFluid());
- }
-
- /**
- * @return if this Fluid is a valid Input for any for the Recipes
- */
- public boolean containsInput(final Fluid aFluid) {
- return (aFluid != null) && this.mRecipeFluidMap.containsKey(aFluid);
- }
-
- 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 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);
- }
-
- /**
- * finds a Recipe matching the aFluid and ItemStack Inputs.
- *
- * @param aTileEntity an Object representing the current coordinates of the executing Block/Entity/Whatever. This may be null, especially during Startup.
- * @param aRecipe in case this is != null it will try to use this Recipe first when looking things up.
- * @param aNotUnificated if this is T the Recipe searcher will unificate the ItemStack Inputs
- * @param aVoltage Voltage of the Machine or Long.MAX_VALUE if it has no Voltage
- * @param aFluids the Fluid Inputs
- * @param aSpecialSlot the content of the Special Slot, the regular Manager doesn't do anything with this, but some custom ones do.
- * @param aInputs the Item Inputs
- * @return the Recipe it has found or null for no matching Recipe
- */
- 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");
- return null;
- }
-
- // Some Recipe Classes require a certain amount of Inputs of certain kinds. Like "at least 1 Fluid + 1 Stack" or "at least 2 Stacks" before they start searching for Recipes.
- // This improves Performance massively, especially if people leave things like Circuits, Molds or Shapes in their Machines to select Sub Recipes.
- if (GregTech_API.sPostloadFinished) {
- if (this.mMinimalInputFluids > 0) {
- if (aFluids == null) {
- Logger.WARNING("BAD RECIPE [1]");
- return null;
- }
- int tAmount = 0;
- for (final FluidStack aFluid : aFluids) {
- if (aFluid != null) {
- tAmount++;
- }
- }
- if (tAmount < this.mMinimalInputFluids) {
- Logger.WARNING("BAD RECIPE [2]");
- return null;
- }
- }
- if (this.mMinimalInputItems > 0) {
- if (aInputs == null) {
- Logger.WARNING("BAD RECIPE [3]");
- return null;
- }
- int tAmount = 0;
- for (final ItemStack aInput : aInputs) {
- if (aInput != null) {
- tAmount++;
- }
- }
- if (tAmount < this.mMinimalInputItems) {
- Logger.WARNING("BAD RECIPE [4]");
- return null;
- }
- }
- }
-
- // Unification happens here in case the Input isn't already unificated.
- if (aNotUnificated) {
- aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
- }
-
- // Check the Recipe which has been used last time in order to not have to search for it again, if possible.
- if (aRecipe != null) {
- if (!aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered && aRecipe.isRecipeInputEqual(false, true, aFluids, aInputs)) {
- Logger.WARNING("BAD RECIPE [a]");
- return aRecipe.mEnabled && ((aVoltage * this.mAmperage) >= aRecipe.mEUt) ? aRecipe : null;
- }
- }
-
- // Now look for the Recipes inside the Item HashMaps, but only when the Recipes usually have Items.
- if ((this.mUsualInputCount > 0) && (aInputs != null)) {
- Logger.WARNING("BAD RECIPE [b0]");
- for (final ItemStack tStack : aInputs) {
- Logger.WARNING("BAD RECIPE [b1]");
- if (tStack != null) {
- Logger.WARNING("BAD RECIPE [b2] | "+tStack.getDisplayName());
- Collection<GTPP_Recipe>
- tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(tStack));
- if (tRecipes != null) {
- Logger.WARNING("BAD RECIPE [b3]");
- 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]");
- return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
- }
- }
- }
- Logger.WARNING("BAD RECIPE [b6]");
- tRecipes = this.mRecipeItemMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, tStack)));
- if (tRecipes != null) {
- Logger.WARNING("BAD RECIPE [b7]");
- 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]");
- return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
- }
- }
- }
- }
- }
- }
-
- // If the minimal Amount of Items for the Recipe is 0, then it could be a Fluid-Only Recipe, so check that Map too.
- if ((this.mMinimalInputItems == 0) && (aFluids != null && aFluids.length > 0)) {
- Logger.WARNING("BAD RECIPE [c0] "+aFluids.length);
- for (final FluidStack aFluid : aFluids) {
- Logger.WARNING("BAD RECIPE [c1]");
- if (aFluid != null) {
- Logger.WARNING("BAD RECIPE [c2]");
- final Collection<GTPP_Recipe>
- tRecipes = this.mRecipeFluidMap.get(aFluid.getFluid());
- if (tRecipes != null) {
- Logger.WARNING("BAD RECIPE [c3]");
- 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]");
- return tRecipe.mEnabled && ((aVoltage * this.mAmperage) >= tRecipe.mEUt) ? tRecipe : null;
- }
- }
- }
- }
- }
- }
-
- // And nothing has been found.
- Logger.WARNING("BAD RECIPE [5]");
- return null;
- }
-
- 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<GTPP_Recipe> tList = this.mRecipeItemMap.get(tStack);
- if (tList == null) {
- this.mRecipeItemMap.put(tStack, tList = new HashSet<>(1));
- }
- tList.add(aRecipe);
- }
- }
- return aRecipe;
- }
-} \ No newline at end of file
diff --git a/src/Java/gregtech/api/util/GTPP_Recipe.java b/src/Java/gregtech/api/util/GTPP_Recipe.java
index 06e81070de..04f593d797 100644
--- a/src/Java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/Java/gregtech/api/util/GTPP_Recipe.java
@@ -8,23 +8,16 @@ import java.util.*;
import codechicken.nei.PositionedStack;
import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.ItemData;
import gtPlusPlus.api.interfaces.IComparableRecipe;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.minecraft.NoConflictGTRecipeMap;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.nei.GT_NEI_MultiBlockHandler;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
/**
@@ -157,25 +150,6 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
}
}
- 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) {
- GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe(this);
- }
- }
-
- 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,
- final FluidStack aOutput1, final FluidStack aOutput2,
- final int aDuration, final int aEUt) {
- this(true, null, null, null, null, new FluidStack[]{aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9}, new FluidStack[]{aOutput1, aOutput2}, Math.max(aDuration, 1), aEUt, 0);
- if (this.mInputs.length > 1) {
- CustomRecipeMap.sFissionFuelProcessing.addRecipe(this);
- }
- }
-
/*public GregtechRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutput, int aDuration, int aEUt) {
this(true, new ItemStack[]{aInput}, aOutput.clone(), null, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0);
if (mInputs.length > 0 && mOutputs[0] != null) {
@@ -374,8 +348,8 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
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);
-
+ public static final GTPP_Recipe_Map_Internal sFissionFuelProcessing = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gt.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 0, 1, E, 1, E, true, false);
+
//Basic Washer Map
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);
@@ -433,9 +407,9 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
//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.cryogenicfreezer", "Cryogenic Freezer", null, RES_PATH_GUI + "multimachines/LFTR", 0, 0, 0, 0, 0, "", 0, "", false, true);
- public static final GTPP_Recipe_Map_Internal sMultiblockCentrifugeRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.multicentrifuge", "Multiblock Centrifuge", null, RES_PATH_GUI + "multimachines/LFTR", 0, 0, 0, 0, 0, "", 0, "", false, true);
- public static final GTPP_Recipe_Map_Internal sMultiblockElectrolyzerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.multielectro", "Multiblock Electrolyzer", null, RES_PATH_GUI + "multimachines/LFTR", 0, 0, 0, 0, 0, "", 0, "", false, true);
+ public static final GTPP_Recipe_Map_Internal sAdvFreezerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.cryogenicfreezer", "Cryogenic Freezer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true);
+ public static final GTPP_Recipe_Map_Internal sMultiblockCentrifugeRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.multicentrifuge", "Multiblock Centrifuge", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true);
+ public static final GTPP_Recipe_Map_Internal sMultiblockElectrolyzerRecipes_GT = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(2000), "gt.recipe.multielectro", "Multiblock Electrolyzer", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, "", 0, "", false, true);
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
@@ -984,494 +958,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
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 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<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 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>();
- final ArrayList<ItemStack> adjustedOutputs = new ArrayList<ItemStack>();
- final ArrayList<FluidStack> adjustedFluidInputs = new ArrayList<FluidStack>();
- final ArrayList<FluidStack> adjustedFluidOutputs = new ArrayList<FluidStack>();
- if (aInputs == null) {
- aInputs = new ItemStack[0];
- }
- for (final ItemStack input : aInputs) {
- FluidStack inputFluidContent = FluidContainerRegistry.getFluidForFilledItem(input);
- if (inputFluidContent != null) {
- final FluidStack fluidStack = inputFluidContent;
- fluidStack.amount *= input.stackSize;
- if (inputFluidContent.getFluid().getName().equals("ic2steam")) {
- inputFluidContent = GT_ModHandler.getSteam((long) inputFluidContent.amount);
- }
- adjustedFluidInputs.add(inputFluidContent);
- } else {
- final ItemData itemData = GT_OreDictUnificator.getItemData(input);
- if (itemData == null || !itemData.hasValidPrefixMaterialData()
- || itemData.mMaterial.mMaterial != Materials.Empty) {
- if (itemData != null && itemData.hasValidPrefixMaterialData()
- && itemData.mPrefix == OrePrefixes.cell) {
- //final ItemStack dustStack = itemData.mMaterial.mMaterial.getDust(input.stackSize);
- final ItemStack dustStack = ItemUtils.getGregtechOreStack(OrePrefixes.dust, itemData.mMaterial.mMaterial, input.stackSize);
- if (dustStack != null) {
- adjustedInputs.add(dustStack);
- } else {
- adjustedInputs.add(input);
- }
- } else {
- adjustedInputs.add(input);
- }
- }
- }
- }
- if (aFluidInputs == null) {
- aFluidInputs = new FluidStack[0];
- }
- for (final FluidStack fluidInput : aFluidInputs) {
- adjustedFluidInputs.add(fluidInput);
- }
- aInputs = adjustedInputs.toArray(new ItemStack[adjustedInputs.size()]);
- aFluidInputs = adjustedFluidInputs.toArray(new FluidStack[adjustedFluidInputs.size()]);
- if (aOutputs == null) {
- aOutputs = new ItemStack[0];
- }
- for (final ItemStack output : aOutputs) {
- FluidStack outputFluidContent = FluidContainerRegistry.getFluidForFilledItem(output);
- if (outputFluidContent != null) {
- final FluidStack fluidStack2 = outputFluidContent;
- fluidStack2.amount *= output.stackSize;
- if (outputFluidContent.getFluid().getName().equals("ic2steam")) {
- outputFluidContent = GT_ModHandler.getSteam((long) outputFluidContent.amount);
- }
- adjustedFluidOutputs.add(outputFluidContent);
- } else {
- final ItemData itemData = GT_OreDictUnificator.getItemData(output);
- if (itemData == null || !itemData.hasValidPrefixMaterialData()
- || itemData.mMaterial.mMaterial != Materials.Empty) {
- adjustedOutputs.add(output);
- }
- }
- }
- if (aFluidOutputs == null) {
- aFluidOutputs = new FluidStack[0];
- }
- for (final FluidStack fluidOutput : aFluidOutputs) {
- adjustedFluidOutputs.add(fluidOutput);
- }
- aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]);
- aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]);
- 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);
- }
- else {
- return null;
- }
- }
-
- static {
- GT_Recipe_Map_LargeCentrifuge.INPUT_COUNT = 2;
- GT_Recipe_Map_LargeCentrifuge.OUTPUT_COUNT = 2;
- GT_Recipe_Map_LargeCentrifuge.FLUID_INPUT_COUNT = 4;
- GT_Recipe_Map_LargeCentrifuge.FLUID_OUTPUT_COUNT = 4;
- }
-
- 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,
- final int aEUt, final int aSpecialValue) {
- super(aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration,
- aEUt, aSpecialValue);
- }
-
- public ArrayList<PositionedStack> getInputPositionedStacks() {
- final int itemLimit = Math.min(this.mInputs.length, GT_Recipe_Map_LargeCentrifuge.INPUT_COUNT);
- final int fluidLimit = Math.min(this.mFluidInputs.length,
- GT_Recipe_Map_LargeCentrifuge.FLUID_INPUT_COUNT);
- final ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
- for (int i = 0; i < itemLimit; ++i) {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) this.mInputs[i].copy(), 48 - i * 18, 5));
- }
- for (int i = 0; i < fluidLimit; ++i) {
- if (i < 3) {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - i * 18, 23));
- } else {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 12, 5));
- }
- }
- return inputStacks;
- }
-
- public ArrayList<PositionedStack> getOutputPositionedStacks() {
- final int itemLimit = Math.max(this.mOutputs.length, 0);
- final int fluidLimit = Math.max(this.mFluidOutputs.length, 0);
- final ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
- AutoMap<Object> mNEIMap = new AutoMap<Object>();
- for (int i = 0; i < itemLimit; ++i) {
- if (this.mOutputs[i] != null)
- mNEIMap.put((Object) this.mOutputs[i].copy());
- }
- for (int i = 0; i < fluidLimit; ++i) {
- if (this.mFluidOutputs[i] != null)
- mNEIMap.put((Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true));
- }
- int xPos[] = new int[] {102, 120, 138};
- int yPos[] = new int[] {5, 23, 41, 59};
- int mRow = 0;
- int mColumn = 0;
- for (int i = 0; i < Math.min(mNEIMap.size(), 16); ++i) {
- if (mColumn >= 3) {
- mColumn = 0;
- mRow++;
- }
- if (mColumn <= 2 && mRow <= 3)
- outputStacks.add(
- (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], this.getOutputChance(i)));
- }
- return outputStacks;
- }
- }
- }
-
- 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<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 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>();
- final ArrayList<ItemStack> adjustedOutputs = new ArrayList<ItemStack>();
- final ArrayList<FluidStack> adjustedFluidInputs = new ArrayList<FluidStack>();
- final ArrayList<FluidStack> adjustedFluidOutputs = new ArrayList<FluidStack>();
- if (aInputs == null) {
- aInputs = new ItemStack[0];
- }
- for (final ItemStack input : aInputs) {
- FluidStack inputFluidContent = FluidContainerRegistry.getFluidForFilledItem(input);
- if (inputFluidContent != null) {
- final FluidStack fluidStack = inputFluidContent;
- fluidStack.amount *= input.stackSize;
- if (inputFluidContent.getFluid().getName().equals("ic2steam")) {
- inputFluidContent = GT_ModHandler.getSteam((long) inputFluidContent.amount);
- }
- adjustedFluidInputs.add(inputFluidContent);
- } else {
- final ItemData itemData = GT_OreDictUnificator.getItemData(input);
- if (itemData == null || !itemData.hasValidPrefixMaterialData()
- || itemData.mMaterial.mMaterial != Materials.Empty) {
- if (itemData != null && itemData.hasValidPrefixMaterialData()
- && itemData.mPrefix == OrePrefixes.cell) {
- //final ItemStack dustStack = itemData.mMaterial.mMaterial.getDust(input.stackSize);
- final ItemStack dustStack = ItemUtils.getGregtechOreStack(OrePrefixes.dust, itemData.mMaterial.mMaterial, input.stackSize);
- if (dustStack != null) {
- adjustedInputs.add(dustStack);
- } else {
- adjustedInputs.add(input);
- }
- } else {
- adjustedInputs.add(input);
- }
- }
- }
- }
- if (aFluidInputs == null) {
- aFluidInputs = new FluidStack[0];
- }
- for (final FluidStack fluidInput : aFluidInputs) {
- adjustedFluidInputs.add(fluidInput);
- }
- aInputs = adjustedInputs.toArray(new ItemStack[adjustedInputs.size()]);
- aFluidInputs = adjustedFluidInputs.toArray(new FluidStack[adjustedFluidInputs.size()]);
- if (aOutputs == null) {
- aOutputs = new ItemStack[0];
- }
- for (final ItemStack output : aOutputs) {
- FluidStack outputFluidContent = FluidContainerRegistry.getFluidForFilledItem(output);
- if (outputFluidContent != null) {
- final FluidStack fluidStack2 = outputFluidContent;
- fluidStack2.amount *= output.stackSize;
- if (outputFluidContent.getFluid().getName().equals("ic2steam")) {
- outputFluidContent = GT_ModHandler.getSteam((long) outputFluidContent.amount);
- }
- adjustedFluidOutputs.add(outputFluidContent);
- } else {
- final ItemData itemData = GT_OreDictUnificator.getItemData(output);
- if (itemData == null || !itemData.hasValidPrefixMaterialData()
- || itemData.mMaterial.mMaterial != Materials.Empty) {
- adjustedOutputs.add(output);
- }
- }
- }
- if (aFluidOutputs == null) {
- aFluidOutputs = new FluidStack[0];
- }
- for (final FluidStack fluidOutput : aFluidOutputs) {
- adjustedFluidOutputs.add(fluidOutput);
- }
- aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]);
- aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]);
- 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);
- }
- else {
- return null;
- }
- }
-
- static {
- GT_Recipe_Map_LargeElectrolyzer.INPUT_COUNT = 2;
- GT_Recipe_Map_LargeElectrolyzer.OUTPUT_COUNT = 2;
- GT_Recipe_Map_LargeElectrolyzer.FLUID_INPUT_COUNT = 4;
- GT_Recipe_Map_LargeElectrolyzer.FLUID_OUTPUT_COUNT = 4;
- }
-
- 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,
- final int aEUt, final int aSpecialValue) {
- super(aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration,
- aEUt, aSpecialValue);
- }
-
- @Override
- public ArrayList<PositionedStack> getInputPositionedStacks() {
- final int itemLimit = Math.min(this.mInputs.length, GT_Recipe_Map_LargeElectrolyzer.INPUT_COUNT);
- final int fluidLimit = Math.min(this.mFluidInputs.length,
- GT_Recipe_Map_LargeElectrolyzer.FLUID_INPUT_COUNT);
- final ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
- for (int i = 0; i < itemLimit; ++i) {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) this.mInputs[i].copy(), 48 - i * 18, 5));
- }
- for (int i = 0; i < fluidLimit; ++i) {
- if (i < 3) {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - i * 18, 23));
- } else {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 12, 5));
- }
- }
- return inputStacks;
- }
-
- @Override
- public ArrayList<PositionedStack> getOutputPositionedStacks() {
- final int itemLimit = Math.max(this.mOutputs.length, 0);
- final int fluidLimit = Math.max(this.mFluidOutputs.length, 0);
- final ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
- AutoMap<Object> mNEIMap = new AutoMap<Object>();
- for (int i = 0; i < itemLimit; ++i) {
- if (this.mOutputs[i] != null)
- mNEIMap.put((Object) this.mOutputs[i].copy());
- }
- for (int i = 0; i < fluidLimit; ++i) {
- if (this.mFluidOutputs[i] != null)
- mNEIMap.put((Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true));
- }
- int xPos[] = new int[] {102, 120, 138};
- int yPos[] = new int[] {5, 23, 41, 59};
- int mRow = 0;
- int mColumn = 0;
- for (int i = 0; i < Math.min(mNEIMap.size(), 16); ++i) {
- if (mColumn >= 3) {
- mColumn = 0;
- mRow++;
- }
- if (mColumn <= 2 && mRow <= 3)
- outputStacks.add(
- (PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], this.getOutputChance(i)));
- }
- return outputStacks;
- }
- }
- }
-
- 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<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 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>();
- final ArrayList<ItemStack> adjustedOutputs = new ArrayList<ItemStack>();
- final ArrayList<FluidStack> adjustedFluidInputs = new ArrayList<FluidStack>();
- final ArrayList<FluidStack> adjustedFluidOutputs = new ArrayList<FluidStack>();
- if (aInputs == null) {
- aInputs = new ItemStack[0];
- }
- for (final ItemStack input : aInputs) {
- FluidStack inputFluidContent = FluidContainerRegistry.getFluidForFilledItem(input);
- if (inputFluidContent != null) {
- final FluidStack fluidStack = inputFluidContent;
- fluidStack.amount *= input.stackSize;
- if (inputFluidContent.getFluid().getName().equals("ic2steam")) {
- inputFluidContent = GT_ModHandler.getSteam((long) inputFluidContent.amount);
- }
- adjustedFluidInputs.add(inputFluidContent);
- } else {
- final ItemData itemData = GT_OreDictUnificator.getItemData(input);
- if (itemData == null || !itemData.hasValidPrefixMaterialData()
- || itemData.mMaterial.mMaterial != Materials.Empty) {
- if (itemData != null && itemData.hasValidPrefixMaterialData()
- && itemData.mPrefix == OrePrefixes.cell) {
- //final ItemStack dustStack = itemData.mMaterial.mMaterial.getDust(input.stackSize);
- final ItemStack dustStack = ItemUtils.getGregtechOreStack(OrePrefixes.dust, itemData.mMaterial.mMaterial, input.stackSize);
- if (dustStack != null) {
- adjustedInputs.add(dustStack);
- } else {
- adjustedInputs.add(input);
- }
- } else {
- adjustedInputs.add(input);
- }
- }
- }
- }
- if (aFluidInputs == null) {
- aFluidInputs = new FluidStack[0];
- }
- for (final FluidStack fluidInput : aFluidInputs) {
- adjustedFluidInputs.add(fluidInput);
- }
- aInputs = adjustedInputs.toArray(new ItemStack[adjustedInputs.size()]);
- aFluidInputs = adjustedFluidInputs.toArray(new FluidStack[adjustedFluidInputs.size()]);
- if (aOutputs == null) {
- aOutputs = new ItemStack[0];
- }
- for (final ItemStack output : aOutputs) {
- FluidStack outputFluidContent = FluidContainerRegistry.getFluidForFilledItem(output);
- if (outputFluidContent != null) {
- final FluidStack fluidStack2 = outputFluidContent;
- fluidStack2.amount *= output.stackSize;
- if (outputFluidContent.getFluid().getName().equals("ic2steam")) {
- outputFluidContent = GT_ModHandler.getSteam((long) outputFluidContent.amount);
- }
- adjustedFluidOutputs.add(outputFluidContent);
- } else {
- final ItemData itemData = GT_OreDictUnificator.getItemData(output);
- if (itemData == null || !itemData.hasValidPrefixMaterialData()
- || itemData.mMaterial.mMaterial != Materials.Empty) {
- adjustedOutputs.add(output);
- }
- }
- }
- if (aFluidOutputs == null) {
- aFluidOutputs = new FluidStack[0];
- }
- for (final FluidStack fluidOutput : aFluidOutputs) {
- adjustedFluidOutputs.add(fluidOutput);
- }
- aOutputs = adjustedOutputs.toArray(new ItemStack[adjustedOutputs.size()]);
- aFluidOutputs = adjustedFluidOutputs.toArray(new FluidStack[adjustedFluidOutputs.size()]);
-
- 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);
- }
- else {
- return null;
- }
- }
-
- static {
- GT_Recipe_Map_AdvancedVacuumFreezer.INPUT_COUNT = 2;
- GT_Recipe_Map_AdvancedVacuumFreezer.OUTPUT_COUNT = 2;
- GT_Recipe_Map_AdvancedVacuumFreezer.FLUID_INPUT_COUNT = 4;
- GT_Recipe_Map_AdvancedVacuumFreezer.FLUID_OUTPUT_COUNT = 4;
- }
-
- 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,
- final int aEUt, final int aSpecialValue) {
- super(aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration,
- aEUt, aSpecialValue);
- }
-
- public ArrayList<PositionedStack> getInputPositionedStacks() {
- final int itemLimit = Math.min(this.mInputs.length, GT_Recipe_Map_AdvancedVacuumFreezer.INPUT_COUNT);
- final int fluidLimit = Math.min(this.mFluidInputs.length,
- GT_Recipe_Map_AdvancedVacuumFreezer.FLUID_INPUT_COUNT);
- final ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
- for (int i = 0; i < itemLimit; ++i) {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) this.mInputs[i].copy(), 48 - i * 18, 5));
- }
- for (int i = 0; i < fluidLimit; ++i) {
- if (i < 3) {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - i * 18, 23));
- } else {
- inputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 12, 5));
- }
- }
- return inputStacks;
- }
-
-
- public ArrayList<PositionedStack> getOutputPositionedStacks() {
- final int itemLimit = Math.min(this.mOutputs.length, GT_Recipe_Map_AdvancedVacuumFreezer.OUTPUT_COUNT);
- final int fluidLimit = Math.min(this.mFluidOutputs.length,
- GT_Recipe_Map_AdvancedVacuumFreezer.FLUID_OUTPUT_COUNT);
- final ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
- for (int i = 0; i < itemLimit; ++i) {
- if (this.mOutputs[i] != null)
- outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) this.mOutputs[i].copy(), 102 + i * 18, 5, this.getOutputChance(i)));
- }
- for (int i = 0; i < fluidLimit; ++i) {
- if (this.mFluidOutputs[i] != null)
- outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23, this.getOutputChance(i)));
- }
- return outputStacks;
- }
- }
- }
-
+
public ArrayList<PositionedStack> getInputPositionedStacks() {
return null;
}
diff --git a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java b/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java
deleted file mode 100644
index 8b79705fe6..0000000000
--- a/src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package gregtech.api.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
-public class MultiblockRecipeMapHandler{
-
- public static void run() {
-
- if(CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer){
- generateSimpleMultimachineRecipeMap(GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes, CustomRecipeMap.mMultiElectrolyzer);
- }
- if(CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge){
- generateSimpleMultimachineRecipeMap(GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes, CustomRecipeMap.mMultiCentrifuge);
- }
- if(CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack){
- generateSimpleMultimachineRecipeMap(GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, CustomRecipeMap.mMultiMacerator);
- }
- if(CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill){
- generateSimpleMultimachineRecipeMap(GT_Recipe.GT_Recipe_Map.sWiremillRecipes, CustomRecipeMap.mMultiWireMill);
- }
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- public static boolean isCell(ItemStack cell) {
- if (cell == null){
- return false;
- }
- if (cell.getDisplayName().toLowerCase().contains("cell")
- || cell.getUnlocalizedName().toLowerCase().contains("cell")
- || FluidContainerRegistry.isFilledContainer(cell)) {
- if (cell.getDisplayName().toLowerCase().contains("plasma")
- || cell.getUnlocalizedName().toLowerCase().contains("plasma")) {
- return false;
- }
- return true;
- }
- return false;
- }
-
- public static boolean isCellEmpty(ItemStack cell){
- if (cell.getDisplayName().toLowerCase().contains("empty")
- || cell.getUnlocalizedName().toLowerCase().contains("empty")
- ) {
- return true;
- }
- return false;
- }
-
- private static ItemStack[] copyItemElements(ItemStack[] items){
- int inputCount = 0;
- ItemStack[] item = new ItemStack[9];
- for (ItemStack input : items) {
- if (!isCell(input)){
- item[inputCount] = input;
- inputCount++;
- }
- }
- return item;
- }
-
- private static ItemStack[] copyItemElementsWithCells(ItemStack[] items){
- int inputCount = 0;
- ItemStack[] item = new ItemStack[9];
- for (ItemStack input : items) {
- item[inputCount] = input;
- inputCount++;
- }
- return item;
- }
-
- private static FluidStack[] copyFluidElements(FluidStack[] fluids){
- FluidStack fluid[] = new FluidStack[9];
- for (int r = 0; r<fluids.length;r++){
- fluid[r] = fluids[r];
- }
- return fluid;
- }
-
- private static FluidStack[] addRemovedCellsToArray(ItemStack[] items, FluidStack[] fluids){
- ArrayList<FluidStack> fluidInputs = new ArrayList<FluidStack>();
-
- for (FluidStack fluid : fluids){
- fluidInputs.add(fluid);
- }
-
- for (ItemStack input : items) {
- if (input != null){
- if (isCell(input) && !isCellEmpty(input)){
- FluidStack cellFluid = FluidContainerRegistry.getFluidForFilledItem(input);
- if (cellFluid != null){
- cellFluid.amount = 1000;
- fluidInputs.add(cellFluid);
- }
- }
- }
- }
- FluidStack[] returnArray = new FluidStack[fluidInputs.size()];
- for (int h=0;h<fluidInputs.size();h++){
- returnArray[h] = fluidInputs.get(h);
- }
- return returnArray;
- }
-
- private static void generateSimpleMultimachineRecipeMap(GT_Recipe_Map inputMap, CustomRecipeMap newMap) {
- GT_Recipe_Map r = inputMap;
- final Collection<GT_Recipe> x = r.mRecipeList;
- for (final GT_Recipe newBo : x) {
- int duration = MathUtils.findPercentageOfInt(newBo.mDuration, 80);
- 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 {
- Logger.INFO("Failed adding a simple recipe to the "+newMap.mNEIName+" map.");
- }
- }
- }
-
- private static void generateMultimachineRecipeMap(GT_Recipe_Map inputMap, CustomRecipeMap newMap) {
- GT_Recipe_Map r = inputMap;
- final Collection<GT_Recipe> x = r.mRecipeList;
- for (final GT_Recipe newBo : x) {
- ItemStack[] mInputs = copyItemElementsWithCells(newBo.mInputs);
- ItemStack[] mOutputs = copyItemElementsWithCells(newBo.mOutputs);
- FluidStack[] mFluidInputs = copyFluidElements(newBo.mFluidInputs);
- FluidStack[] mFluidOutputs = copyFluidElements(newBo.mFluidOutputs);
- int duration = MathUtils.findPercentageOfInt(newBo.mDuration, 80);
-
- //Change bonus chances
- int[] outputChances = null;
- if (newBo.mChances != null){
- outputChances = newBo.mChances.clone();
- for (int g=0;g<outputChances.length;g++){
- Logger.WARNING("Output["+g+"] chance = "+outputChances[g]);
- if (outputChances[g]<10000){
- int temp = outputChances[g];
- if (outputChances[g] < 8000 && outputChances[g] >= 1){
- outputChances[g] = temp+600;
- Logger.WARNING("Output["+g+"] chance now = "+outputChances[g]);
- }
- else if (outputChances[g] < 9000 && outputChances[g] >= 8000){
- outputChances[g] = temp+200;
- Logger.WARNING("Output["+g+"] chance now = "+outputChances[g]);
- }
- else if (outputChances[g] <= 9900 && outputChances[g] >= 9000){
- outputChances[g] = temp+100;
- Logger.WARNING("Output["+g+"] chance now = "+outputChances[g]);
- }
- }
- }
- }
- 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 {
- Logger.INFO("Failed adding a recipe to the "+newMap.mNEIName+" map.");
- }
- }
- }
-
-
-
-}