dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Solderer resetting progress when the inventory changes, fixes #1453

Browse Source
This commit is contained in:
raoulvdberge
2017-09-08 14:08:23 +02:00
parent 32e22acd7a
commit 17d4669439
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@
- Fixed crash with GUI when toggling the Grid size quickly (raoulvdberge) - 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 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 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) - 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) - 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) - 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)

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java
View File

@@ -46,8 +46,7 @@ public class NetworkNodeSolderer extends NetworkNode {
protected void onContentsChanged(int slot) { protected void onContentsChanged(int slot) {
super.onContentsChanged(slot); super.onContentsChanged(slot);
recipe = API.instance().getSoldererRegistry().getRecipe(this); recipe = API.instance().getSoldererRegistry().getRecipe(ingredients);
progress = 0;
} }
}; };
@@ -95,6 +94,7 @@ public class NetworkNodeSolderer extends NetworkNode {
if (working) { if (working) {
if (recipe == null) { if (recipe == null) {
working = false; working = false;
progress = 0;
markDirty(); 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()) { } 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()) {