From 17d4669439dab194323dc4158f7d761dd16a7cad Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 8 Sep 2017 14:08:23 +0200 Subject: [PATCH] Fixed Solderer resetting progress when the inventory changes, fixes #1453 --- CHANGELOG.md | 1 + .../apiimpl/network/node/NetworkNodeSolderer.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9949af738..639c9e7b2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Fixed crash with GUI when toggling the Grid size quickly (raoulvdberge) - Fixed scrollbar not scrolling correctly when clicked with mouse when grid tabs are visible (raoulvdberge) - Fixed Reader and Writers GUIs still displaying channels even if not connected (raoulvdberge) +- Fixed Solderer resetting progress when the inventory changes (raoulvdberge) - Reader and Writer blocks now face the block you're placing it on, not the player (raoulvdberge) - The Fortune Upgrade doesn't use NBT anymore to store the fortune level (raoulvdberge) - Pressing SHIFT over an item in the Grid will no longer display the full unformatted count, instead, use CTRL + SHIFT and it will be displayed in the tooltip (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java index 1c2615b8e..a09aa6b58 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java @@ -46,8 +46,7 @@ public class NetworkNodeSolderer extends NetworkNode { protected void onContentsChanged(int slot) { super.onContentsChanged(slot); - recipe = API.instance().getSoldererRegistry().getRecipe(this); - progress = 0; + recipe = API.instance().getSoldererRegistry().getRecipe(ingredients); } }; @@ -95,6 +94,7 @@ public class NetworkNodeSolderer extends NetworkNode { if (working) { if (recipe == null) { working = false; + progress = 0; markDirty(); } else if ((result.getStackInSlot(0).isEmpty() || API.instance().getComparer().isEqualNoQuantity(recipe.getResult(), result.getStackInSlot(0))) && result.getStackInSlot(0).getCount() + recipe.getResult().getCount() <= result.getStackInSlot(0).getMaxStackSize()) {