From 143bab0e3d6fb3dcc4d362a2f8acbb0df78e7661 Mon Sep 17 00:00:00 2001
From: Dylan Tarter <dt.deadpool@gmail.com>
Date: Fri, 3 Dec 2021 20:31:24 -0600
Subject: [PATCH] For V1.18

---
 .../loot_tables/blocks/shulker_box.json       | 67 ------------------
 .../blocks/yellow_shulker_box.json            | 69 +++++++++++++++++++
 2 files changed, 69 insertions(+), 67 deletions(-)
 delete mode 100644 data/minecraft/loot_tables/blocks/shulker_box.json
 create mode 100644 data/minecraft/loot_tables/blocks/yellow_shulker_box.json

diff --git a/data/minecraft/loot_tables/blocks/shulker_box.json b/data/minecraft/loot_tables/blocks/shulker_box.json
deleted file mode 100644
index 7bb328c..0000000
--- a/data/minecraft/loot_tables/blocks/shulker_box.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:alternatives",
-          "children": [
-            {
-              "type": "minecraft:dynamic",
-              "name": "minecraft:contents",
-              "conditions": [
-                {
-                  "condition": "minecraft:match_tool",
-                  "predicate": {
-                    "nbt": "{drop_contents:true}"
-                  }
-                }
-              ]
-            },
-            {
-              "type": "minecraft:item",
-              "functions": [
-                {
-                  "function": "minecraft:copy_name",
-                  "source": "block_entity"
-                },
-                {
-                  "function": "minecraft:copy_nbt",
-                  "source": "block_entity",
-                  "ops": [
-                    {
-                      "source": "Lock",
-                      "target": "BlockEntityTag.Lock",
-                      "op": "replace"
-                    },
-                    {
-                      "source": "LootTable",
-                      "target": "BlockEntityTag.LootTable",
-                      "op": "replace"
-                    },
-                    {
-                      "source": "LootTableSeed",
-                      "target": "BlockEntityTag.LootTableSeed",
-                      "op": "replace"
-                    }
-                  ]
-                },
-                {
-                  "function": "minecraft:set_contents",
-                  "entries": [
-                    {
-                      "type": "minecraft:dynamic",
-                      "name": "minecraft:contents"
-                    }
-                  ]
-                }
-              ],
-              "name": "minecraft:shulker_box"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/data/minecraft/loot_tables/blocks/yellow_shulker_box.json b/data/minecraft/loot_tables/blocks/yellow_shulker_box.json
new file mode 100644
index 0000000..6519234
--- /dev/null
+++ b/data/minecraft/loot_tables/blocks/yellow_shulker_box.json
@@ -0,0 +1,69 @@
+{
+    "type": "minecraft:block",
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "minecraft:alternatives",
+                    "children": [
+                        {
+                            "type": "minecraft:dynamic",
+                            "name": "minecraft:contents",
+                            "conditions": [
+                                {
+                                    "condition": "minecraft:match_tool",
+                                    "predicate": {
+                                        "items": ["minecraft:air"],
+                                        "nbt": "{drop_contents:1b}"
+                                    }
+                                }
+                            ]
+                        },
+                        {
+                            "type": "minecraft:item",
+                            "name": "minecraft:yellow_shulker_box",
+                            "functions": [
+                                {
+                                    "function": "minecraft:copy_name",
+                                    "source": "block_entity"
+                                },
+                                {
+                                    "function": "minecraft:copy_nbt",
+                                    "source": "block_entity",
+                                    "ops": [
+                                        {
+                                            "source": "Lock",
+                                            "target": "BlockEntityTag.Lock",
+                                            "op": "replace"
+                                        },
+                                        {
+                                            "source": "LootTable",
+                                            "target": "BlockEntityTag.LootTable",
+                                            "op": "replace"
+                                        },
+                                        {
+                                            "source": "LootTableSeed",
+                                            "target": "BlockEntityTag.LootTableSeed",
+                                            "op": "replace"
+                                        }
+                                    ]
+                                },
+                                {
+                                    "function": "minecraft:set_contents",
+                                    "type": "minecraft:shulker_box",
+                                    "entries": [
+                                        {
+                                            "type": "minecraft:dynamic",
+                                            "name": "minecraft:contents"
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file