Merge remote-tracking branch 'origin/1.12' into 1.12

Author: DerekChan65535

src/main/java/mcjty/rftoolscontrol/blocks/craftingstation/CraftingStationTileEntity.java

@@ -390,14 +390,11 @@ private int findItem(String itemName, int meta, String nbtString) {
                 ItemStackList items = ItemStackList.create();
                 processor.getCraftableItems(items);
                 for (ItemStack item : items) {
-                    if (item.getItemDamage() == meta && itemName.equals(item.getItem().getRegistryName().toString())) {
-                        if (item.hasTagCompound()) {
-                            if (nbtString.equalsIgnoreCase(item.serializeNBT().toString())) {
-                                return index;
-                            }
-                        } else {
-                            return index;
-                        }
+                    if (item.getItemDamage() == meta &&
+                            itemName.equals(item.getItem().getRegistryName().toString()) &&
+                            (item.hasTagCompound() ? item.serializeNBT().toString() : "").equalsIgnoreCase(nbtString)
+                    ) {
+                        return index;
                     }
                     index++;
                 }