Skip to content
This repository was archived by the owner on Apr 9, 2026. It is now read-only.

Commit 0f26513

Browse files
tickwardentickwarden
authored
Fixes
1 parent db6f4df commit 0f26513

7 files changed

Lines changed: 332 additions & 6 deletions

File tree

‎_pre_1_21_4/data/macro/template/template/tiered_drop.json‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
{
2+
"_comment": "macro:loot_table/template/tiered_drop — Entity drop template with looting-level tiers.",
3+
"_usage": "Copy into your own namespace. Replace 'minecraft:diamond' with your drop item. Pool 0 is base drop (always); pool 1 requires Looting I+; pool 2 requires Looting II+; pool 3 requires Looting III.",
4+
"type": "minecraft:entity",
5+
"pools": [
6+
{
7+
"_comment": "Base drop — always granted on player kill",
8+
"rolls": 1,
9+
"conditions": [
10+
{
11+
"condition": "minecraft:killed_by_player"
12+
}
13+
],
14+
"entries": [
15+
{
16+
"type": "minecraft:item",
17+
"name": "minecraft:diamond",
18+
"functions": [
19+
{
20+
"function": "minecraft:set_count",
21+
"count": {
22+
"min": 1,
23+
"max": 1
24+
}
25+
}
26+
]
27+
}
28+
]
29+
},
30+
{
31+
"_comment": "Looting I+ bonus drop",
32+
"rolls": 1,
33+
"conditions": [
34+
{
35+
"condition": "minecraft:killed_by_player"
36+
},
37+
{
38+
"condition": "minecraft:entity_properties",
39+
"entity": "attacker",
40+
"predicate": {
41+
"equipment": {
42+
"mainhand": {
43+
"predicates": {
44+
"minecraft:enchantments": [
45+
{
46+
"enchantments": "minecraft:looting",
47+
"levels": {
48+
"min": 1
49+
}
50+
}
51+
]
52+
}
53+
}
54+
}
55+
}
56+
}
57+
],
58+
"entries": [
59+
{
60+
"type": "minecraft:item",
61+
"name": "minecraft:diamond",
62+
"functions": [
63+
{
64+
"function": "minecraft:set_count",
65+
"count": {
66+
"min": 1,
67+
"max": 1
68+
}
69+
}
70+
]
71+
}
72+
]
73+
},
74+
{
75+
"_comment": "Looting II+ bonus drop",
76+
"rolls": 1,
77+
"conditions": [
78+
{
79+
"condition": "minecraft:killed_by_player"
80+
},
81+
{
82+
"condition": "minecraft:entity_properties",
83+
"entity": "attacker",
84+
"predicate": {
85+
"equipment": {
86+
"mainhand": {
87+
"predicates": {
88+
"minecraft:enchantments": [
89+
{
90+
"enchantments": "minecraft:looting",
91+
"levels": {
92+
"min": 2
93+
}
94+
}
95+
]
96+
}
97+
}
98+
}
99+
}
100+
}
101+
],
102+
"entries": [
103+
{
104+
"type": "minecraft:item",
105+
"name": "minecraft:diamond",
106+
"functions": [
107+
{
108+
"function": "minecraft:set_count",
109+
"count": {
110+
"min": 1,
111+
"max": 1
112+
}
113+
}
114+
]
115+
}
116+
]
117+
},
118+
{
119+
"_comment": "Looting III bonus drop",
120+
"rolls": 1,
121+
"conditions": [
122+
{
123+
"condition": "minecraft:killed_by_player"
124+
},
125+
{
126+
"condition": "minecraft:entity_properties",
127+
"entity": "attacker",
128+
"predicate": {
129+
"equipment": {
130+
"mainhand": {
131+
"predicates": {
132+
"minecraft:enchantments": [
133+
{
134+
"enchantments": "minecraft:looting",
135+
"levels": {
136+
"min": 3
137+
}
138+
}
139+
]
140+
}
141+
}
142+
}
143+
}
144+
}
145+
],
146+
"entries": [
147+
{
148+
"type": "minecraft:item",
149+
"name": "minecraft:diamond",
150+
"functions": [
151+
{
152+
"function": "minecraft:set_count",
153+
"count": {
154+
"min": 1,
155+
"max": 2
156+
}
157+
}
158+
]
159+
}
160+
]
161+
}
162+
]
163+
}

