mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Fix #356 Worktable using the wrong wood with Shift-use all
This commit is contained in:
1 parent
ab3ba0c4db
commit
0105f36668
1 file changed
+4
-3
@@ -43,6 +43,7 @@ public class TileWorktable extends TileBase implements ICrafter {
|
||||
|
||||
/* CONSTANTS */
|
||||
public final static int SLOT_CRAFTING_1 = 0;
|
||||
public final static int SLOT_CRAFTING_COUNT = 9;
|
||||
public final static int SLOT_CRAFTING_RESULT = 9;
|
||||
public final static short SLOT_INVENTORY_1 = 0;
|
||||
public final static short SLOT_INVENTORY_COUNT = 18;
|
||||
@@ -135,7 +136,7 @@ public class TileWorktable extends TileBase implements ICrafter {
|
||||
return false;
|
||||
|
||||
ItemStack recipeOutput = RECIPE_BRIDGE.findMatchingRecipe(crafting, world);
|
||||
return recipeOutput != null && cachedRecipeOutput.isItemEqual(recipeOutput);
|
||||
return ItemStack.areItemStacksEqual(cachedRecipeOutput, recipeOutput);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -447,7 +448,7 @@ public class TileWorktable extends TileBase implements ICrafter {
|
||||
return false;
|
||||
|
||||
// Need at least one matched set
|
||||
ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9);
|
||||
ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT);
|
||||
ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT);
|
||||
if (StackUtils.containsSets(set, stock, true, true) == 0)
|
||||
return false;
|
||||
@@ -495,7 +496,7 @@ public class TileWorktable extends TileBase implements ICrafter {
|
||||
if (recipeOutput == null)
|
||||
return false;
|
||||
|
||||
return recipeOutput.isItemEqual(currentRecipe.getRecipeOutput());
|
||||
return ItemStack.areItemStacksEqual(recipeOutput, currentRecipe.getRecipeOutput());
|
||||
}
|
||||
|
||||
private boolean removeResources(EntityPlayer player) {
|
||||
|
||||
Reference in new issue
Block a user