From 694cd8103a4fd750a093687e22e2b15cf2ca1eaa Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 29 Jul 2017 00:52:36 -0700 Subject: [PATCH] Fix client visual glitch with worktable --- src/main/java/forestry/factory/recipes/MemorizedRecipe.java | 6 +++++- src/main/java/forestry/factory/tiles/TileWorktable.java | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java index 69912e46c..60dba9e3d 100644 --- a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java +++ b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java @@ -34,7 +34,7 @@ import forestry.core.utils.InventoryUtil; import forestry.factory.inventory.InventoryCraftingForestry; public final class MemorizedRecipe implements INbtWritable, INbtReadable, IStreamable { - private final InventoryCraftingForestry craftMatrix = new InventoryCraftingForestry(); + private InventoryCraftingForestry craftMatrix = new InventoryCraftingForestry(); private List recipes = NonNullList.create(); private int selectedRecipe; private long lastUsed; @@ -57,6 +57,10 @@ public final class MemorizedRecipe implements INbtWritable, INbtReadable, IStrea return craftMatrix; } + public void setCraftMatrix(InventoryCraftingForestry craftMatrix) { + this.craftMatrix = craftMatrix; + } + public void validate(World world) { recipes = RecipeUtil.findMatchingRecipes(craftMatrix, world); if (selectedRecipe > recipes.size()) { diff --git a/src/main/java/forestry/factory/tiles/TileWorktable.java b/src/main/java/forestry/factory/tiles/TileWorktable.java index 6c453d3df..e66c6e30f 100644 --- a/src/main/java/forestry/factory/tiles/TileWorktable.java +++ b/src/main/java/forestry/factory/tiles/TileWorktable.java @@ -164,10 +164,11 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { return false; } - if (!simulate && !world.isRemote) + if (!simulate) { // update crafting display to match the ingredients that were actually used - setCraftingDisplay(crafting); + currentRecipe.setCraftMatrix(crafting); + setCurrentRecipe(currentRecipe); } return true;