Skip to content

Commit 081ed87

Browse files
committed
feat: battle hammer custom weapon
1 parent 1387453 commit 081ed87

File tree

5 files changed

+814
-14
lines changed

5 files changed

+814
-14
lines changed

assets/minecraft/models/item/crossbow.json

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,6 @@
102102
"custom_model_data": 14914
103103
},
104104
"model": "item/weapons/faebow_charge_firework"
105-
},
106-
{"predicate": {"pulling": 1}, "model": "item/crossbow_pulling_0"},
107-
{"predicate": {"pulling": 1, "pull": 0.58}, "model": "item/crossbow_pulling_1"},
108-
{"predicate": {"pulling": 1, "pull": 1.0}, "model": "item/crossbow_pulling_2"},
109-
{"predicate": {"charged": 1}, "model": "item/crossbow_arrow"},
110-
{"predicate": {"charged": 1, "firework": 1}, "model": "item/crossbow_firework"},
111-
112-
{"predicate": {"custom_model_data":5600}, "model": "orc_model/orc_crossbow_standby"},
113-
{"predicate": {"custom_model_data":5600,"pulling": 1}, "model": "orc_model/orc_crossbow_pulling_0"},
114-
{"predicate": {"custom_model_data":5600, "pulling": 1, "pull": 0.58}, "model": "orc_model/orc_crossbow_pulling_1"},
115-
{"predicate": {"custom_model_data":5600, "pulling": 1, "pull": 1.0}, "model": "orc_model/orc_crossbow_pulling_2"},
116-
{"predicate": {"custom_model_data":5600, "charged": 1}, "model": "orc_model/orc_crossbow_arrow"},
117-
{"predicate": {"custom_model_data":5600, "charged": 1, "firework": 1}, "model": "orc_model/orc_crossbow_arrow"}
118-
105+
}
119106
]
120107
}

assets/minecraft/models/item/diamond_axe.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
{ "predicate": {"custom_model_data": 543}, "model": "item/weapons/diamond_axe/diamond_hammer"},
2020
{ "predicate": {"custom_model_data": 544}, "model": "item/weapons/diamond_axe/diamond_guisarme"},
2121
{ "predicate": {"custom_model_data": 545}, "model": "item/weapons/diamond_axe/eric_hammer"},
22+
{ "predicate": {"custom_model_data": 546}, "model": "item/weapons/diamond_axe/battle_hammer"},
2223
{ "predicate": {"custom_model_data": 2000}, "model": "item/tools/diamond/christmas_chopper"},
2324
{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_axe"}
2425
]

0 commit comments

Comments
 (0)