diff --git a/README.md b/README.md index 36f6333..0b541f2 100644 --- a/README.md +++ b/README.md @@ -8,29 +8,49 @@ UndeadMaelys' Expansion Resource Packs 1 - Rotates item entities, making them appear laying on the ground (rather than standing). Completely safe to change, just remove models>items>generated.json. Disabling it will make custom weapons look weird (Too big). 1 - Weapons - ADDS custom weapons: - + ADDS custom melee weapons: 1 - Daggers (All tiers) - 2 - Curved Sword (All tiers) + 2 - Scimitar (All tiers) 3 - Katana (All tiers) 4 - Pike (All tiers) 5 - Warhammmer (All tiers) 6 - Great Sword (All tiers) - 7 - Great Curved Sword (All tiers) + 7 - Great Scimitar All tiers) 8 - Great Axe (All tiers) 9 - Halberd (All tiers) 10 - Great Hammer (All tiers) + 11 - Staff (Wooden, Stone, Iron) - ADDS custom magic staves: + ADDS custom magic weapons: + 1 - Magic Missile Magic Staff + 2 - Fire Blast Magic Staff + 3 - Ice Shard Magic Staff + 4 - Living Earth Magic Staff + 5 - Bone Dancer Magic Staff - 1 - Magic Missile Staff - 2 - Fire Blast Staff - 3 - Ice Shock Staff - 4 - Bone Dancer Staff + ADDS custom potions: + 1 - Potion of Gender Change + 2 - Potion of Gravitation + 3 - Potion of Inferno + 4 - Potion of Ironskin + 5 - Potion of Lifeforce + 6 - Potion of Love (Throwable) + 7 - Potion of Recall + 8 - Potion of Return + 9 - Potion of Stink (Throwable) + 10 - Potion of Telport + 11 - Potion of Waterwalking + + ADDS custom trinkets: + These grant unique dynamic effects if hold in the offhand! + 1 - Zephyrian Shell + Makes your arrows unaffected by gravity! + 2 - Olidia's Blessing + 50% chance of returning arrows upon impact! + 3 - Bloodthirsty Amulet + Each entity kill heals you one heart ADDS custom sounds: - 1 - Magic Missile Staff 1 2 - Magic Missile Staff 2 3 - Fire Blast Staff - diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..597082d --- /dev/null +++ b/TODO.md @@ -0,0 +1,17 @@ + +Draw Melee Weapons & make sure all tiers avaliable + x left: + x scimitar & great scimitar + x great sword + x great axe + x staves + +Fix models for melee weapons + x only diamond done + +Functionality for melee weapons + x none done + +Draw trinkets + x Olidia's Blessing: Golden, Cian amulet + x Zephyrian Shell: Prettified Nautilus shell diff --git a/assets/minecraft/models/item/carrot_on_a_stick.json b/assets/minecraft/models/item/carrot_on_a_stick.json index f40ab45..b7db668 100644 --- a/assets/minecraft/models/item/carrot_on_a_stick.json +++ b/assets/minecraft/models/item/carrot_on_a_stick.json @@ -4,10 +4,10 @@ "layer0": "minecraft:item/carrot_on_a_stick" }, "overrides": [ - { "predicate": { "custom_model_data": 2201}, "model": "undeadm-m1:item/staff_magic_missile" }, - { "predicate": { "custom_model_data": 2202}, "model": "undeadm-m1:item/staff_fire_blast" }, - { "predicate": { "custom_model_data": 2203}, "model": "undeadm-m1:item/staff_living_earth" }, - { "predicate": { "custom_model_data": 2204}, "model": "undeadm-m1:item/staff_corruption" }, - { "predicate": { "custom_model_data": 2205}, "model": "undeadm-m1:item/staff_fire_blast" } + { "predicate": { "custom_model_data": 1010200}, "model": "undeadm-m1:item/magic/staff_magic_missile" }, + { "predicate": { "custom_model_data": 1010201}, "model": "undeadm-m1:item/magic/staff_fire_blast" }, + { "predicate": { "custom_model_data": 1010202}, "model": "undeadm-m1:item/magic/staff_ice_shard" }, + { "predicate": { "custom_model_data": 1010203}, "model": "undeadm-m1:item/magic/staff_living_earth" }, + { "predicate": { "custom_model_data": 1010204}, "model": "undeadm-m1:item/magic/staff_bone_dancer" } ] } diff --git a/assets/minecraft/models/item/diamond_axe.json b/assets/minecraft/models/item/diamond_axe.json index f78c093..db69e09 100644 --- a/assets/minecraft/models/item/diamond_axe.json +++ b/assets/minecraft/models/item/diamond_axe.json @@ -4,7 +4,10 @@ "layer0": "minecraft:item/diamond_axe" }, "overrides": [ - { "predicate": { "custom_model_data": 2301}, "model": "undeadm-m1:item/diamond_halbard" }, - { "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/diamond_pike" } + { "predicate": { "custom_model_data": 1010002}, "model": "undeadm-m1:item/melee_weapon/diamond_great_axe" }, + { "predicate": { "custom_model_data": 1010007}, "model": "undeadm-m1:item/melee_weapon/diamond_halberd_b" }, + { "predicate": { "custom_model_data": 1010009}, "model": "undeadm-m1:item/melee_weapon/diamond_pike" }, + { "predicate": { "custom_model_data": 1010010}, "model": "undeadm-m1:item/melee_weapon/diamond_pike_forward" }, + { "predicate": { "custom_model_data": 1010013}, "model": "undeadm-m1:item/melee_weapon/diamond_warhammer_b" } ] } diff --git a/assets/minecraft/models/item/diamond_shovel.json b/assets/minecraft/models/item/diamond_shovel.json new file mode 100644 index 0000000..b992f04 --- /dev/null +++ b/assets/minecraft/models/item/diamond_shovel.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/diamond_shovel" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010004}, "model": "undeadm-m1:item/melee_weapon/diamond_great_hammer" }, + { "predicate": { "custom_model_data": 1010006}, "model": "undeadm-m1:item/melee_weapon/diamond_halberd_a" }, + { "predicate": { "custom_model_data": 1010011}, "model": "undeadm-m1:item/melee_weapon/diamond_staff" }, + { "predicate": { "custom_model_data": 1010012}, "model": "undeadm-m1:item/melee_weapon/diamond_warhammer_a" } + ] +} diff --git a/assets/minecraft/models/item/diamond_sword.json b/assets/minecraft/models/item/diamond_sword.json index 7df2507..a330a81 100644 --- a/assets/minecraft/models/item/diamond_sword.json +++ b/assets/minecraft/models/item/diamond_sword.json @@ -4,6 +4,10 @@ "layer0": "minecraft:item/diamond_sword" }, "overrides": [ - { "predicate": { "custom_model_data": 2303}, "model": "undeadm-m1:item/diamond_dagger" } + { "predicate": { "custom_model_data": 1010000}, "model": "undeadm-m1:item/melee_weapon/diamond_scimitar" }, + { "predicate": { "custom_model_data": 1010001}, "model": "undeadm-m1:item/melee_weapon/diamond_dagger" }, + { "predicate": { "custom_model_data": 1010003}, "model": "undeadm-m1:item/melee_weapon/diamond_great_scimitar" }, + { "predicate": { "custom_model_data": 1010005}, "model": "undeadm-m1:item/melee_weapon/diamond_great_sword" }, + { "predicate": { "custom_model_data": 1010008}, "model": "undeadm-m1:item/melee_weapon/diamond_katana" } ] } diff --git a/assets/minecraft/models/item/golden_axe.json b/assets/minecraft/models/item/golden_axe.json index ae21404..df83724 100644 --- a/assets/minecraft/models/item/golden_axe.json +++ b/assets/minecraft/models/item/golden_axe.json @@ -4,7 +4,10 @@ "layer0": "minecraft:item/golden_axe" }, "overrides": [ - { "predicate": { "custom_model_data": 2301}, "model": "undeadm-m1:item/golden_halbard" }, - { "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/golden_pike" } + { "predicate": { "custom_model_data": 1010002}, "model": "undeadm-m1:item/melee_weapon/golden_great_axe" }, + { "predicate": { "custom_model_data": 1010007}, "model": "undeadm-m1:item/melee_weapon/golden_halberd_b" }, + { "predicate": { "custom_model_data": 1010009}, "model": "undeadm-m1:item/melee_weapon/golden_pike" }, + { "predicate": { "custom_model_data": 1010010}, "model": "undeadm-m1:item/melee_weapon/golden_pike_forward" }, + { "predicate": { "custom_model_data": 1010013}, "model": "undeadm-m1:item/melee_weapon/golden_warhammer_b" } ] } diff --git a/assets/minecraft/models/item/golden_shovel.json b/assets/minecraft/models/item/golden_shovel.json new file mode 100644 index 0000000..6d6075f --- /dev/null +++ b/assets/minecraft/models/item/golden_shovel.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/golden_shovel" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010004}, "model": "undeadm-m1:item/melee_weapon/golden_great_hammer" }, + { "predicate": { "custom_model_data": 1010006}, "model": "undeadm-m1:item/melee_weapon/golden_halberd_a" }, + { "predicate": { "custom_model_data": 1010011}, "model": "undeadm-m1:item/melee_weapon/golden_staff" }, + { "predicate": { "custom_model_data": 1010012}, "model": "undeadm-m1:item/melee_weapon/golden_warhammer_a" } + ] +} diff --git a/assets/minecraft/models/item/golden_sword.json b/assets/minecraft/models/item/golden_sword.json index 8cfdbe9..dae97e9 100644 --- a/assets/minecraft/models/item/golden_sword.json +++ b/assets/minecraft/models/item/golden_sword.json @@ -4,6 +4,10 @@ "layer0": "minecraft:item/golden_sword" }, "overrides": [ - { "predicate": { "custom_model_data": 2303}, "model": "undeadm-expanded:item/golden_dagger" } + { "predicate": { "custom_model_data": 1010000}, "model": "undeadm-m1:item/melee_weapon/golden_scimitar" }, + { "predicate": { "custom_model_data": 1010001}, "model": "undeadm-m1:item/melee_weapon/golden_dagger" }, + { "predicate": { "custom_model_data": 1010003}, "model": "undeadm-m1:item/melee_weapon/golden_great_scimitar" }, + { "predicate": { "custom_model_data": 1010005}, "model": "undeadm-m1:item/melee_weapon/golden_great_sword" }, + { "predicate": { "custom_model_data": 1010008}, "model": "undeadm-m1:item/melee_weapon/golden_katana" } ] } diff --git a/assets/minecraft/models/item/iron_axe.json b/assets/minecraft/models/item/iron_axe.json index 2efee20..38ff409 100644 --- a/assets/minecraft/models/item/iron_axe.json +++ b/assets/minecraft/models/item/iron_axe.json @@ -4,7 +4,10 @@ "layer0": "minecraft:item/iron_axe" }, "overrides": [ - { "predicate": { "custom_model_data": 2301}, "model": "undeadm-m1:item/iron_halbard" }, - { "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/iron_pike" } + { "predicate": { "custom_model_data": 1010002}, "model": "undeadm-m1:item/melee_weapon/iron_great_axe" }, + { "predicate": { "custom_model_data": 1010007}, "model": "undeadm-m1:item/melee_weapon/iron_halberd_b" }, + { "predicate": { "custom_model_data": 1010009}, "model": "undeadm-m1:item/melee_weapon/iron_pike" }, + { "predicate": { "custom_model_data": 1010010}, "model": "undeadm-m1:item/melee_weapon/iron_pike_forward" }, + { "predicate": { "custom_model_data": 1010013}, "model": "undeadm-m1:item/melee_weapon/iron_warhammer_b" } ] } diff --git a/assets/minecraft/models/item/iron_shovel.json b/assets/minecraft/models/item/iron_shovel.json new file mode 100644 index 0000000..588fbad --- /dev/null +++ b/assets/minecraft/models/item/iron_shovel.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/iron_shovel" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010004}, "model": "undeadm-m1:item/melee_weapon/iron_great_hammer" }, + { "predicate": { "custom_model_data": 1010006}, "model": "undeadm-m1:item/melee_weapon/iron_halberd_a" }, + { "predicate": { "custom_model_data": 1010011}, "model": "undeadm-m1:item/melee_weapon/iron_staff" }, + { "predicate": { "custom_model_data": 1010012}, "model": "undeadm-m1:item/melee_weapon/iron_warhammer_a" } + ] +} diff --git a/assets/minecraft/models/item/iron_sword.json b/assets/minecraft/models/item/iron_sword.json index f13659e..c74ebfc 100644 --- a/assets/minecraft/models/item/iron_sword.json +++ b/assets/minecraft/models/item/iron_sword.json @@ -4,6 +4,10 @@ "layer0": "minecraft:item/iron_sword" }, "overrides": [ - { "predicate": { "custom_model_data": 2303}, "model": "undeadm-m1:item/iron_dagger" } + { "predicate": { "custom_model_data": 1010000}, "model": "undeadm-m1:item/melee_weapon/iron_scimitar" }, + { "predicate": { "custom_model_data": 1010001}, "model": "undeadm-m1:item/melee_weapon/iron_dagger" }, + { "predicate": { "custom_model_data": 1010003}, "model": "undeadm-m1:item/melee_weapon/iron_great_scimitar" }, + { "predicate": { "custom_model_data": 1010005}, "model": "undeadm-m1:item/melee_weapon/iron_great_sword" }, + { "predicate": { "custom_model_data": 1010008}, "model": "undeadm-m1:item/melee_weapon/iron_katana" } ] } diff --git a/assets/minecraft/models/item/netherite_axe.json b/assets/minecraft/models/item/netherite_axe.json index 0c91728..db7db0d 100644 --- a/assets/minecraft/models/item/netherite_axe.json +++ b/assets/minecraft/models/item/netherite_axe.json @@ -4,7 +4,10 @@ "layer0": "minecraft:item/netherite_axe" }, "overrides": [ - { "predicate": { "custom_model_data": 2301}, "model": "undeadm-m1:item/netherite_halbard" }, - { "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/netherite_pike" } + { "predicate": { "custom_model_data": 1010002}, "model": "undeadm-m1:item/melee_weapon/netherite_great_axe" }, + { "predicate": { "custom_model_data": 1010007}, "model": "undeadm-m1:item/melee_weapon/netherite_halberd_b" }, + { "predicate": { "custom_model_data": 1010009}, "model": "undeadm-m1:item/melee_weapon/netherite_pike" }, + { "predicate": { "custom_model_data": 1010010}, "model": "undeadm-m1:item/melee_weapon/netherite_pike_forward" }, + { "predicate": { "custom_model_data": 1010013}, "model": "undeadm-m1:item/melee_weapon/netherite_warhammer_b" } ] } diff --git a/assets/minecraft/models/item/netherite_shovel.json b/assets/minecraft/models/item/netherite_shovel.json new file mode 100644 index 0000000..0fe4eed --- /dev/null +++ b/assets/minecraft/models/item/netherite_shovel.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/netherite_shovel" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010004}, "model": "undeadm-m1:item/melee_weapon/netherite_great_hammer" }, + { "predicate": { "custom_model_data": 1010006}, "model": "undeadm-m1:item/melee_weapon/netherite_halberd_a" }, + { "predicate": { "custom_model_data": 1010011}, "model": "undeadm-m1:item/melee_weapon/netherite_staff" }, + { "predicate": { "custom_model_data": 1010012}, "model": "undeadm-m1:item/melee_weapon/netherite_warhammer_a" } + ] +} diff --git a/assets/minecraft/models/item/netherite_sword.json b/assets/minecraft/models/item/netherite_sword.json index 52a805d..969c9d7 100644 --- a/assets/minecraft/models/item/netherite_sword.json +++ b/assets/minecraft/models/item/netherite_sword.json @@ -4,6 +4,10 @@ "layer0": "minecraft:item/netherite_sword" }, "overrides": [ - { "predicate": { "custom_model_data": 2303}, "model": "undeadm-m1:item/netherite_dagger" } + { "predicate": { "custom_model_data": 1010000}, "model": "undeadm-m1:item/melee_weapon/netherite_scimitar" }, + { "predicate": { "custom_model_data": 1010001}, "model": "undeadm-m1:item/melee_weapon/netherite_dagger" }, + { "predicate": { "custom_model_data": 1010003}, "model": "undeadm-m1:item/melee_weapon/netherite_great_scimitar" }, + { "predicate": { "custom_model_data": 1010005}, "model": "undeadm-m1:item/melee_weapon/netherite_great_sword" }, + { "predicate": { "custom_model_data": 1010008}, "model": "undeadm-m1:item/melee_weapon/netherite_katana" } ] } diff --git a/assets/minecraft/models/item/potion.json b/assets/minecraft/models/item/potion.json new file mode 100644 index 0000000..89e5bf3 --- /dev/null +++ b/assets/minecraft/models/item/potion.json @@ -0,0 +1,18 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "item/potion_overlay", + "layer1": "item/potion" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010300}, "model": "undeadm-m1:item/potion/gender_change_potion" }, + { "predicate": { "custom_model_data": 1010301}, "model": "undeadm-m1:item/potion/gravitation_potion" }, + { "predicate": { "custom_model_data": 1010302}, "model": "undeadm-m1:item/potion/inferno_potion" }, + { "predicate": { "custom_model_data": 1010303}, "model": "undeadm-m1:item/potion/ironskin_potion" }, + { "predicate": { "custom_model_data": 1010304}, "model": "undeadm-m1:item/potion/lifeforce_potion" }, + { "predicate": { "custom_model_data": 1010306}, "model": "undeadm-m1:item/potion/recall_potion" }, + { "predicate": { "custom_model_data": 1010307}, "model": "undeadm-m1:item/potion/return_potion" }, + { "predicate": { "custom_model_data": 1010309}, "model": "undeadm-m1:item/potion/teleport_potion" }, + { "predicate": { "custom_model_data": 1010310}, "model": "undeadm-m1:item/potion/waterwalking_potion" } + ] +} diff --git a/assets/minecraft/models/item/splash_potion.json b/assets/minecraft/models/item/splash_potion.json new file mode 100644 index 0000000..21c66e5 --- /dev/null +++ b/assets/minecraft/models/item/splash_potion.json @@ -0,0 +1,11 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "item/potion_overlay", + "layer1": "item/splash_potion" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010305}, "model": "undeadm-m1:item/potion/love_potion" }, + { "predicate": { "custom_model_data": 1010308}, "model": "undeadm-m1:item/potion/stink_potion" } + ] +} diff --git a/assets/minecraft/models/item/stone_axe.json b/assets/minecraft/models/item/stone_axe.json index e50d174..33f0502 100644 --- a/assets/minecraft/models/item/stone_axe.json +++ b/assets/minecraft/models/item/stone_axe.json @@ -4,7 +4,10 @@ "layer0": "minecraft:item/stone_axe" }, "overrides": [ - { "predicate": { "custom_model_data": 2301}, "model": "undeadm-m1:item/stone_halbard" }, - { "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/stone_pike" } + { "predicate": { "custom_model_data": 1010002}, "model": "undeadm-m1:item/melee_weapon/stone_great_axe" }, + { "predicate": { "custom_model_data": 1010007}, "model": "undeadm-m1:item/melee_weapon/stone_halberd_b" }, + { "predicate": { "custom_model_data": 1010009}, "model": "undeadm-m1:item/melee_weapon/stone_pike" }, + { "predicate": { "custom_model_data": 1010010}, "model": "undeadm-m1:item/melee_weapon/stone_pike_forward" }, + { "predicate": { "custom_model_data": 1010013}, "model": "undeadm-m1:item/melee_weapon/stone_warhammer_b" } ] } diff --git a/assets/minecraft/models/item/stone_shovel.json b/assets/minecraft/models/item/stone_shovel.json new file mode 100644 index 0000000..eef4ea0 --- /dev/null +++ b/assets/minecraft/models/item/stone_shovel.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/stone_shovel" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010004}, "model": "undeadm-m1:item/melee_weapon/stone_great_hammer" }, + { "predicate": { "custom_model_data": 1010006}, "model": "undeadm-m1:item/melee_weapon/stone_halberd_a" }, + { "predicate": { "custom_model_data": 1010011}, "model": "undeadm-m1:item/melee_weapon/stone_staff" }, + { "predicate": { "custom_model_data": 1010012}, "model": "undeadm-m1:item/melee_weapon/stone_warhammer_a" } + ] +} diff --git a/assets/minecraft/models/item/stone_sword.json b/assets/minecraft/models/item/stone_sword.json index 16fd66d..897fd92 100644 --- a/assets/minecraft/models/item/stone_sword.json +++ b/assets/minecraft/models/item/stone_sword.json @@ -4,6 +4,10 @@ "layer0": "minecraft:item/stone_sword" }, "overrides": [ - { "predicate": { "custom_model_data": 2303}, "model": "undeadm-m1:item/stone_dagger" } + { "predicate": { "custom_model_data": 1010000}, "model": "undeadm-m1:item/melee_weapon/stone_scimitar" }, + { "predicate": { "custom_model_data": 1010001}, "model": "undeadm-m1:item/melee_weapon/stone_dagger" }, + { "predicate": { "custom_model_data": 1010003}, "model": "undeadm-m1:item/melee_weapon/stone_great_scimitar" }, + { "predicate": { "custom_model_data": 1010005}, "model": "undeadm-m1:item/melee_weapon/stone_great_sword" }, + { "predicate": { "custom_model_data": 1010008}, "model": "undeadm-m1:item/melee_weapon/stone_katana" } ] } diff --git a/assets/minecraft/models/item/wooden_axe.json b/assets/minecraft/models/item/wooden_axe.json index ab63043..1298c96 100644 --- a/assets/minecraft/models/item/wooden_axe.json +++ b/assets/minecraft/models/item/wooden_axe.json @@ -4,7 +4,10 @@ "layer0": "minecraft:item/wooden_axe" }, "overrides": [ - { "predicate": { "custom_model_data": 2301}, "model": "undeadm-m1:item/wooden_halbard" }, - { "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/wooden_pike" } + { "predicate": { "custom_model_data": 1010002}, "model": "undeadm-m1:item/melee_weapon/wooden_great_axe" }, + { "predicate": { "custom_model_data": 1010007}, "model": "undeadm-m1:item/melee_weapon/wooden_halberd_b" }, + { "predicate": { "custom_model_data": 1010009}, "model": "undeadm-m1:item/melee_weapon/wooden_pike" }, + { "predicate": { "custom_model_data": 1010010}, "model": "undeadm-m1:item/melee_weapon/wooden_pike_forward" }, + { "predicate": { "custom_model_data": 1010013}, "model": "undeadm-m1:item/melee_weapon/wooden_warhammer_b" } ] } diff --git a/assets/minecraft/models/item/wooden_shovel.json b/assets/minecraft/models/item/wooden_shovel.json new file mode 100644 index 0000000..7613bd4 --- /dev/null +++ b/assets/minecraft/models/item/wooden_shovel.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "minecraft:item/wooden_shovel" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1010004}, "model": "undeadm-m1:item/melee_weapon/wooden_great_hammer" }, + { "predicate": { "custom_model_data": 1010006}, "model": "undeadm-m1:item/melee_weapon/wooden_halberd_a" }, + { "predicate": { "custom_model_data": 1010011}, "model": "undeadm-m1:item/melee_weapon/wooden_staff" }, + { "predicate": { "custom_model_data": 1010012}, "model": "undeadm-m1:item/melee_weapon/wooden_warhammer_a" } + ] +} diff --git a/assets/minecraft/models/item/wooden_sword.json b/assets/minecraft/models/item/wooden_sword.json index a5490bd..da8db09 100644 --- a/assets/minecraft/models/item/wooden_sword.json +++ b/assets/minecraft/models/item/wooden_sword.json @@ -4,6 +4,10 @@ "layer0": "minecraft:item/wooden_sword" }, "overrides": [ - { "predicate": { "custom_model_data": 2303}, "model": "undeadm-m1:item/wooden_dagger" } + { "predicate": { "custom_model_data": 1010000}, "model": "undeadm-m1:item/melee_weapon/wooden_scimitar" }, + { "predicate": { "custom_model_data": 1010001}, "model": "undeadm-m1:item/melee_weapon/wooden_dagger" }, + { "predicate": { "custom_model_data": 1010003}, "model": "undeadm-m1:item/melee_weapon/wooden_great_scimitar" }, + { "predicate": { "custom_model_data": 1010005}, "model": "undeadm-m1:item/melee_weapon/wooden_great_sword" }, + { "predicate": { "custom_model_data": 1010008}, "model": "undeadm-m1:item/melee_weapon/wooden_katana" } ] } diff --git a/assets/undeadm-m1/models/item/weapon_staff.json b/assets/undeadm-m1/models/item/base_magic_staff.json similarity index 100% rename from assets/undeadm-m1/models/item/weapon_staff.json rename to assets/undeadm-m1/models/item/base_magic_staff.json diff --git a/assets/undeadm-m1/models/item/weapon_halbard.json b/assets/undeadm-m1/models/item/base_weapon_halbard.json similarity index 100% rename from assets/undeadm-m1/models/item/weapon_halbard.json rename to assets/undeadm-m1/models/item/base_weapon_halbard.json diff --git a/assets/undeadm-m1/models/item/hammer_weapon.json b/assets/undeadm-m1/models/item/base_weapon_hammer.json similarity index 100% rename from assets/undeadm-m1/models/item/hammer_weapon.json rename to assets/undeadm-m1/models/item/base_weapon_hammer.json diff --git a/assets/undeadm-m1/models/item/weapon_pike.json b/assets/undeadm-m1/models/item/base_weapon_pike.json similarity index 100% rename from assets/undeadm-m1/models/item/weapon_pike.json rename to assets/undeadm-m1/models/item/base_weapon_pike.json diff --git a/assets/undeadm-m1/models/item/diamond_dagger.json b/assets/undeadm-m1/models/item/diamond_dagger.json deleted file mode 100644 index 636caab..0000000 --- a/assets/undeadm-m1/models/item/diamond_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "undeadm-m1:item/diamond_dagger" - } -} diff --git a/assets/undeadm-m1/models/item/diamond_halbard.json b/assets/undeadm-m1/models/item/diamond_halbard.json deleted file mode 100644 index cf49c2c..0000000 --- a/assets/undeadm-m1/models/item/diamond_halbard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_halbard", - "textures": { - "layer0": "undeadm-m1:item/diamond_halbard" - } -} diff --git a/assets/undeadm-m1/models/item/diamond_pike.json b/assets/undeadm-m1/models/item/diamond_pike.json deleted file mode 100644 index 23a52e5..0000000 --- a/assets/undeadm-m1/models/item/diamond_pike.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_pike", - "textures": { - "layer0": "undeadm-m1:item/diamond_pike" - } -} diff --git a/assets/undeadm-m1/models/item/golden_dagger.json b/assets/undeadm-m1/models/item/golden_dagger.json deleted file mode 100644 index f939611..0000000 --- a/assets/undeadm-m1/models/item/golden_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "undeadm-m1:item/golden_dagger" - } -} diff --git a/assets/undeadm-m1/models/item/golden_halbard.json b/assets/undeadm-m1/models/item/golden_halbard.json deleted file mode 100644 index af7c7e5..0000000 --- a/assets/undeadm-m1/models/item/golden_halbard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_halbard", - "textures": { - "layer0": "undeadm-m1:item/golden_halbard" - } -} diff --git a/assets/undeadm-m1/models/item/golden_pike.json b/assets/undeadm-m1/models/item/golden_pike.json deleted file mode 100644 index 0a97aa3..0000000 --- a/assets/undeadm-m1/models/item/golden_pike.json +++ /dev/null @@ -1,6 +0,0 @@ - { - "parent": "undeadm-m1:item/weapon_pike", - "textures": { - "layer0": "undeadm-m1:item/golden_pike" - } -} diff --git a/assets/undeadm-m1/models/item/iron_dagger.json b/assets/undeadm-m1/models/item/iron_dagger.json deleted file mode 100644 index bc4b8a4..0000000 --- a/assets/undeadm-m1/models/item/iron_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "undeadm-m1:item/iron_dagger" - } -} diff --git a/assets/undeadm-m1/models/item/iron_halbard.json b/assets/undeadm-m1/models/item/iron_halbard.json deleted file mode 100644 index f7ef549..0000000 --- a/assets/undeadm-m1/models/item/iron_halbard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_halbard", - "textures": { - "layer0": "undeadm-m1:item/iron_halbard" - } -} diff --git a/assets/undeadm-m1/models/item/iron_pike.json b/assets/undeadm-m1/models/item/iron_pike.json deleted file mode 100644 index 94f7bf1..0000000 --- a/assets/undeadm-m1/models/item/iron_pike.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_pike", - "textures": { - "layer0": "undeadm-m1:item/iron_pike" - } -} diff --git a/assets/undeadm-m1/models/item/magic/staff_bone_dancer.json b/assets/undeadm-m1/models/item/magic/staff_bone_dancer.json new file mode 100644 index 0000000..56c0e52 --- /dev/null +++ b/assets/undeadm-m1/models/item/magic/staff_bone_dancer.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_magic_staff", + "textures": { + "layer0": "undeadm-m1:item/magic/staff_bone_dancer" + } +} diff --git a/assets/undeadm-m1/models/item/magic/staff_fire_blast.json b/assets/undeadm-m1/models/item/magic/staff_fire_blast.json new file mode 100644 index 0000000..c07d2b5 --- /dev/null +++ b/assets/undeadm-m1/models/item/magic/staff_fire_blast.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_magic_staff", + "textures": { + "layer0": "undeadm-m1:item/magic/staff_fire_blast" + } +} diff --git a/assets/undeadm-m1/models/item/magic/staff_ice_shard.json b/assets/undeadm-m1/models/item/magic/staff_ice_shard.json new file mode 100644 index 0000000..8d22a85 --- /dev/null +++ b/assets/undeadm-m1/models/item/magic/staff_ice_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_magic_staff", + "textures": { + "layer0": "undeadm-m1:item/magic/staff_ice_shard" + } +} diff --git a/assets/undeadm-m1/models/item/magic/staff_living_earth.json b/assets/undeadm-m1/models/item/magic/staff_living_earth.json new file mode 100644 index 0000000..05a5fed --- /dev/null +++ b/assets/undeadm-m1/models/item/magic/staff_living_earth.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_magic_staff", + "textures": { + "layer0": "undeadm-m1:item/magic/staff_living_earth" + } +} diff --git a/assets/undeadm-m1/models/item/magic/staff_magic_missile.json b/assets/undeadm-m1/models/item/magic/staff_magic_missile.json new file mode 100644 index 0000000..ebb58c1 --- /dev/null +++ b/assets/undeadm-m1/models/item/magic/staff_magic_missile.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_magic_staff", + "textures": { + "layer0": "undeadm-m1:item/magic/staff_magic_missile" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_dagger.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_dagger.json new file mode 100644 index 0000000..6012059 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_dagger.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/weapon_dagger", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_dagger" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_great_axe.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_axe.json new file mode 100644 index 0000000..ed24db7 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_great_axe", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_great_axe" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_great_hammer.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_hammer.json new file mode 100644 index 0000000..e148911 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_great_hammer", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_great_hammer" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_great_scimitar.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_scimitar.json new file mode 100644 index 0000000..9e1ee09 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_scimitar.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_great_scimitar", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_great_scimitar" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_great_sword.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_sword.json new file mode 100644 index 0000000..5086857 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_great_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_great_sword", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_great_sword" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_halbard_a.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_halbard_a.json new file mode 100644 index 0000000..40eef12 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_halbard_a.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_halbard", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_halbard_a" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_halbard_b.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_halbard_b.json new file mode 100644 index 0000000..cb8c348 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_halbard_b.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_halbard", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_halbard_b" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_katana.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_katana.json new file mode 100644 index 0000000..7293a5b --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_katana.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_katana", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_katana" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_pike.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_pike.json new file mode 100644 index 0000000..b20dd3e --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_pike.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_pike", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_pike" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_pike_forward.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_pike_forward.json new file mode 100644 index 0000000..bd54f58 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_pike_forward.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_pike_forward", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_pike" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_scimitar.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_scimitar.json new file mode 100644 index 0000000..0e8eb9e --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_scimitar.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_scimitar", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_scimitar" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_staff.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_staff.json new file mode 100644 index 0000000..15443b5 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_staff.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_staff", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_staff" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_warhammer_a.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_warhammer_a.json new file mode 100644 index 0000000..c567b5f --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_warhammer_a.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_warhammer", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_warhammer_a" + } +} diff --git a/assets/undeadm-m1/models/item/melee_weapon/diamond_warhammer_b.json b/assets/undeadm-m1/models/item/melee_weapon/diamond_warhammer_b.json new file mode 100644 index 0000000..c2e7f17 --- /dev/null +++ b/assets/undeadm-m1/models/item/melee_weapon/diamond_warhammer_b.json @@ -0,0 +1,6 @@ +{ + "parent": "undeadm-m1:item/base_weapon_warhammer", + "textures": { + "layer0": "undeadm-m1:item/melee_weapon/diamond_warhammer_b" + } +} diff --git a/assets/undeadm-m1/models/item/netherite_dagger.json b/assets/undeadm-m1/models/item/netherite_dagger.json deleted file mode 100644 index 55e9db7..0000000 --- a/assets/undeadm-m1/models/item/netherite_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "undeadm-m1:item/netherite_dagger" - } -} diff --git a/assets/undeadm-m1/models/item/netherite_halbard.json b/assets/undeadm-m1/models/item/netherite_halbard.json deleted file mode 100644 index 6f41e15..0000000 --- a/assets/undeadm-m1/models/item/netherite_halbard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_halbard", - "textures": { - "layer0": "undeadm-m1:item/netherite_halbard" - } -} diff --git a/assets/undeadm-m1/models/item/netherite_pike.json b/assets/undeadm-m1/models/item/netherite_pike.json deleted file mode 100644 index 63092cb..0000000 --- a/assets/undeadm-m1/models/item/netherite_pike.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_pike", - "textures": { - "layer0": "undeadm-m1:item/netherite_pike" - } -} diff --git a/assets/undeadm-m1/models/item/potion/gender_change_potion.json b/assets/undeadm-m1/models/item/potion/gender_change_potion.json new file mode 100644 index 0000000..41a4829 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/gender_change_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/gender_change_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/gravitation_potion.json b/assets/undeadm-m1/models/item/potion/gravitation_potion.json new file mode 100644 index 0000000..d89bbe5 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/gravitation_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/gravitation_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/inferno_potion.json b/assets/undeadm-m1/models/item/potion/inferno_potion.json new file mode 100644 index 0000000..e884bdb --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/inferno_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/inferno_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/ironskin_potion.json b/assets/undeadm-m1/models/item/potion/ironskin_potion.json new file mode 100644 index 0000000..3137530 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/ironskin_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/ironskin_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/lifeforce_potion.json b/assets/undeadm-m1/models/item/potion/lifeforce_potion.json new file mode 100644 index 0000000..9c14c1e --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/lifeforce_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/lifeforce_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/love_potion.json b/assets/undeadm-m1/models/item/potion/love_potion.json new file mode 100644 index 0000000..9118708 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/love_potion.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/empty", + "layer1": "undeadm-m1:item/potion/love_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/recall_potion.json b/assets/undeadm-m1/models/item/potion/recall_potion.json new file mode 100644 index 0000000..2fedf4d --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/recall_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/recall_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/return_potion.json b/assets/undeadm-m1/models/item/potion/return_potion.json new file mode 100644 index 0000000..fd22068 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/return_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/return_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/stink_potion.json b/assets/undeadm-m1/models/item/potion/stink_potion.json new file mode 100644 index 0000000..bdbbb74 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/stink_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/stink_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/teleport_potion.json b/assets/undeadm-m1/models/item/potion/teleport_potion.json new file mode 100644 index 0000000..d871dad --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/teleport_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/teleport_potion" + } +} diff --git a/assets/undeadm-m1/models/item/potion/waterwalking_potion.json b/assets/undeadm-m1/models/item/potion/waterwalking_potion.json new file mode 100644 index 0000000..2896a56 --- /dev/null +++ b/assets/undeadm-m1/models/item/potion/waterwalking_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "undeadm-m1:item/potion/waterwalking_potion" + } +} diff --git a/assets/undeadm-m1/models/item/staff_corruption.json b/assets/undeadm-m1/models/item/staff_corruption.json deleted file mode 100644 index 9b7bd73..0000000 --- a/assets/undeadm-m1/models/item/staff_corruption.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_staff", - "textures": { - "layer0": "undeadm-m1:item/staff_corruption" - } -} diff --git a/assets/undeadm-m1/models/item/staff_fire_blast.json b/assets/undeadm-m1/models/item/staff_fire_blast.json deleted file mode 100644 index 50dcfcc..0000000 --- a/assets/undeadm-m1/models/item/staff_fire_blast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_staff", - "textures": { - "layer0": "undeadm-m1:item/staff_fire_blast" - } -} diff --git a/assets/undeadm-m1/models/item/staff_living_earth.json b/assets/undeadm-m1/models/item/staff_living_earth.json deleted file mode 100644 index 8b554f1..0000000 --- a/assets/undeadm-m1/models/item/staff_living_earth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_staff", - "textures": { - "layer0": "undeadm-m1:item/staff_living_earth" - } -} diff --git a/assets/undeadm-m1/models/item/staff_magic_missile.json b/assets/undeadm-m1/models/item/staff_magic_missile.json deleted file mode 100644 index ed280f8..0000000 --- a/assets/undeadm-m1/models/item/staff_magic_missile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_staff", - "textures": { - "layer0": "undeadm-m1:item/staff_magic_missile" - } -} diff --git a/assets/undeadm-m1/models/item/stone_dagger.json b/assets/undeadm-m1/models/item/stone_dagger.json deleted file mode 100644 index 20e5eec..0000000 --- a/assets/undeadm-m1/models/item/stone_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "undeadm-m1:item/stone_dagger" - } -} diff --git a/assets/undeadm-m1/models/item/stone_halbard.json b/assets/undeadm-m1/models/item/stone_halbard.json deleted file mode 100644 index fef4aa9..0000000 --- a/assets/undeadm-m1/models/item/stone_halbard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_halbard", - "textures": { - "layer0": "undeadm-m1:item/stone_halbard" - } -} diff --git a/assets/undeadm-m1/models/item/stone_pike.json b/assets/undeadm-m1/models/item/stone_pike.json deleted file mode 100644 index fb10284..0000000 --- a/assets/undeadm-m1/models/item/stone_pike.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_pike", - "textures": { - "layer0": "undeadm-m1:item/stone_pike" - } -} diff --git a/assets/undeadm-m1/models/item/wooden_dagger.json b/assets/undeadm-m1/models/item/wooden_dagger.json deleted file mode 100644 index 844e3c7..0000000 --- a/assets/undeadm-m1/models/item/wooden_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "undeadm-m1:item/wooden_dagger" - } -} diff --git a/assets/undeadm-m1/models/item/wooden_halbard.json b/assets/undeadm-m1/models/item/wooden_halbard.json deleted file mode 100644 index 850ebbd..0000000 --- a/assets/undeadm-m1/models/item/wooden_halbard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_halbard", - "textures": { - "layer0": "undeadm-m1:item/wooden_halbard" - } -} diff --git a/assets/undeadm-m1/models/item/wooden_pike.json b/assets/undeadm-m1/models/item/wooden_pike.json deleted file mode 100644 index 598a818..0000000 --- a/assets/undeadm-m1/models/item/wooden_pike.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "undeadm-m1:item/weapon_pike", - "textures": { - "layer0": "undeadm-m1:item/wooden_pike" - } -} diff --git a/assets/undeadm-m1/textures/item/diamond_halbard_axe.png b/assets/undeadm-m1/textures/item/diamond_halbard_axe.png deleted file mode 100644 index 790fe00..0000000 Binary files a/assets/undeadm-m1/textures/item/diamond_halbard_axe.png and /dev/null differ diff --git a/assets/undeadm-m1/textures/item/diamond_halbard_pick.png b/assets/undeadm-m1/textures/item/diamond_halbard_pick.png deleted file mode 100644 index f842f56..0000000 Binary files a/assets/undeadm-m1/textures/item/diamond_halbard_pick.png and /dev/null differ diff --git a/assets/undeadm-m1/textures/item/diamond_mace.png b/assets/undeadm-m1/textures/item/diamond_mace.png deleted file mode 100644 index 5bc6ac6..0000000 Binary files a/assets/undeadm-m1/textures/item/diamond_mace.png and /dev/null differ diff --git a/assets/undeadm-m1/textures/item/empty.png b/assets/undeadm-m1/textures/item/empty.png new file mode 100644 index 0000000..5e4988e Binary files /dev/null and b/assets/undeadm-m1/textures/item/empty.png differ diff --git a/assets/undeadm-m1/textures/item/golden_halbard.png b/assets/undeadm-m1/textures/item/golden_halbard.png deleted file mode 100644 index ee4001b..0000000 Binary files a/assets/undeadm-m1/textures/item/golden_halbard.png and /dev/null differ diff --git a/assets/undeadm-m1/textures/item/iron_halbard.png b/assets/undeadm-m1/textures/item/iron_halbard.png deleted file mode 100644 index e51c30f..0000000 Binary files a/assets/undeadm-m1/textures/item/iron_halbard.png and /dev/null differ diff --git a/assets/undeadm-m1/textures/item/staff_corruption.png b/assets/undeadm-m1/textures/item/magic_weapon/staff_corruption.png similarity index 100% rename from assets/undeadm-m1/textures/item/staff_corruption.png rename to assets/undeadm-m1/textures/item/magic_weapon/staff_corruption.png diff --git a/assets/undeadm-m1/textures/item/staff_fire_blast.png b/assets/undeadm-m1/textures/item/magic_weapon/staff_fire_blast.png similarity index 100% rename from assets/undeadm-m1/textures/item/staff_fire_blast.png rename to assets/undeadm-m1/textures/item/magic_weapon/staff_fire_blast.png diff --git a/assets/undeadm-m1/textures/item/staff_living_earth.png b/assets/undeadm-m1/textures/item/magic_weapon/staff_living_earth.png similarity index 100% rename from assets/undeadm-m1/textures/item/staff_living_earth.png rename to assets/undeadm-m1/textures/item/magic_weapon/staff_living_earth.png diff --git a/assets/undeadm-m1/textures/item/staff_magic_missile.png b/assets/undeadm-m1/textures/item/magic_weapon/staff_magic_missile.png similarity index 100% rename from assets/undeadm-m1/textures/item/staff_magic_missile.png rename to assets/undeadm-m1/textures/item/magic_weapon/staff_magic_missile.png diff --git a/assets/undeadm-m1/textures/item/diamond_dagger.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_dagger.png similarity index 100% rename from assets/undeadm-m1/textures/item/diamond_dagger.png rename to assets/undeadm-m1/textures/item/melee_weapon/diamond_dagger.png diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_axe.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_axe.png new file mode 100644 index 0000000..760cbf6 Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_axe.png differ diff --git a/assets/undeadm-m1/textures/item/diamond_great_hammer.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_hammer.png similarity index 100% rename from assets/undeadm-m1/textures/item/diamond_great_hammer.png rename to assets/undeadm-m1/textures/item/melee_weapon/diamond_great_hammer.png diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_scimitar.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_scimitar.png new file mode 100644 index 0000000..c66ff3f Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_scimitar.png differ diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_sword.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_sword.png new file mode 100644 index 0000000..7ab67da Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_great_sword.png differ diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_halbard_a.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_halbard_a.png new file mode 100644 index 0000000..2edd664 Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_halbard_a.png differ diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_halbard_b.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_halbard_b.png new file mode 100644 index 0000000..419d8ce Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_halbard_b.png differ diff --git a/assets/undeadm-m1/textures/item/diamond_katana.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_katana.png similarity index 100% rename from assets/undeadm-m1/textures/item/diamond_katana.png rename to assets/undeadm-m1/textures/item/melee_weapon/diamond_katana.png diff --git a/assets/undeadm-m1/textures/item/diamond_pike.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_pike.png similarity index 100% rename from assets/undeadm-m1/textures/item/diamond_pike.png rename to assets/undeadm-m1/textures/item/melee_weapon/diamond_pike.png diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_scimitar.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_scimitar.png new file mode 100644 index 0000000..35b8d03 Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_scimitar.png differ diff --git a/assets/undeadm-m1/textures/item/wooden_staff.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_staff.png similarity index 100% rename from assets/undeadm-m1/textures/item/wooden_staff.png rename to assets/undeadm-m1/textures/item/melee_weapon/diamond_staff.png diff --git a/assets/undeadm-m1/textures/item/diamond_warhammer.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_warhammer_a.png similarity index 100% rename from assets/undeadm-m1/textures/item/diamond_warhammer.png rename to assets/undeadm-m1/textures/item/melee_weapon/diamond_warhammer_a.png diff --git a/assets/undeadm-m1/textures/item/melee_weapon/diamond_warhammer_b.png b/assets/undeadm-m1/textures/item/melee_weapon/diamond_warhammer_b.png new file mode 100644 index 0000000..f758d4a Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/diamond_warhammer_b.png differ diff --git a/assets/undeadm-m1/textures/item/golden_dagger.png b/assets/undeadm-m1/textures/item/melee_weapon/golden_dagger.png similarity index 100% rename from assets/undeadm-m1/textures/item/golden_dagger.png rename to assets/undeadm-m1/textures/item/melee_weapon/golden_dagger.png diff --git a/assets/undeadm-m1/textures/item/golden_katana.png b/assets/undeadm-m1/textures/item/melee_weapon/golden_katana.png similarity index 100% rename from assets/undeadm-m1/textures/item/golden_katana.png rename to assets/undeadm-m1/textures/item/melee_weapon/golden_katana.png diff --git a/assets/undeadm-m1/textures/item/golden_pike.png b/assets/undeadm-m1/textures/item/melee_weapon/golden_pike.png similarity index 100% rename from assets/undeadm-m1/textures/item/golden_pike.png rename to assets/undeadm-m1/textures/item/melee_weapon/golden_pike.png diff --git a/assets/undeadm-m1/textures/item/iron_dagger.png b/assets/undeadm-m1/textures/item/melee_weapon/iron_dagger.png similarity index 100% rename from assets/undeadm-m1/textures/item/iron_dagger.png rename to assets/undeadm-m1/textures/item/melee_weapon/iron_dagger.png diff --git a/assets/undeadm-m1/textures/item/iron_katana.png b/assets/undeadm-m1/textures/item/melee_weapon/iron_katana.png similarity index 100% rename from assets/undeadm-m1/textures/item/iron_katana.png rename to assets/undeadm-m1/textures/item/melee_weapon/iron_katana.png diff --git a/assets/undeadm-m1/textures/item/iron_pike.png b/assets/undeadm-m1/textures/item/melee_weapon/iron_pike.png similarity index 100% rename from assets/undeadm-m1/textures/item/iron_pike.png rename to assets/undeadm-m1/textures/item/melee_weapon/iron_pike.png diff --git a/assets/undeadm-m1/textures/item/netherite_axe.png b/assets/undeadm-m1/textures/item/melee_weapon/netherite_axe.png similarity index 100% rename from assets/undeadm-m1/textures/item/netherite_axe.png rename to assets/undeadm-m1/textures/item/melee_weapon/netherite_axe.png diff --git a/assets/undeadm-m1/textures/item/netherite_dagger.png b/assets/undeadm-m1/textures/item/melee_weapon/netherite_dagger.png similarity index 100% rename from assets/undeadm-m1/textures/item/netherite_dagger.png rename to assets/undeadm-m1/textures/item/melee_weapon/netherite_dagger.png diff --git a/assets/undeadm-m1/textures/item/netherite_halbard.png b/assets/undeadm-m1/textures/item/melee_weapon/netherite_halbard.png similarity index 100% rename from assets/undeadm-m1/textures/item/netherite_halbard.png rename to assets/undeadm-m1/textures/item/melee_weapon/netherite_halbard.png diff --git a/assets/undeadm-m1/textures/item/netherite_katana.png b/assets/undeadm-m1/textures/item/melee_weapon/netherite_katana.png similarity index 100% rename from assets/undeadm-m1/textures/item/netherite_katana.png rename to assets/undeadm-m1/textures/item/melee_weapon/netherite_katana.png diff --git a/assets/undeadm-m1/textures/item/netherite_pike.png b/assets/undeadm-m1/textures/item/melee_weapon/netherite_pike.png similarity index 100% rename from assets/undeadm-m1/textures/item/netherite_pike.png rename to assets/undeadm-m1/textures/item/melee_weapon/netherite_pike.png diff --git a/assets/undeadm-m1/textures/item/stone_dagger.png b/assets/undeadm-m1/textures/item/melee_weapon/stone_dagger.png similarity index 100% rename from assets/undeadm-m1/textures/item/stone_dagger.png rename to assets/undeadm-m1/textures/item/melee_weapon/stone_dagger.png diff --git a/assets/undeadm-m1/textures/item/stone_halbard.png b/assets/undeadm-m1/textures/item/melee_weapon/stone_halbard.png similarity index 100% rename from assets/undeadm-m1/textures/item/stone_halbard.png rename to assets/undeadm-m1/textures/item/melee_weapon/stone_halbard.png diff --git a/assets/undeadm-m1/textures/item/stone_katana.png b/assets/undeadm-m1/textures/item/melee_weapon/stone_katana.png similarity index 100% rename from assets/undeadm-m1/textures/item/stone_katana.png rename to assets/undeadm-m1/textures/item/melee_weapon/stone_katana.png diff --git a/assets/undeadm-m1/textures/item/stone_pike.png b/assets/undeadm-m1/textures/item/melee_weapon/stone_pike.png similarity index 100% rename from assets/undeadm-m1/textures/item/stone_pike.png rename to assets/undeadm-m1/textures/item/melee_weapon/stone_pike.png diff --git a/assets/undeadm-m1/textures/item/wooden_dagger.png b/assets/undeadm-m1/textures/item/melee_weapon/wooden_dagger.png similarity index 100% rename from assets/undeadm-m1/textures/item/wooden_dagger.png rename to assets/undeadm-m1/textures/item/melee_weapon/wooden_dagger.png diff --git a/assets/undeadm-m1/textures/item/wooden_halbard.png b/assets/undeadm-m1/textures/item/melee_weapon/wooden_halbard.png similarity index 100% rename from assets/undeadm-m1/textures/item/wooden_halbard.png rename to assets/undeadm-m1/textures/item/melee_weapon/wooden_halbard.png diff --git a/assets/undeadm-m1/textures/item/wooden_katana.png b/assets/undeadm-m1/textures/item/melee_weapon/wooden_katana.png similarity index 100% rename from assets/undeadm-m1/textures/item/wooden_katana.png rename to assets/undeadm-m1/textures/item/melee_weapon/wooden_katana.png diff --git a/assets/undeadm-m1/textures/item/wooden_pike.png b/assets/undeadm-m1/textures/item/melee_weapon/wooden_pike.png similarity index 100% rename from assets/undeadm-m1/textures/item/wooden_pike.png rename to assets/undeadm-m1/textures/item/melee_weapon/wooden_pike.png diff --git a/assets/undeadm-m1/textures/item/melee_weapon/wooden_staff.png b/assets/undeadm-m1/textures/item/melee_weapon/wooden_staff.png new file mode 100644 index 0000000..d788ce8 Binary files /dev/null and b/assets/undeadm-m1/textures/item/melee_weapon/wooden_staff.png differ diff --git a/assets/undeadm-m1/textures/item/potion/gender_change_potion.png b/assets/undeadm-m1/textures/item/potion/gender_change_potion.png new file mode 100644 index 0000000..8ee9f5a Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/gender_change_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/gravitation_potion.png b/assets/undeadm-m1/textures/item/potion/gravitation_potion.png new file mode 100644 index 0000000..80daae0 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/gravitation_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/inferno_potion.png b/assets/undeadm-m1/textures/item/potion/inferno_potion.png new file mode 100644 index 0000000..8db02e8 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/inferno_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/ironskin_potion.png b/assets/undeadm-m1/textures/item/potion/ironskin_potion.png new file mode 100644 index 0000000..7ea0d3a Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/ironskin_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/lifeforce_potion.png b/assets/undeadm-m1/textures/item/potion/lifeforce_potion.png new file mode 100644 index 0000000..1ac8ce0 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/lifeforce_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/love_potion.png b/assets/undeadm-m1/textures/item/potion/love_potion.png new file mode 100644 index 0000000..5e3d187 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/love_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/recall_potion.png b/assets/undeadm-m1/textures/item/potion/recall_potion.png new file mode 100644 index 0000000..b0fcb25 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/recall_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/return_potion.png b/assets/undeadm-m1/textures/item/potion/return_potion.png new file mode 100644 index 0000000..8875d18 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/return_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/splash_potion.png b/assets/undeadm-m1/textures/item/potion/splash_potion.png new file mode 100644 index 0000000..0d3fa39 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/splash_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/stink_potion.png b/assets/undeadm-m1/textures/item/potion/stink_potion.png new file mode 100644 index 0000000..d4d7d68 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/stink_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/teleport_potion.png b/assets/undeadm-m1/textures/item/potion/teleport_potion.png new file mode 100644 index 0000000..37d9632 Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/teleport_potion.png differ diff --git a/assets/undeadm-m1/textures/item/potion/waterwalking_potion.png b/assets/undeadm-m1/textures/item/potion/waterwalking_potion.png new file mode 100644 index 0000000..f116a4c Binary files /dev/null and b/assets/undeadm-m1/textures/item/potion/waterwalking_potion.png differ diff --git a/custom_mode_data_guide.md b/custom_mode_data_guide.md new file mode 100644 index 0000000..7b17616 --- /dev/null +++ b/custom_mode_data_guide.md @@ -0,0 +1,67 @@ +CUSTOM MODEL DATA NUMBERING FORMAT + + "UMMXXYY" + +Where: + U = Unique Project Num (For minecraft expanded, 1) + MM = Module Num (01,02,03,etc) + XX = Item Category (Melee weapon, Magic Weapon, Potion, Ranged Weapon, etc) + YY = Item Identifier (Each unique item model) + + This allows for up to 100 unique items per up to 100 item categories per up to 100 modules. cool! + + Each entry here will be structured as: + UMMXXYY, base_model, -> Custom Item + +PROJECT EXPANDED (23) + + MODULE 0 Core (00) + + + + MODULE 1 Combat (01) + + > (00) MELEE WEAPONS + 1010000, sword -> Scimitar + 1010001, sword -> Dagger + 1010002, axe -> Great Axe + 1010003, sword -> Great Scimitar + 1010004, shovel -> Great Hammer + 1010005, sword -> Great Sword + 1010006, shovel -> Halberd (Side A) + 1010007, axe -> Halberd (Side B) + 1010008, sword -> Katana + 1010009, axe -> Pike + 1010010, axe -> Pike (Forward) + 1010011, shovel -> Staff + 1010012, shovel -> Warhammer (Side A) + 1010013, axe -> Warhammer (Side B) + + > (01) RANGED WEAPONS + + + + > (02) MAGIC WEAPONS + 1010200, carrot_on_a_stick -> Magic Missile Staff + 1010201, carrot_on_a_stick -> Fire Blast Staff + 1010202, carrot_on_a_stick -> Ice Shard Staff + 1010203, carrot_on_a_stick -> Living Earth Staff + 1010204, carrot_on_a_stick -> Bone Dancer Staff + + > (03) POTIONS + 1010300, potion -> Potion of Gender Change + 1010301, potion -> Potion of Gravitation + 1010302, potion -> Potion of Inferno + 1010303, potion -> Potion of Ironskin + 1010304, potion -> Potion of Lifeforce + 1010305, splash_potion -> Potion of Love + 1010306, potion -> Potion of Recall + 1010307, potion -> Potion of Return + 1010308, splash_potion -> Potion of Stink + 1010309, potion -> Potion of Teleport + 1010310, potion -> Potion of Waterwalking + + > (04) TRINKETS + 1010400, clock -> Zephyrian Shell + 1010401, clock -> Olidia's Blessing + 1010402, clock -> Bloodthirsty Amulet diff --git a/pack.mcmeta b/pack.mcmeta index daa144e..10a3426 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format":6, - "description":"Files for UndeadMaelys' Expansion Packs" + "pack_format": 7, + "description": "Files for UndeadMaelys' Minecraft Expanded Pack" } }