Repositioned files & organized custom model data.

Added txt to serve as model files convention

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
+	ADDS custom potions:
-  2 - Fire Blast Staff
+	1 - Potion of Gender Change
-  3 - Ice Shock Staff
+  2 - Potion of Gravitation
-  4 - Bone Dancer Staff
+  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
-

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

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": 1010200}, "model": "undeadm-m1:item/magic/staff_magic_missile" },
-  	{ "predicate": { "custom_model_data": 2202}, "model": "undeadm-m1:item/staff_fire_blast" },
+  	{ "predicate": { "custom_model_data": 1010201}, "model": "undeadm-m1:item/magic/staff_fire_blast" },
-  	{ "predicate": { "custom_model_data": 2203}, "model": "undeadm-m1:item/staff_living_earth" },
+  	{ "predicate": { "custom_model_data": 1010202}, "model": "undeadm-m1:item/magic/staff_ice_shard" },
-  	{ "predicate": { "custom_model_data": 2204}, "model": "undeadm-m1:item/staff_corruption" },
+  	{ "predicate": { "custom_model_data": 1010203}, "model": "undeadm-m1:item/magic/staff_living_earth" },
-  	{ "predicate": { "custom_model_data": 2205}, "model": "undeadm-m1:item/staff_fire_blast" }
+  	{ "predicate": { "custom_model_data": 1010204}, "model": "undeadm-m1:item/magic/staff_bone_dancer" }
   ]
 }

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": 1010002}, "model": "undeadm-m1:item/melee_weapon/diamond_great_axe" },
-  	{ "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/diamond_pike" }
+    { "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" }
   ]
 }

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" }
+  ]
+}

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" }
   ]
 }

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": 1010002}, "model": "undeadm-m1:item/melee_weapon/golden_great_axe" },
-  	{ "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/golden_pike" }
+    { "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" }
   ]
 }

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" }
+  ]
+}

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" }
   ]
 }

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": 1010002}, "model": "undeadm-m1:item/melee_weapon/iron_great_axe" },
-  	{ "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/iron_pike" }
+    { "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" }
   ]
 }

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" }
+  ]
+}

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" }
   ]
 }

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": 1010002}, "model": "undeadm-m1:item/melee_weapon/netherite_great_axe" },
-  	{ "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/netherite_pike" }
+    { "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" }
   ]
 }

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" }
+  ]
+}

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" }
   ]
 }

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" }
+  ]
+}

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" }
+  ]
+}

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": 1010002}, "model": "undeadm-m1:item/melee_weapon/stone_great_axe" },
-  	{ "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/stone_pike" }
+    { "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" }
   ]
 }

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" }
+  ]
+}

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" }
   ]
 }

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": 1010002}, "model": "undeadm-m1:item/melee_weapon/wooden_great_axe" },
-  	{ "predicate": { "custom_model_data": 2302}, "model": "undeadm-m1:item/wooden_pike" }
+    { "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" }
   ]
 }

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" }
+  ]
+}

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" }
   ]
 }

assets/undeadm-m1/models/item/diamond_dagger.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "undeadm-m1:item/diamond_dagger"
-	}
-}

assets/undeadm-m1/models/item/diamond_halbard.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_halbard",
-	"textures": {
-		"layer0": "undeadm-m1:item/diamond_halbard"
-	}
-}

assets/undeadm-m1/models/item/diamond_pike.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_pike",
-	"textures": {
-		"layer0": "undeadm-m1:item/diamond_pike"
-	}
-}

assets/undeadm-m1/models/item/golden_dagger.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "undeadm-m1:item/golden_dagger"
-	}
-}

assets/undeadm-m1/models/item/golden_halbard.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_halbard",
-	"textures": {
-		"layer0": "undeadm-m1:item/golden_halbard"
-	}
-}

assets/undeadm-m1/models/item/golden_pike.json

@@ -1,6 +0,0 @@
-    {
-  "parent": "undeadm-m1:item/weapon_pike",
-	"textures": {
-		"layer0": "undeadm-m1:item/golden_pike"
-	}
-}

assets/undeadm-m1/models/item/iron_dagger.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "undeadm-m1:item/iron_dagger"
-	}
-}

assets/undeadm-m1/models/item/iron_halbard.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_halbard",
-	"textures": {
-		"layer0": "undeadm-m1:item/iron_halbard"
-	}
-}

assets/undeadm-m1/models/item/iron_pike.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_pike",
-	"textures": {
-		"layer0": "undeadm-m1:item/iron_pike"
-	}
-}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

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"
+	}
+}

assets/undeadm-m1/models/item/netherite_dagger.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "undeadm-m1:item/netherite_dagger"
-	}
-}

assets/undeadm-m1/models/item/netherite_halbard.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_halbard",
-	"textures": {
-		"layer0": "undeadm-m1:item/netherite_halbard"
-	}
-}

assets/undeadm-m1/models/item/netherite_pike.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_pike",
-	"textures": {
-		"layer0": "undeadm-m1:item/netherite_pike"
-	}
-}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

assets/undeadm-m1/models/item/staff_corruption.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_staff",
-	"textures": {
-		"layer0": "undeadm-m1:item/staff_corruption"
-	}
-}

assets/undeadm-m1/models/item/staff_fire_blast.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_staff",
-	"textures": {
-		"layer0": "undeadm-m1:item/staff_fire_blast"
-	}
-}

assets/undeadm-m1/models/item/staff_living_earth.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_staff",
-	"textures": {
-		"layer0": "undeadm-m1:item/staff_living_earth"
-	}
-}

assets/undeadm-m1/models/item/staff_magic_missile.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_staff",
-	"textures": {
-		"layer0": "undeadm-m1:item/staff_magic_missile"
-	}
-}

assets/undeadm-m1/models/item/stone_dagger.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "undeadm-m1:item/stone_dagger"
-	}
-}

assets/undeadm-m1/models/item/stone_halbard.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_halbard",
-	"textures": {
-		"layer0": "undeadm-m1:item/stone_halbard"
-	}
-}

assets/undeadm-m1/models/item/stone_pike.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_pike",
-	"textures": {
-		"layer0": "undeadm-m1:item/stone_pike"
-	}
-}

assets/undeadm-m1/models/item/wooden_dagger.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "undeadm-m1:item/wooden_dagger"
-	}
-}

assets/undeadm-m1/models/item/wooden_halbard.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_halbard",
-	"textures": {
-		"layer0": "undeadm-m1:item/wooden_halbard"
-	}
-}

assets/undeadm-m1/models/item/wooden_pike.json

@@ -1,6 +0,0 @@
-{
-  "parent": "undeadm-m1:item/weapon_pike",
-	"textures": {
-		"layer0": "undeadm-m1:item/wooden_pike"
-	}
-}