loot

DaFuqs · Mar 10, 2025 · 7112775 · 7112775
1 parent c4ec63b
commit 7112775
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 32 deletions.
diff --git a/raw/wip/loot_tables/chests/park_pond.json b/raw/wip/loot_tables/chests/park_pond.json
@@ -20,7 +20,7 @@
             "min": 20,
             "max": 30
           },
-          "treasure": true,
+          "options": "#minecraft:on_random_loot",
           "conditions": [
             {
               "condition": "minecraft:random_chance",

diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/bookshop_counter.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/bookshop_counter.json
@@ -140,7 +140,7 @@
             "min": 5,
             "max": 20
           },
-          "treasure": true
+          "options": "#minecraft:on_random_loot"
         }
       ]
     }

diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/bookshop_upper.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/bookshop_upper.json
@@ -50,7 +50,7 @@
             "min": 10,
             "max": 25
           },
-          "treasure": true
+          "options": "#minecraft:on_random_loot"
         }
       ]
     },

diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_lectern.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_lectern.json
@@ -21,7 +21,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 15,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },

diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_vestry.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_vestry.json
@@ -25,7 +25,7 @@
         {
           "function": "minecraft:enchant_with_levels",
           "levels": 30,
-          "treasure": true
+          "options": "#minecraft:on_random_loot"
         },
         {
           "function": "spectrum:dye_randomly",

diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/seed_vault_side_room.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/seed_vault_side_room.json
@@ -35,7 +35,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 30,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },

diff --git a/src/main/resources/data/spectrum/loot_table/chests/city_below/terrace_house_upper.json b/src/main/resources/data/spectrum/loot_table/chests/city_below/terrace_house_upper.json
@@ -11,7 +11,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 20,
-              "treasure": true,
+              "options": "#minecraft:on_random_loot",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
@@ -29,7 +29,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 15,
-              "treasure": true,
+              "options": "#minecraft:on_random_loot",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
@@ -49,8 +49,8 @@
               "options": [
                 {
                   "spectrum:bottomless_stack": {
-                    "template": {
-                      "id": "minecraft:tipped_arrow",
+                    "variant": {
+                      "item": "minecraft:tipped_arrow",
                       "components": {
                         "potion_contents": {
                           "potion": "spectrum:pigment_potion",
@@ -73,8 +73,8 @@
                 },
                 {
                   "spectrum:bottomless_stack": {
-                    "template": {
-                      "id": "minecraft:tipped_arrow",
+                    "variant": {
+                      "item": "minecraft:tipped_arrow",
                       "components": {
                         "potion_contents": {
                           "potion": "spectrum:pigment_potion",
@@ -97,8 +97,8 @@
                 },
                 {
                   "spectrum:bottomless_stack": {
-                    "template": {
-                      "id": "minecraft:tipped_arrow",
+                    "variant": {
+                      "item": "minecraft:tipped_arrow",
                       "components": {
                         "potion_contents": {
                           "potion": "spectrum:pigment_potion",
@@ -121,8 +121,8 @@
                 },
                 {
                   "spectrum:bottomless_stack": {
-                    "template": {
-                      "id": "minecraft:tipped_arrow",
+                    "variant": {
+                      "item": "minecraft:tipped_arrow",
                       "components": {
                         "potion_contents": {
                           "potion": "spectrum:pigment_potion",
@@ -145,8 +145,8 @@
                 },
                 {
                   "spectrum:bottomless_stack": {
-                    "template": {
-                      "id": "minecraft:tipped_arrow",
+                    "variant": {
+                      "item": "minecraft:tipped_arrow",
                       "components": {
                         "potion_contents": {
                           "potion": "spectrum:pigment_potion",
@@ -169,8 +169,8 @@
                 },
                 {
                   "spectrum:bottomless_stack": {
-                    "template": {
-                      "id": "minecraft:tipped_arrow",
+                    "variant": {
+                      "item": "minecraft:tipped_arrow",
                       "components": {
                         "potion_contents": {
                           "potion": "spectrum:pigment_potion",

diff --git a/src/main/resources/data/spectrum/loot_table/chests/color_combinations_cmy.json b/src/main/resources/data/spectrum/loot_table/chests/color_combinations_cmy.json
@@ -62,7 +62,8 @@
           "name": "minecraft:book",
           "functions": [
             {
-              "function": "minecraft:enchant_randomly"
+              "function": "minecraft:enchant_randomly",
+              "options": "#minecraft:on_random_loot"
             }
           ]
         }

diff --git a/src/main/resources/data/spectrum/loot_table/chests/color_combinations_white.json b/src/main/resources/data/spectrum/loot_table/chests/color_combinations_white.json
@@ -66,7 +66,8 @@
           "name": "minecraft:book",
           "functions": [
             {
-              "function": "minecraft:enchant_randomly"
+              "function": "minecraft:enchant_randomly",
+              "options": "#minecraft:on_random_loot"
             }
           ]
         }

diff --git a/src/main/resources/data/spectrum/loot_table/chests/wireless_redstone_small.json b/src/main/resources/data/spectrum/loot_table/chests/wireless_redstone_small.json
@@ -61,7 +61,8 @@
           "name": "minecraft:book",
           "functions": [
             {
-              "function": "minecraft:enchant_randomly"
+              "function": "minecraft:enchant_randomly",
+              "options": "#minecraft:on_random_loot"
             }
           ]
         }

diff --git a/src/main/resources/data/spectrum/loot_table/gameplay/fishing/deeper_down/treasure.json b/src/main/resources/data/spectrum/loot_table/gameplay/fishing/deeper_down/treasure.json
@@ -19,7 +19,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 10,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         }

diff --git a/src/main/resources/data/spectrum/loot_table/gameplay/fishing/dragonrot/treasure.json b/src/main/resources/data/spectrum/loot_table/gameplay/fishing/dragonrot/treasure.json
@@ -79,7 +79,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 30,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },
@@ -99,7 +99,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 30,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },
@@ -110,7 +110,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 45,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },

diff --git a/src/main/resources/data/spectrum/loot_table/gameplay/fishing/goo/treasure.json b/src/main/resources/data/spectrum/loot_table/gameplay/fishing/goo/treasure.json
@@ -84,7 +84,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 15,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         }

diff --git a/src/main/resources/data/spectrum/loot_table/gameplay/fishing/lava/treasure.json b/src/main/resources/data/spectrum/loot_table/gameplay/fishing/lava/treasure.json
@@ -122,7 +122,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 40,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },
@@ -140,7 +140,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 40,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },
@@ -158,7 +158,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 45,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         }

diff --git a/src/main/resources/data/spectrum/loot_table/gameplay/fishing/liquid_crystal/treasure.json b/src/main/resources/data/spectrum/loot_table/gameplay/fishing/liquid_crystal/treasure.json
@@ -211,7 +211,7 @@
             {
               "function": "minecraft:enchant_with_levels",
               "levels": 40,
-              "treasure": true
+              "options": "#minecraft:on_random_loot"
             }
           ]
         },