Merge pull request #2092

Fix filters having duplicate NBT

Author: wrincewind

src/main/java/wayoftime/bloodmagic/common/item/inventory/ItemInventory.java

@@ -80,7 +80,7 @@ public void readFromStack(ItemStack masterStack)
 		{
 			NBTHelper.checkNBT(masterStack);
 			CompoundTag tag = masterStack.getTag();
-			readFromNBT(tag.getCompound(Constants.NBT.ITEM_INVENTORY + name));
+			readFromNBT(tag);
 		}
 	}
 
@@ -92,7 +92,7 @@ public void writeToStack(ItemStack masterStack)
 			CompoundTag tag = masterStack.getTag();
 			CompoundTag invTag = new CompoundTag();
 			writeToNBT(invTag);
-			tag.put(Constants.NBT.ITEM_INVENTORY + name, invTag);
+			//tag.put(Constants.NBT.ITEM_INVENTORY + name, invTag);
 		}
 	}
 

src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/item_routing/copying_filters.json

@@ -1,17 +1,29 @@
 {
-  "name": "Copying Filters",
+  "name": "Editing Filters",
   "icon": "minecraft:writable_book",
   "category": "bloodmagic:demon_will/item_routing",
   "pages":[
     {
       "type": "patchouli:text",
-      "text": "if you are configuring a large number of $(thing)filters$(), or want to expand your existing filter setups, simply place two filters into a crafting table to copy the filter in slot one onto the filter in slot two."
+      "text": "If you are configuring a large number of $(thing)filters$(), or want to expand your existing filter setups, simply place between two and 9 filters into a crafting table to copy the filter in slot one onto all the other filters."
     },
     {
       "type": "bloodmagic:manual_recipe",
-          "input1": "bloodmagic:itemrouterfilterexact{itemInventoryRoutingFilter: {Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}]}, Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}], \"button:blackwhitelist\": 0, leastSig: -8112316981097356963L, mostSig: 4875194384706061509L}",
+          "input1": "bloodmagic:itemrouterfilterexact{Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}], \"button:blackwhitelist\": 0}",
           "input2": "bloodmagic:itemrouterfilterexact",
-          "output": "bloodmagic:itemrouterfilterexact#2{itemInventoryRoutingFilter: {Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}]}, Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}], \"button:blackwhitelist\": 0, leastSig: -8112316981097356963L, mostSig: 4875194384706061509L}"
+          "input9": "bloodmagic:itemrouterfilterexact",
+          "output": "bloodmagic:itemrouterfilterexact#3{Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}], \"button:blackwhitelist\": 0}"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "Similarly, if you want to clear a filter, place it in the crafting table on its own, like so."
+    },
+    {
+      "type": "bloodmagic:manual_recipe",
+      "input1": "bloodmagic:itemrouterfilterexact{Items: [{Slot: 0b, id: \"minecraft:leather\", Count: 1b, tag: {stackSize: 1}}], \"button:blackwhitelist\": 0}",
+      "input2": "minecraft:air",
+      "input9": "minecraft:air",
+      "output": "bloodmagic:itemrouterfilterexact"
     }
   ]
 }

src/main/resources/assets/bloodmagic/patchouli_books/guide/en_us/templates/manual_recipe.json

@@ -26,6 +26,13 @@
       "x":"31",
       "y":"7"
     },
+    {
+      "type": "patchouli:item",
+      "item": "#input9#",
+      "framed": false,
+      "x": "50",
+      "y": "45"
+    },
     {
       "type": "patchouli:item",
       "item": "#output#",