Skip to content

Commit 104f914

Browse files
AlgorithmLXAlgorithmLX
committed
fix: drops
1 parent ce8217f commit 104f914

18 files changed

Lines changed: 215 additions & 269 deletions

src/main/resources/data/dimore/loot_tables/blocks/deepslate_quartz_ore.json renamed to src/main/resources/data/dimore/loot_table/blocks/deepslate_quartz_ore.json

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,46 @@
22
"type": "minecraft:block",
33
"pools": [
44
{
5-
"bonus_rolls": 0.0,
5+
"rolls": 1,
6+
"bonus_rolls": 0,
67
"entries": [
78
{
89
"type": "minecraft:alternatives",
910
"children": [
1011
{
1112
"type": "minecraft:item",
12-
"conditions": [
13+
"name": "minecraft:quartz",
14+
"functions": [
1315
{
14-
"condition": "minecraft:match_tool",
15-
"predicate": {
16-
"enchantments": [
17-
{
18-
"enchantment": "minecraft:silk_touch",
19-
"levels": {
20-
"min": 1
21-
}
22-
}
23-
]
24-
}
16+
"function": "minecraft:explosion_decay"
17+
},
18+
{
19+
"function": "minecraft:apply_bonus",
20+
"enchantment": "minecraft:fortune",
21+
"formula": "minecraft:ore_drops"
2522
}
26-
],
27-
"name": "dimore:deepslate_quartz_ore"
23+
]
2824
},
2925
{
3026
"type": "minecraft:item",
31-
"functions": [
32-
{
33-
"enchantment": "minecraft:fortune",
34-
"formula": "minecraft:ore_drops",
35-
"function": "minecraft:apply_bonus"
36-
},
27+
"name": "dimore:deepslate_quartz_ore",
28+
"conditions": [
3729
{
38-
"function": "minecraft:explosion_decay"
30+
"condition": "minecraft:match_tool",
31+
"predicate": {
32+
"components": {
33+
"minecraft:enchantments": {
34+
"minecraft:silk_touch": 1
35+
}
36+
}
37+
}
3938
}
40-
],
41-
"name": "minecraft:quartz"
39+
]
4240
}
4341
]
4442
}
45-
],
46-
"rolls": 1.0
43+
]
4744
}
4845
],
4946
"random_sequence": "minecraft:blocks/nether_quartz_ore"
50-
}
47+
}

src/main/resources/data/dimore/loot_tables/blocks/end_coal_ore.json renamed to src/main/resources/data/dimore/loot_table/blocks/end_coal_ore.json

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,12 @@
22
"type": "minecraft:block",
33
"pools": [
44
{
5+
"rolls": 1.0,
56
"bonus_rolls": 0.0,
67
"entries": [
78
{
89
"type": "minecraft:alternatives",
910
"children": [
10-
{
11-
"type": "minecraft:item",
12-
"conditions": [
13-
{
14-
"condition": "minecraft:match_tool",
15-
"predicate": {
16-
"enchantments": [
17-
{
18-
"enchantment": "minecraft:silk_touch",
19-
"levels": {
20-
"min": 1
21-
}
22-
}
23-
]
24-
}
25-
}
26-
],
27-
"name": "dimore:end_coal_ore"
28-
},
2911
{
3012
"type": "minecraft:item",
3113
"functions": [
@@ -39,12 +21,27 @@
3921
}
4022
],
4123
"name": "minecraft:coal"
24+
},
25+
{
26+
"type": "minecraft:item",
27+
"name": "dimore:end_coal_ore",
28+
"conditions": [
29+
{
30+
"condition": "minecraft:match_tool",
31+
"predicate": {
32+
"components": {
33+
"minecraft:enchantments": {
34+
"minecraft:silk_touch": 1
35+
}
36+
}
37+
}
38+
}
39+
]
4240
}
4341
]
4442
}
45-
],
46-
"rolls": 1.0
43+
]
4744
}
4845
],
4946
"random_sequence": "minecraft:blocks/coal_ore"
50-
}
47+
}

src/main/resources/data/dimore/loot_tables/blocks/nether_copper_ore.json renamed to src/main/resources/data/dimore/loot_table/blocks/end_copper_ore.json

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,24 @@
22
"type": "minecraft:block",
33
"pools": [
44
{
5+
"rolls": 1.0,
56
"bonus_rolls": 0.0,
67
"entries": [
78
{
89
"type": "minecraft:alternatives",
910
"children": [
1011
{
1112
"type": "minecraft:item",
12-
"conditions": [
13-
{
14-
"condition": "minecraft:match_tool",
15-
"predicate": {
16-
"enchantments": [
17-
{
18-
"enchantment": "minecraft:silk_touch",
19-
"levels": {
20-
"min": 1
21-
}
22-
}
23-
]
24-
}
25-
}
26-
],
27-
"name": "dimore:nether_copper_ore"
28-
},
29-
{
30-
"type": "minecraft:item",
13+
"name": "minecraft:raw_copper",
3114
"functions": [
3215
{
33-
"add": false,
16+
"function": "minecraft:set_count",
3417
"count": {
3518
"type": "minecraft:uniform",
3619
"max": 5.0,
3720
"min": 2.0
3821
},
39-
"function": "minecraft:set_count"
22+
"add": false
4023
},
4124
{
4225
"enchantment": "minecraft:fortune",
@@ -46,13 +29,27 @@
4629
{
4730
"function": "minecraft:explosion_decay"
4831
}
49-
],
50-
"name": "minecraft:raw_copper"
32+
]
33+
},
34+
{
35+
"type": "minecraft:item",
36+
"name": "dimore:end_copper_ore",
37+
"conditions": [
38+
{
39+
"condition": "minecraft:match_tool",
40+
"predicate": {
41+
"components": {
42+
"minecraft:enchantments": {
43+
"minecraft:silk_touch": 1
44+
}
45+
}
46+
}
47+
}
48+
]
5149
}
5250
]
5351
}
54-
],
55-
"rolls": 1.0
52+
]
5653
}
5754
],
5855
"random_sequence": "minecraft:blocks/copper_ore"

