From d73e329e7153270964e4c01445ea2a9b40e0ebba Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Tue, 13 Jun 2017 23:35:44 +0200
Subject: [PATCH] Bump to 1.4.14, and fixed #1303 "Strip NBT on Solderer
 compare"

---
 CHANGELOG.md                                                   | 3 +++
 build.gradle                                                   | 2 +-
 src/main/java/com/raoulvdberge/refinedstorage/RS.java          | 2 +-
 .../apiimpl/network/node/NetworkNodeSolderer.java              | 3 ++-
 .../refinedstorage/apiimpl/solderer/SoldererRegistry.java      | 3 ++-
 src/main/resources/mcmod.info                                  | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 222d584b8..3e3fc51cf 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.4.14
+- Fixed Solderer not accepting books made in anvil (raoulvdberge)
+
 ### 1.4.13
 - Fixed Portable Grid model (raoulvdberge, CyanideX)
 - The Portable Grid now has an indicator whether it's connected or disconnected and shows the disk (raoulvdberge, CyanideX)
diff --git a/build.gradle b/build.gradle
index e6bff7b42..7b2fdb503 100755
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.4.13"
+version = "1.4.14"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index ec24e6fe8..06ad09633 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -22,7 +22,7 @@ public final class RS {
     }
 
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "1.4.13";
+    public static final String VERSION = "1.4.14";
     public static final String DEPENDENCIES = "required-after:forge@[13.19.1.2188,);after:jei@[4.5.0,);";
     public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
     public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";
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 80abfa5fc..dd7460d67 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
@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSUtils;
 import com.raoulvdberge.refinedstorage.api.network.INetwork;
 import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
@@ -31,7 +32,7 @@ public class NetworkNodeSolderer extends NetworkNode {
         public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
             for (ISoldererRecipe recipe : API.instance().getSoldererRegistry().getRecipes()) {
                 for (ItemStack possibility : recipe.getRow(slot)) {
-                    if (API.instance().getComparer().isEqualNoQuantity(possibility, stack)) {
+                    if (API.instance().getComparer().isEqual(possibility, stack, IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE | IComparer.COMPARE_STRIP_NBT)) {
                         return super.insertItem(slot, stack, simulate);
                     }
                 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java
index a194a0c27..f6216d1fd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRegistry.java
@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.solderer;
 
 import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRecipe;
 import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry;
+import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
@@ -36,7 +37,7 @@ public class SoldererRegistry implements ISoldererRegistry {
                 }
 
                 for (ItemStack possibility : possibilities) {
-                    if (API.instance().getComparer().isEqualNoQuantity(possibility, ingredients.getStackInSlot(i))) {
+                    if (API.instance().getComparer().isEqual(possibility, ingredients.getStackInSlot(i), IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE | IComparer.COMPARE_STRIP_NBT)) {
                         if (ingredients.getStackInSlot(i).getCount() >= possibility.getCount()) {
                             rowsFound++;
                         }
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 2f59c020a..362961ce7 100755
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "An elegant solution to your hoarding problem",
-      "version": "1.4.13",
+      "version": "1.4.14",
       "mcversion": "1.11.2",
       "url": "https://refinedstorage.raoulvdberge.com",
       "updateUrl": "",