From 1e199d7944b643fd2bed1083d3a573ecbcca154d Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@gmail.com>
Date: Wed, 24 Jul 2024 17:57:24 +0200
Subject: [PATCH] Fix broken Dark Ore loot tables, Closes #1038

---
 .../evilcraft/loot_table/blocks/dark_ore.json | 48 +++++++++++--------
 .../loot_table/blocks/dark_ore_deepslate.json | 48 +++++++++++--------
 .../loot_table/blocks/hardened_blood.json     | 16 ++++---
 3 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore.json b/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore.json
index e9c4c124aa..db49745a1a 100644
--- a/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore.json
+++ b/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],
@@ -80,28 +82,32 @@
               "term": {
                 "condition": "minecraft:match_tool",
                 "predicate": {
-                  "enchantments": [
-                    {
-                      "enchantment": "minecraft:silk_touch",
-                      "levels": {
-                        "min": 1
+                  "predicates": {
+                    "minecraft:enchantments": [
+                      {
+                        "enchantments": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
               }
             },
             {
               "condition": "minecraft:match_tool",
               "predicate": {
-                "enchantments": [
-                  {
-                    "enchantment": "minecraft:fortune",
-                    "levels": {
-                      "min": 1
+                "predicates": {
+                  "minecraft:enchantments": [
+                    {
+                      "enchantments": "minecraft:fortune",
+                      "levels": {
+                        "min": 1
+                      }
                     }
-                  }
-                ]
+                  ]
+                }
               }
             }
           ]
diff --git a/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore_deepslate.json b/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore_deepslate.json
index 1eff9db592..5fde007a45 100644
--- a/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore_deepslate.json
+++ b/src/main/resources/data/evilcraft/loot_table/blocks/dark_ore_deepslate.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],
@@ -80,28 +82,32 @@
               "term": {
                 "condition": "minecraft:match_tool",
                 "predicate": {
-                  "enchantments": [
-                    {
-                      "enchantment": "minecraft:silk_touch",
-                      "levels": {
-                        "min": 1
+                  "predicates": {
+                    "minecraft:enchantments": [
+                      {
+                        "enchantments": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
               }
             },
             {
               "condition": "minecraft:match_tool",
               "predicate": {
-                "enchantments": [
-                  {
-                    "enchantment": "minecraft:fortune",
-                    "levels": {
-                      "min": 1
+                "predicates": {
+                  "minecraft:enchantments": [
+                    {
+                      "enchantments": "minecraft:fortune",
+                      "levels": {
+                        "min": 1
+                      }
                     }
-                  }
-                ]
+                  ]
+                }
               }
             }
           ]
diff --git a/src/main/resources/data/evilcraft/loot_table/blocks/hardened_blood.json b/src/main/resources/data/evilcraft/loot_table/blocks/hardened_blood.json
index 0cc210a746..65705204d6 100644
--- a/src/main/resources/data/evilcraft/loot_table/blocks/hardened_blood.json
+++ b/src/main/resources/data/evilcraft/loot_table/blocks/hardened_blood.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],