Skip to content

Commit 7112775

Browse files
committed
loot
1 parent c4ec63b commit 7112775

15 files changed

+35
-32
lines changed

Diff for: raw/wip/loot_tables/chests/park_pond.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"min": 20,
2121
"max": 30
2222
},
23-
"treasure": true,
23+
"options": "#minecraft:on_random_loot",
2424
"conditions": [
2525
{
2626
"condition": "minecraft:random_chance",

Diff for: src/main/resources/data/spectrum/loot_table/chests/city_below/bookshop_counter.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"min": 5,
141141
"max": 20
142142
},
143-
"treasure": true
143+
"options": "#minecraft:on_random_loot"
144144
}
145145
]
146146
}

Diff for: src/main/resources/data/spectrum/loot_table/chests/city_below/bookshop_upper.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"min": 10,
5151
"max": 25
5252
},
53-
"treasure": true
53+
"options": "#minecraft:on_random_loot"
5454
}
5555
]
5656
},

Diff for: src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_lectern.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{
2222
"function": "minecraft:enchant_with_levels",
2323
"levels": 15,
24-
"treasure": true
24+
"options": "#minecraft:on_random_loot"
2525
}
2626
]
2727
},

Diff for: src/main/resources/data/spectrum/loot_table/chests/city_below/moonstone_temple_vestry.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"function": "minecraft:enchant_with_levels",
2727
"levels": 30,
28-
"treasure": true
28+
"options": "#minecraft:on_random_loot"
2929
},
3030
{
3131
"function": "spectrum:dye_randomly",

Diff for: src/main/resources/data/spectrum/loot_table/chests/city_below/seed_vault_side_room.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
{
3636
"function": "minecraft:enchant_with_levels",
3737
"levels": 30,
38-
"treasure": true
38+
"options": "#minecraft:on_random_loot"
3939
}
4040
]
4141
},