src/main/resources/data/dimore/loot_tables/blocks/end_diamond_ore.json renamed to src/main/resources/data/dimore/loot_table/blocks/end_diamond_ore.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@
22
"type": "minecraft:block",
33
"pools": [
44
{
5+
"rolls": 1.0,
56
"bonus_rolls": 0.0,
67
"entries": [
78
{
89
"type": "minecraft:alternatives",
910
"children": [
1011
{
1112
"type": "minecraft:item",
13+
"name": "dimore:end_diamond_ore",
1214
"conditions": [
1315
{
1416
"condition": "minecraft:match_tool",
1517
"predicate": {
16-
"enchantments": [
17-
{
18-
"enchantment": "minecraft:silk_touch",
19-
"levels": {
20-
"min": 1
21-
}
18+
"components": {
19+
"minecraft:enchantments": {
20+
"minecraft:silk_touch": 1
2221
}
23-
]
22+
}
2423
}
2524
}
26-
],
27-
"name": "dimore:end_diamond_ore"
25+
]
2826
},
2927
{
3028
"type": "minecraft:item",
29+
"name": "minecraft:diamond",
3130
"functions": [
3231
{
3332
"enchantment": "minecraft:fortune",
@@ -37,13 +36,11 @@
3736
{
3837
"function": "minecraft:explosion_decay"
3938
}
40-
],
41-
"name": "minecraft:diamond"
39+
]
4240
}
4341
]
4442
}
45-
],
46-
"rolls": 1.0
43+
]
4744
}
4845
],
4946
"random_sequence": "minecraft:blocks/diamond_ore"

src/main/resources/data/dimore/loot_tables/blocks/end_emerald_ore.json renamed to src/main/resources/data/dimore/loot_table/blocks/end_emerald_ore.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@
22
"type": "minecraft:block",
33
"pools": [
44
{
5+
"rolls": 1.0,
56
"bonus_rolls": 0.0,
67
"entries": [
78
{
89
"type": "minecraft:alternatives",
910
"children": [
1011
{
1112
"type": "minecraft:item",
13+
"name": "dimore:end_emerald_ore",
1214
"conditions": [
1315
{
1416
"condition": "minecraft:match_tool",
1517
"predicate": {
16-
"enchantments": [
17-
{
18-
"enchantment": "minecraft:silk_touch",
19-
"levels": {
20-
"min": 1
21-
}
18+
"components": {
19+
"minecraft:enchantments": {
20+
"minecraft:silk_touch": 1
2221
}
23-
]
22+
}
2423
}
2524
}
26-
],
27-
"name": "dimore:end_emerald_ore"
25+
]
2826
},
2927
{
3028
"type": "minecraft:item",
29+
"name": "minecraft:emerald",
3130
"functions": [
3231
{
3332
"enchantment": "minecraft:fortune",
@@ -37,13 +36,11 @@
3736
{
3837
"function": "minecraft:explosion_decay"
3938
}
40-
],
41-
"name": "minecraft:emerald"
39+
]
4240
}
4341
]
4442
}
45-
],
46-
"rolls": 1.0
43+
]
4744
}
4845
],
4946
"random_sequence": "minecraft:blocks/emerald_ore"

src/main/resources/data/dimore/loot_tables/blocks/end_gold_ore.json renamed to src/main/resources/data/dimore/loot_table/blocks/end_gold_ore.json

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@
22
"type": "minecraft:block",
33
"pools": [
44
{
5+
"rolls": 1.0,
56
"bonus_rolls": 0.0,
67
"entries": [
78
{
89
"type": "minecraft:alternatives",
910
"children": [
1011
{
1112
"type": "minecraft:item",
13+
"name": "dimore:end_gold_ore",
1214
"conditions": [
1315
{
1416
"condition": "minecraft:match_tool",
1517
"predicate": {
16-
"enchantments": [
17-
{
18-
"enchantment": "minecraft:silk_touch",
19-
"levels": {
20-
"min": 1
21-
}
18+
"components": {
19+
"minecraft:enchantments": {
20+
"minecraft:silk_touch": 1
2221
}
23-
]
22+
}
2423
}
2524
}
26-
],
27-
"name": "dimore:end_gold_ore"
25+
]
2826
},
2927
{
3028
"type": "minecraft:item",
29+
"name": "minecraft:raw_gold",
3130
"functions": [
3231
{
3332
"enchantment": "minecraft:fortune",
@@ -37,13 +36,11 @@
3736
{
3837
"function": "minecraft:explosion_decay"
3938
}
40-
],
41-
"name": "minecraft:raw_gold"
39+
]
4240
}
4341
]
4442
}
45-
],
46-
"rolls": 1.0
43+
]
4744
}
4845
],
4946
"random_sequence": "minecraft:blocks/gold_ore"

0 commit comments

Comments
 (0)