aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-06 17:24:25 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-06 17:24:25 +0000
commit0941607a38160b0bced1652b91f38cd55480261d (patch)
treea2f908c3862bbf88e952af684983ecc7b1305bc1 /src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
parent7f35f5cf2684d056e5cce278e555d685e20a5821 (diff)
downloadGT5-Unofficial-0941607a38160b0bced1652b91f38cd55480261d.tar.gz
GT5-Unofficial-0941607a38160b0bced1652b91f38cd55480261d.tar.bz2
GT5-Unofficial-0941607a38160b0bced1652b91f38cd55480261d.zip
Greatly improved NEI handling.
Fixed broken Manure Slurry recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java')
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java456
1 files changed, 26 insertions, 430 deletions
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java b/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
index 793f53f127..3f22b15f3b 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java
@@ -1,91 +1,17 @@
package gtPlusPlus.nei;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.util.*;
+import java.util.HashMap;
-import org.lwjgl.opengl.GL11;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import codechicken.nei.guihook.IContainerTooltipHandler;
-import codechicken.nei.recipe.*;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.gui.GT_GUIContainer_BasicMachine;
-import gregtech.api.objects.ItemData;
-import gregtech.api.util.*;
-import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal;
-import gtPlusPlus.api.objects.Logger;
+import codechicken.nei.recipe.TemplateRecipeHandler;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
-public class GT_NEI_multiCentriElectroFreezer
-extends TemplateRecipeHandler {
- public static final int sOffsetX = 5;
- public static final int sOffsetY = 11;
-
- static {
- GuiContainerManager.addInputHandler(new GT_RectHandler());
- GuiContainerManager.addTooltipHandler(new GT_RectHandler());
- }
- protected GTPP_Recipe_Map_Internal mRecipeMap;
+public class GT_NEI_multiCentriElectroFreezer extends GTPP_NEI_DefaultHandler {
- public GT_NEI_multiCentriElectroFreezer(GTPP_Recipe_Map_Internal aMap) {
- this.mRecipeMap = aMap;
- this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
- if (!NEI_GT_Config.sIsAdded) {
- FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
- GuiCraftingRecipe.craftinghandlers.add(this);
- GuiUsageRecipe.usagehandlers.add(this);
- }
- }
-
- public static void logRecipeError(GT_Recipe aRecipe) {
- if (aRecipe == null) {
- Logger.INFO("Tried to handle null recipe. :(");
- }
- else {
- ItemStack[] aInputs = aRecipe.mInputs;
- ItemStack[] aOutputs = aRecipe.mOutputs;
- FluidStack[] aFluidInputs = aRecipe.mFluidInputs;
- FluidStack[] aFluidOutputs = aRecipe.mFluidOutputs;
- int aEU = aRecipe.mEUt;
- int aTime = aRecipe.mDuration;
- int aSpecialValue = aRecipe.mSpecialValue;
- String aInputitems = ItemUtils.getArrayStackNames(aInputs);
- String aOutputitems = ItemUtils.getArrayStackNames(aOutputs);
- String aInputFluids = ItemUtils.getArrayStackNames(aFluidInputs);
- String aOutputFluids = ItemUtils.getArrayStackNames(aFluidOutputs);
- Logger.INFO("Logging Broken Recipe Details:");
- Logger.INFO("Input Items - "+aInputitems);
- Logger.INFO("Output Items - "+aOutputitems);
- Logger.INFO("Input Fluids - "+aInputFluids);
- Logger.INFO("Output Fluids - "+aOutputFluids);
- Logger.INFO("EU/t - "+aEU);
- Logger.INFO("Duration - "+aTime);
- Logger.INFO("Special Value - "+aSpecialValue);
- }
- }
-
- public List<GTPP_Recipe> getSortedRecipes() {
- List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
- Collections.sort(result);
- return result;
- }
-
- public static void drawText(final int aX, final int aY, final String aString, final int aColor) {
- Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor);
+ public GT_NEI_multiCentriElectroFreezer(GT_Recipe_Map aMap) {
+ super(aMap);
}
@Override
@@ -94,313 +20,10 @@ extends TemplateRecipeHandler {
}
@Override
- public void loadCraftingRecipes(final String outputId, final Object... results) {
- if (outputId.equals(getRecipeMapName())) {
- for (GTPP_Recipe tRecipe : getSortedRecipes()) {
- if (!tRecipe.mHidden) {
- CachedDefaultRecipe tNEIRecipe = getCachedRecipe(tRecipe);
- if (tNEIRecipe == null) {
- continue;
- }
- this.arecipes.add(tNEIRecipe);
- }
- }
- } else {
- super.loadCraftingRecipes(outputId, results);
- }
- }
-
- @Override
- public void loadCraftingRecipes(final ItemStack aResult) {
- ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult);
-
- ArrayList<ItemStack> tResults = new ArrayList<ItemStack>();
- tResults.add(aResult);
- tResults.add(GT_OreDictUnificator.get(true, aResult));
- if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
- for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
- tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
- }
- }
- FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true);
- if (tFluid != null) {
- tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false));
- for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
- if (tData.fluid.isFluidEqual(tFluid)) {
- tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer}));
- }
- }
- }
- for (GTPP_Recipe tRecipe : getSortedRecipes()) {
- if (!tRecipe.mHidden) {
- CachedDefaultRecipe tNEIRecipe = getCachedRecipe(tRecipe);
- if (tNEIRecipe == null) {
- continue;
- }
- for (ItemStack tStack : tResults) {
- if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) {
- this.arecipes.add(tNEIRecipe);
- break;
- }
- }
- }
- }
- //CachedDefaultRecipe tNEIRecipe;
- }
-
- public void loadUsageRecipes(ItemStack aInput) {
- ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput);
-
- ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>();
- tInputs.add(aInput);
- tInputs.add(GT_OreDictUnificator.get(false, aInput));
- if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) {
- for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) {
- tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L));
- }
- }
- FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true);
- if (tFluid != null) {
- tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false));
- for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
- if (tData.fluid.isFluidEqual(tFluid)) {
- tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer}));
- }
- }
- }
- for (GTPP_Recipe tRecipe : getSortedRecipes()) {
- if (!tRecipe.mHidden) {
- CachedDefaultRecipe tNEIRecipe = getCachedRecipe(tRecipe);
- if (tNEIRecipe == null) {
- continue;
- }
- for (ItemStack tStack : tInputs) {
- if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) {
- this.arecipes.add(tNEIRecipe);
- break;
- }
- }
- }
- }
- //CachedDefaultRecipe tNEIRecipe;
- }
-
- public String getRecipeMapName() {
- return this.mRecipeMap.mNEIName;
- }
-
- @Override
- public String getOverlayIdentifier() {
- return this.mRecipeMap.mNEIName;
- }
-
- @Override
- public void drawBackground(final int recipe) {
- GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
- GuiDraw.changeTexture(this.getGuiTexture());
- GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78);
- }
-
- @Override
- public int recipiesPerPage() {
- return 1;
- }
-
- @Override
- public String getRecipeName() {
- return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName);
- }
-
- @Override
- public String getGuiTexture() {
- return this.mRecipeMap.mNEIGUIPath;
- }
-
- @Override
- public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) {
- final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex);
- if ((tObject instanceof CachedDefaultRecipe)) {
- final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject;
- for (final PositionedStack tStack : tRecipe.mOutputs) {
- if (aStack == tStack.item) {
- if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) {
- break;
- }
- currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%");
- break;
- }
- }
- for (final PositionedStack tStack : tRecipe.mInputs) {
- if (aStack == tStack.item) {
- if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) ||
- (tStack.item.stackSize != 0)) {
- break;
- }
- currenttip.add("Does not get consumed in the process");
- break;
- }
- }
- }
- return currenttip;
- }
-
- @Override
- public void drawExtras(final int aRecipeIndex) {
- final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt;
- final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration;
- if (tEUt != 0) {
- drawText(10, 83, "Total: " + (tDuration * tEUt) + " EU", -16777216);
- drawText(10, 93, "Usage: " + tEUt + " EU/t", -16777216);
- if (this.mRecipeMap.mShowVoltageAmperageInNEI) {
- drawText(10, 103, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU", -16777216);
- drawText(10, 113, "Amperage: " + this.mRecipeMap.mAmperage, -16777216);
- } else {
- drawText(10, 103, "Voltage: unspecified", -16777216);
- drawText(10, 113, "Amperage: unspecified", -16777216);
- }
- }
- if (tDuration > 0) {
- drawText(10, 123, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);
- }
- if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) {
- drawText(10, 133, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216);
- }
- }
-
- public static class GT_RectHandler
- implements IContainerInputHandler, IContainerTooltipHandler {
- @Override
- public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) {
- if (this.canHandle(gui)) {
- if (button == 0) {
- return this.transferRect(gui, false);
- }
- if (button == 1) {
- return this.transferRect(gui, true);
- }
- }
- return false;
- }
-
- @Override
- public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) {
- return false;
- }
-
- public boolean canHandle(final GuiContainer gui) {
- return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/);
- }
-
- @Override
- public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) {
- if ((this.canHandle(gui)) && (currenttip.isEmpty())) {
- if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) {
- currenttip.add("Recipes");
- } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) {
- currenttip.add("Recipes");
- }*/
-
- }
- return currenttip;
- }
-
- private boolean transferRect(final GuiContainer gui, final boolean usage) {
- if (gui instanceof GT_GUIContainer_BasicMachine) {
- return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]));
- } /*else if (gui instanceof GT_GUIContainer_FusionReactor) {
- return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]));
- }*/
- return false;
- }
-
- @Override
- public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) {
- return currenttip;
- }
-
- @Override
- public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) {
- return currenttip;
- }
-
- @Override
- public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) {
- return false;
- }
-
- @Override
- public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) {
- }
-
- @Override
- public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) {
- }
-
- @Override
- public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) {
- }
-
- @Override
- public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) {
- return false;
- }
-
- @Override
- public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) {
- }
-
- @Override
- public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) {
- }
- }
-
- public class FixedPositionedStack
- extends PositionedStack {
- public final int mChance;
- public boolean permutated = false;
-
- public FixedPositionedStack(final Object object, final int x, final int y) {
- this(object, x, y, 0);
- }
-
- public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) {
- super(object, x, y, true);
- this.mChance = aChance;
- }
-
- @Override
- public void generatePermutations() {
- if (this.permutated) {
- return;
- }
- final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>();
- for (final ItemStack tStack : this.items) {
- if (GT_Utility.isStackValid(tStack)) {
- if (tStack.getItemDamage() == 32767) {
- final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem());
- if (!permutations.isEmpty()) {
- ItemStack stack;
- for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) {
- stack = i$.next();
- }
- } else {
- final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize);
- base.stackTagCompound = tStack.stackTagCompound;
- tDisplayStacks.add(base);
- }
- } else {
- tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack}));
- }
- }
- }
- this.items = (tDisplayStacks.toArray(new ItemStack[0]));
- if (this.items.length == 0) {
- this.items = new ItemStack[]{new ItemStack(Blocks.fire)};
- }
- this.permutated = true;
- this.setPermutationToRender(0);
- }
- }
+ public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) {
+ return new NoCellMultiDefaultRecipe(aRecipe);
+ }
+
private static final HashMap<Integer, Pair<Integer, Integer>> mInputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>();
private static final HashMap<Integer, Pair<Integer, Integer>> mOutputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>();
@@ -440,28 +63,17 @@ extends TemplateRecipeHandler {
mOutputSlotMap.put(10, new Pair<Integer, Integer>(aSlotX_2, aSlotY_10));
mOutputSlotMap.put(11, new Pair<Integer, Integer>(aSlotX_3, aSlotY_10));
}
-
- private CachedDefaultRecipe getCachedRecipe(GT_Recipe aRecipe) {
- try {
- return new CachedDefaultRecipe(aRecipe);
- }
- catch(Throwable e) {
- logRecipeError(aRecipe);
+
+ public class NoCellMultiDefaultRecipe extends CachedDefaultRecipe {
+
+ public NoCellMultiDefaultRecipe(final GT_Recipe aRecipe) {
+ super(aRecipe);
+
}
- return null;
- }
- public class CachedDefaultRecipe
- extends TemplateRecipeHandler.CachedRecipe {
-
-
- public final GT_Recipe mRecipe;
- public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>();
- public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>();
+ @Override
+ public void handleSlots() {
- public CachedDefaultRecipe(final GT_Recipe aRecipe) {
- super();
- this.mRecipe = aRecipe;
int aInputItemsCount = this.mRecipe.mInputs.length;
int aInputFluidsCount = this.mRecipe.mFluidInputs.length;
int aOutputItemsCount = this.mRecipe.mOutputs.length;
@@ -471,8 +83,8 @@ extends TemplateRecipeHandler {
int aSlotToCheck = 0;
// Special Slot
- if (aRecipe.mSpecialItems != null) {
- this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52));
+ if (mRecipe.mSpecialItems != null) {
+ this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52));
}
/*
@@ -487,7 +99,7 @@ extends TemplateRecipeHandler {
for (int i=0;i<aInputItemsCount;i++) {
int x = mInputSlotMap.get(aSlotToCheck).getKey();
int y = mInputSlotMap.get(aSlotToCheck).getValue();
- this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(aSlotToCheck), x, y));
+ this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(aSlotToCheck), x, y));
aSlotToCheck++;
aInputSlotsUsed++;
}
@@ -501,7 +113,7 @@ extends TemplateRecipeHandler {
for (int i=0;i<aOutputItemsCount;i++) {
int x = mOutputSlotMap.get(aSlotToCheck).getKey();
int y = mOutputSlotMap.get(aSlotToCheck).getValue();
- this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(aSlotToCheck), x, y, aRecipe.getOutputChance(aSlotToCheck)));
+ this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(aSlotToCheck), x, y, mRecipe.getOutputChance(aSlotToCheck)));
aSlotToCheck++;
aOutputSlotsUsed++;
}
@@ -517,7 +129,7 @@ extends TemplateRecipeHandler {
for (int i=0;i<aInputFluidsCount;i++) {
int x = mInputSlotMap.get(aSlotToCheck).getKey();
int y = mInputSlotMap.get(aSlotToCheck).getValue();
- this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true), x, y));
+ this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[i], true), x, y));
aSlotToCheck++;
aInputSlotsUsed++;
}
@@ -528,27 +140,11 @@ extends TemplateRecipeHandler {
for (int i=0;i<aOutputFluidsCount;i++) {
int x = mOutputSlotMap.get(aSlotToCheck).getKey();
int y = mOutputSlotMap.get(aSlotToCheck).getValue();
- this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true), x, y));
+ this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[i], true), x, y));
aSlotToCheck++;
aOutputSlotsUsed++;
}
}
-
- }
-
- @Override
- public List<PositionedStack> getIngredients() {
- return this.getCycledIngredients(GT_NEI_multiCentriElectroFreezer.this.cycleticks / 10, this.mInputs);
- }
-
- @Override
- public PositionedStack getResult() {
- return null;
- }
-
- @Override
- public List<PositionedStack> getOtherStacks() {
- return this.mOutputs;
}
}
}