‎compat_1_21_4/data/ame_load/function/load/internal/version_warn.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ tellraw @a[tag=macro.debug] ["",{"text":"[AME/DEBUG] ","color":"aqua"},{"text":"
55

66
data modify storage macro:input message set value "❌ Version mismatch — expected v2.0.4-pre1. Load aborted."
77
function macro:log/warn with storage macro:input {}
8-
data remove storage macro:input message
8+
data remove storage macro:input message

‎compat_1_21_4/data/macro/loot_table/template/tiered_drop.json‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
{
2+
"_comment": "macro:loot_table/template/tiered_drop — Entity drop template with looting-level tiers.",
3+
"_usage": "Copy into your own namespace. Replace 'minecraft:diamond' with your drop item. Pool 0 is base drop (always); pool 1 requires Looting I+; pool 2 requires Looting II+; pool 3 requires Looting III.",
4+
"type": "minecraft:entity",
5+
"pools": [
6+
{
7+
"_comment": "Base drop — always granted on player kill",
8+
"rolls": 1,
9+
"conditions": [
10+
{
11+
"condition": "minecraft:killed_by_player"
12+
}
13+
],
14+
"entries": [
15+
{
16+
"type": "minecraft:item",
17+
"name": "minecraft:diamond",
18+
"functions": [
19+
{
20+
"function": "minecraft:set_count",
21+
"count": {
22+
"min": 1,
23+
"max": 1
24+
}
25+
}
26+
]
27+
}
28+
]
29+
},
30+
{
31+
"_comment": "Looting I+ bonus drop",
32+
"rolls": 1,
33+
"conditions": [
34+
{
35+
"condition": "minecraft:killed_by_player"
36+
},
37+
{
38+
"condition": "minecraft:entity_properties",
39+
"entity": "attacker",
40+
"predicate": {
41+
"equipment": {
42+
"mainhand": {
43+
"predicates": {
44+
"minecraft:enchantments": [
45+
{
46+
"enchantments": "minecraft:looting",
47+
"levels": {
48+
"min": 1
49+
}
50+
}
51+
]
52+
}
53+
}
54+
}
55+
}
56+
}
57+
],
58+
"entries": [
59+
{
60+
"type": "minecraft:item",
61+
"name": "minecraft:diamond",
62+
"functions": [
63+
{
64+
"function": "minecraft:set_count",
65+
"count": {
66+
"min": 1,
67+
"max": 1
68+
}
69+
}
70+
]
71+
}
72+
]
73+
},
74+
{
75+
"_comment": "Looting II+ bonus drop",
76+
"rolls": 1,
77+
"conditions": [
78+
{
79+
"condition": "minecraft:killed_by_player"
80+
},
81+
{
82+
"condition": "minecraft:entity_properties",
83+
"entity": "attacker",
84+
"predicate": {
85+
"equipment": {
86+
"mainhand": {
87+
"predicates": {
88+
"minecraft:enchantments": [
89+
{
90+
"enchantments": "minecraft:looting",
91+
"levels": {
92+
"min": 2
93+
}
94+
}
95+
]
96+
}
97+
}
98+
}
99+
}
100+
}
101+
],
102+
"entries": [
103+
{
104+
"type": "minecraft:item",
105+
"name": "minecraft:diamond",
106+
"functions": [
107+
{
108+
"function": "minecraft:set_count",
109+
"count": {
110+
"min": 1,
111+
"max": 1
112+
}
113+
}
114+
]
115+
}
116+
]
117+
},
118+
{
119+
"_comment": "Looting III bonus drop",
120+
"rolls": 1,
121+
"conditions": [
122+
{
123+
"condition": "minecraft:killed_by_player"
124+
},
125+
{
126+
"condition": "minecraft:entity_properties",
127+
"entity": "attacker",
128+
"predicate": {
129+
"equipment": {
130+
"mainhand": {
131+
"predicates": {
132+
"minecraft:enchantments": [
133+
{
134+
"enchantments": "minecraft:looting",
135+
"levels": {
136+
"min": 3
137+
}
138+
}
139+
]
140+
}
141+
}
142+
}
143+
}
144+
}
145+
],
146+
"entries": [
147+
{
148+
"type": "minecraft:item",
149+
"name": "minecraft:diamond",
150+
"functions": [
151+
{
152+
"function": "minecraft:set_count",
153+
"count": {
154+
"min": 1,
155+
"max": 2
156+
}
157+
}
158+
]
159+
}
160+
]
161+
}
162+
]
163+
}

‎data/ame_load/function/load/internal/version_set.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
scoreboard players set #ame.major ame.pre_version 2
22
scoreboard players set #ame.minor ame.pre_version 0
33
scoreboard players set #ame.patch ame.pre_version 4
4-
scoreboard players set #ame.pre ame.pre_version 1
5-
scoreboard players set #ame.ver_set ame.pre_version 1
4+
scoreboard players set #ame.pre ame.pre_version 1
5+
scoreboard players set #ame.ver_set ame.pre_version 1

‎data/macro/function/cmd/data_remove_block.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ execute unless dimension minecraft:overworld run return 0
44
execute unless entity @s[gamemode=creative] run return 0
55

66
$data remove block $(x) $(y) $(z) $(path)
7-
$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_block","color":"aqua"}]
7+
tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_block","color":"aqua"}]

‎data/macro/function/cmd/data_remove_entity.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ execute unless dimension minecraft:overworld run return 0
44
execute unless entity @s[gamemode=creative] run return 0
55

66
$data remove entity $(target) $(path)
7-
$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_entity","color":"aqua"}]
7+
tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_entity","color":"aqua"}]

‎data/macro/function/cmd/data_remove_storage.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ execute unless dimension minecraft:overworld run return 0
44
execute unless entity @s[gamemode=creative] run return 0
55

66
$data remove storage $(storage) $(path)
7-
$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_storage","color":"aqua"}]
7+
tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_storage","color":"aqua"}]

0 commit comments

Comments
 (0)