Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes Aludel consuming wrong amount of items

Browse source
This commit is contained in:
RedmenNL 2014-02-01 15:10:19 +01:00
parent 810232cfe0
commit abd00dc200
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/pahimar/ee3/recipe/RecipesAludel.java
View file

@ -96,13 +96,13 @@ public class RecipesAludel
return null; return null;
} }
public ItemStack[] getRecipeInputs(ItemStack itemStack) public RecipeAludel getRecipe(ItemStack recipeInputStack, ItemStack recipeInputDust)
{ {
for (RecipeAludel recipeAludel : aludelRecipes) for (RecipeAludel recipeAludel : aludelRecipes)
{ {
if (ItemHelper.equals(recipeAludel.getRecipeOutput(), itemStack)) if (recipeAludel.matches(recipeInputStack, recipeInputDust))
{ {
return recipeAludel.getRecipeInputs(); return recipeAludel;
} }
} }

14
src/main/java/com/pahimar/ee3/tileentity/TileAludel.java
View file

@ -1,6 +1,7 @@
package com.pahimar.ee3.tileentity; package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.helper.ItemHelper; import com.pahimar.ee3.helper.ItemHelper;
import com.pahimar.ee3.item.crafting.RecipeAludel;
import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketTypeHandler; import com.pahimar.ee3.network.PacketTypeHandler;
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate; import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;
@ -319,20 +320,19 @@ public class TileAludel extends TileEE implements IInventory
{ {
if (this.canInfuse()) if (this.canInfuse())
{ {
ItemStack infusedItemStack = RecipesAludel.getInstance().getResult(inventory[INPUT_INVENTORY_INDEX], inventory[DUST_INVENTORY_INDEX]); RecipeAludel recipe = RecipesAludel.getInstance().getRecipe(inventory[INPUT_INVENTORY_INDEX], inventory[DUST_INVENTORY_INDEX]);
ItemStack[] inputPair = RecipesAludel.getInstance().getRecipeInputs(infusedItemStack);
if (this.inventory[OUTPUT_INVENTORY_INDEX] == null) if (this.inventory[OUTPUT_INVENTORY_INDEX] == null)
{ {
this.inventory[OUTPUT_INVENTORY_INDEX] = infusedItemStack.copy(); this.inventory[OUTPUT_INVENTORY_INDEX] = recipe.getRecipeOutput().copy();
} }
else if (this.inventory[OUTPUT_INVENTORY_INDEX].isItemEqual(infusedItemStack)) else if (this.inventory[OUTPUT_INVENTORY_INDEX].isItemEqual(recipe.getRecipeOutput()))
{ {
inventory[OUTPUT_INVENTORY_INDEX].stackSize += infusedItemStack.stackSize; inventory[OUTPUT_INVENTORY_INDEX].stackSize += recipe.getRecipeOutput().stackSize;
} }
decrStackSize(INPUT_INVENTORY_INDEX, inputPair[0].stackSize); decrStackSize(INPUT_INVENTORY_INDEX, recipe.getRecipeInputs()[0].stackSize);
decrStackSize(DUST_INVENTORY_INDEX, inputPair[1].stackSize); decrStackSize(DUST_INVENTORY_INDEX, recipe.getRecipeInputs()[1].stackSize);
} }
} }