Diff for: src/main/resources/data/spectrum/loot_table/chests/city_below/terrace_house_upper.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{
1212
"function": "minecraft:enchant_with_levels",
1313
"levels": 20,
14-
"treasure": true,
14+
"options": "#minecraft:on_random_loot",
1515
"conditions": [
1616
{
1717
"condition": "minecraft:random_chance",
@@ -29,7 +29,7 @@
2929
{
3030
"function": "minecraft:enchant_with_levels",
3131
"levels": 15,
32-
"treasure": true,
32+
"options": "#minecraft:on_random_loot",
3333
"conditions": [
3434
{
3535
"condition": "minecraft:random_chance",
@@ -49,8 +49,8 @@
4949
"options": [
5050
{
5151
"spectrum:bottomless_stack": {
52-
"template": {
53-
"id": "minecraft:tipped_arrow",
52+
"variant": {
53+
"item": "minecraft:tipped_arrow",
5454
"components": {
5555
"potion_contents": {
5656
"potion": "spectrum:pigment_potion",
@@ -73,8 +73,8 @@
7373
},
7474
{
7575
"spectrum:bottomless_stack": {
76-
"template": {
77-
"id": "minecraft:tipped_arrow",
76+
"variant": {
77+
"item": "minecraft:tipped_arrow",
7878
"components": {
7979
"potion_contents": {
8080
"potion": "spectrum:pigment_potion",
@@ -97,8 +97,8 @@
9797
},
9898
{
9999
"spectrum:bottomless_stack": {
100-
"template": {
101-
"id": "minecraft:tipped_arrow",
100+
"variant": {
101+
"item": "minecraft:tipped_arrow",
102102
"components": {
103103
"potion_contents": {
104104
"potion": "spectrum:pigment_potion",
@@ -121,8 +121,8 @@
121121
},
122122
{
123123
"spectrum:bottomless_stack": {
124-
"template": {
125-
"id": "minecraft:tipped_arrow",
124+
"variant": {
125+
"item": "minecraft:tipped_arrow",
126126
"components": {
127127
"potion_contents": {
128128
"potion": "spectrum:pigment_potion",
@@ -145,8 +145,8 @@
145145
},
146146
{
147147
"spectrum:bottomless_stack": {
148-
"template": {
149-
"id": "minecraft:tipped_arrow",
148+
"variant": {
149+
"item": "minecraft:tipped_arrow",
150150
"components": {
151151
"potion_contents": {
152152
"potion": "spectrum:pigment_potion",
@@ -169,8 +169,8 @@
169169
},
170170
{
171171
"spectrum:bottomless_stack": {
172-
"template": {
173-
"id": "minecraft:tipped_arrow",
172+
"variant": {
173+
"item": "minecraft:tipped_arrow",
174174
"components": {
175175
"potion_contents": {
176176
"potion": "spectrum:pigment_potion",

Diff for: src/main/resources/data/spectrum/loot_table/chests/color_combinations_cmy.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
"name": "minecraft:book",
6363
"functions": [
6464
{
65-
"function": "minecraft:enchant_randomly"
65+
"function": "minecraft:enchant_randomly",
66+
"options": "#minecraft:on_random_loot"
6667
}
6768
]
6869
}

Diff for: src/main/resources/data/spectrum/loot_table/chests/color_combinations_white.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
"name": "minecraft:book",
6767
"functions": [
6868
{
69-
"function": "minecraft:enchant_randomly"
69+
"function": "minecraft:enchant_randomly",
70+
"options": "#minecraft:on_random_loot"
7071
}
7172
]
7273
}

Diff for: src/main/resources/data/spectrum/loot_table/chests/wireless_redstone_small.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"name": "minecraft:book",
6262
"functions": [
6363
{
64-
"function": "minecraft:enchant_randomly"
64+
"function": "minecraft:enchant_randomly",
65+
"options": "#minecraft:on_random_loot"
6566
}
6667
]
6768
}

Diff for: src/main/resources/data/spectrum/loot_table/gameplay/fishing/deeper_down/treasure.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{
2020
"function": "minecraft:enchant_with_levels",
2121
"levels": 10,
22-
"treasure": true
22+
"options": "#minecraft:on_random_loot"
2323
}
2424
]
2525
}

Diff for: src/main/resources/data/spectrum/loot_table/gameplay/fishing/dragonrot/treasure.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
{
8080
"function": "minecraft:enchant_with_levels",
8181
"levels": 30,
82-
"treasure": true
82+
"options": "#minecraft:on_random_loot"
8383
}
8484
]
8585
},
@@ -99,7 +99,7 @@
9999
{
100100
"function": "minecraft:enchant_with_levels",
101101
"levels": 30,
102-
"treasure": true
102+
"options": "#minecraft:on_random_loot"
103103
}
104104
]
105105
},
@@ -110,7 +110,7 @@
110110
{
111111
"function": "minecraft:enchant_with_levels",
112112
"levels": 45,
113-
"treasure": true
113+
"options": "#minecraft:on_random_loot"
114114
}
115115
]
116116
},

Diff for: src/main/resources/data/spectrum/loot_table/gameplay/fishing/goo/treasure.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
{
8585
"function": "minecraft:enchant_with_levels",
8686
"levels": 15,
87-
"treasure": true
87+
"options": "#minecraft:on_random_loot"
8888
}
8989
]
9090
}

Diff for: src/main/resources/data/spectrum/loot_table/gameplay/fishing/lava/treasure.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
{
123123
"function": "minecraft:enchant_with_levels",
124124
"levels": 40,
125-
"treasure": true
125+
"options": "#minecraft:on_random_loot"
126126
}
127127
]
128128
},
@@ -140,7 +140,7 @@
140140
{
141141
"function": "minecraft:enchant_with_levels",
142142
"levels": 40,
143-
"treasure": true
143+
"options": "#minecraft:on_random_loot"
144144
}
145145
]
146146
},
@@ -158,7 +158,7 @@
158158
{
159159
"function": "minecraft:enchant_with_levels",
160160
"levels": 45,
161-
"treasure": true
161+
"options": "#minecraft:on_random_loot"
162162
}
163163
]
164164
}

Diff for: src/main/resources/data/spectrum/loot_table/gameplay/fishing/liquid_crystal/treasure.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
{
212212
"function": "minecraft:enchant_with_levels",
213213
"levels": 40,
214-
"treasure": true
214+
"options": "#minecraft:on_random_loot"
215215
}
216216
]
217217
},

0 commit comments

Comments
 (0)