README.md

@@ -1,28 +1,56 @@
-UndeadMaelys' Expansion Packs
+UndeadMaelys' Expansion Resource Packs
 
-0 - Core
-	MANDATORY for all packs to work.
+0 - Core Assets
+	MANDATORY for all resourcepack variations to work.
+
+	OPTIONAL FEATURES (you can safely remove them from the datapack)
+
+	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 (some with custom mechanics):
+	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)
 
-	MODIFIES minecraft base weapons, the Sword and the Axe.
-	1 - Sword damage values stay the same.
-	2 - Axe has modified damage and speed values.
+	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
 
-	ADDS custom magic staves:
-  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

TODO.md

@@ -1,22 +1,17 @@
 
-Potion effects
-	x only done love potion & gravitation
-		! fix bug with throwable custom potions
-    x only planned so far
+Draw Melee Weapons & make sure all tiers avaliable
+	x left:
+		x scimitar & great scimitar
+		x great sword
+		x great axe
+		x staves
 
-  Do wands
-  	x only magic misile & fire Blast
-  		! make sure to check fire blast
+Fix models for melee weapons
+	x only diamond done
 
-  Give for all melee weapon
-  	x only netherite dagger done & vanilla sword
+Functionality for melee weapons
+	x none done
 
-  Give for wands
-  	x only for magic misile
-
-  Give for trinkets
-  	x none done
-
-Create durability system using item modifiers
-Create custom craftings using custom hidden advancements
-Create vanilla weapon stats replacements via custom hidden achievements
+Draw trinkets
+	x Olidia's Blessing: Golden, Cian amulet
+	x Zephyrian Shell: Prettified Nautilus shell

assets/minecraft/lang/en_us.json

@@ -0,0 +1,122 @@
+{
+  "entity.villager.name.0": "Elend",
+  "entity.villager.name.1": "Redeema",
+  "entity.villager.name.2": "Simon",
+  "entity.villager.name.3": "Rowen",
+  "entity.villager.name.4": "Gavin",
+  "entity.villager.name.5": "Alyna",
+  "entity.villager.name.6": "Genaveve",
+  "entity.villager.name.7": "Arthur",
+  "entity.villager.name.8": "Mab",
+  "entity.villager.name.9": "Balan",
+  "entity.villager.name.10": "Rubyn",
+  "entity.villager.name.11": "Branwyne",
+  "entity.villager.name.12": "Seyua",
+  "entity.villager.name.13": "Ferrand",
+  "entity.villager.name.14": "Trixie",
+  "entity.villager.name.15": "Leif",
+  "entity.villager.name.16": "Osborn",
+  "entity.villager.name.17": "Greta",
+  "entity.villager.name.18": "Avery",
+  "entity.villager.name.19": "Mitch",
+  "entity.villager.name.20": "Maat",
+  "entity.villager.name.21": "Bram",
+  "entity.villager.name.22": "Qwen",
+  "entity.villager.name.23": "Ariel",
+  "entity.villager.name.24": "Gilnem",
+  "entity.villager.name.25": "Jacquel",
+  "entity.villager.name.26": "Theorom",
+  "entity.villager.name.27": "Frey",
+  "entity.villager.name.28": "Percyval",
+  "entity.villager.name.29": "Odette",
+  "entity.villager.name.30": "Ceccil",
+  "entity.villager.name.31": "Rosalind",
+  "entity.villager.name.32": "Ida",
+  "entity.villager.name.33": "Jakob",
+  "entity.villager.name.34": "Amarran",
+  "entity.villager.name.35": "Lois",
+  "entity.villager.name.36": "Jaq",
+  "entity.villager.name.37": "Syldara",
+  "entity.villager.name.38": "Boenn",
+  "entity.villager.name.39": "Myr",
+  "entity.villager.name.40": "Heon",
+  "entity.villager.name.41": "Megido",
+  "entity.villager.name.42": "Elsakar",
+  "entity.villager.name.43": "Bec",
+  "entity.villager.name.44": "En",
+  "entity.villager.name.45": "Pat",
+  "entity.villager.name.46": "Ayano",
+  "entity.villager.name.47": "Iliya",
+  "entity.villager.name.48": "Amek",
+  "entity.villager.name.49": "Yondor",
+  "entity.villager.name.50": "Era",
+  "entity.villager.name.51": "Bo",
+  "entity.villager.name.52": "Terris",
+  "entity.villager.name.53": "Lilia",
+  "entity.villager.name.54": "Mendings",
+  "entity.villager.name.55": "Emeralds",
+  "entity.villager.name.56": "Alais",
+  "entity.villager.name.57": "Lang",
+  "entity.villager.name.58": "Beep",
+  "entity.villager.name.59": "Drone",
+  "entity.villager.name.60": "Betsy",
+  "entity.villager.name.61": "Bender",
+  "entity.villager.name.62": "Orph",
+  "entity.villager.name.63": "Mik",
+  "entity.villager.name.64": "Lanka",
+  "entity.villager.name.65": "Tera",
+  "entity.villager.name.66": "Sgeinz",
+  "entity.villager.name.67": "Hammar",
+  "entity.villager.name.68": "Tephra",
+  "entity.villager.name.69": "Ysara",
+  "entity.villager.name.70": "Pascal",
+  "entity.villager.name.71": "Celestine",
+  "entity.villager.name.72": "Sigar",
+  "entity.villager.name.73": "Ave",
+  "entity.villager.name.74": "Elliot",
+  "entity.villager.name.75": "Uri",
+  "entity.villager.name.76": "Sabel",
+  "entity.villager.name.77": "Love",
+  "entity.villager.name.78": "Edith",
+  "entity.villager.name.79": "Quintus",
+  "entity.villager.name.80": "Azuria",
+  "entity.villager.name.81": "Zeph",
+  "entity.villager.name.82": "Syv",
+  "entity.villager.name.83": "Hue",
+  "entity.villager.name.84": "Mazareen",
+  "entity.villager.name.85": "Thora",
+  "entity.villager.name.86": "Katryra",
+  "entity.villager.name.87": "Ignas",
+  "entity.villager.name.88": "Everside",
+  "entity.villager.name.89": "Dandy",
+  "entity.villager.name.90": "Mael",
+  "entity.villager.name.91": "Ivette",
+  "entity.villager.name.92": "Dazhiel",
+  "entity.villager.name.93": "Lars",
+  "entity.villager.name.94": "Milo",
+  "entity.villager.name.95": "Edmund",
+  "entity.villager.name.96": "Ulfric",
+  "entity.villager.name.97": "Jonah",
+  "entity.villager.name.98": "Quinn",
+  "entity.villager.name.99": "Fefeta",
+  "entity.villager.talk.armorer.0": "Do you have any coal left? I'm running a bit low. I'll pay you.",
+  "entity.villager.talk.armorer.1": "It would be nice if you could bring me materials to work with. A few iron ingots will do.",
+  "entity.villager.talk.armorer.2a": "I'll buy that shiny gem from you, I need it for a project I'm working on.",
+  "entity.villager.talk.armorer.2b": "I'm yet interested in gathering more diamonds. I'm running extra tests to try to make some shiny chestplate and leggings.",
+  "entity.villager.talk.armorer.2c": "I'm always willing to buy some diamonds.",
+  "entity.villager.talk.armorer.3": "By chance could you bring me some lava?",
+  "entity.villager.talk.armorer.4": "I just crafted some bells, do you want to acquire any?",
+  "entity.villager.talk.armorer.5": "Get this shield from me and not even explosions will hurt you!",
+  "entity.villager.talk.armorer.6": "Adventurers need good armor to venture through the world.",
+  "entity.villager.talk.armorer.7": "This will protect your body from arrows, bites, swords and even explosions!",
+  "entity.villager.talk.armorer.8": "Protect yourself with my latest iron leggings!",
+  "entity.villager.talk.armorer.9": "Careful where you set your foot. Buy me some boots and you'll have no problem.",
+  "entity.villager.talk.armorer.10": "A chainmail helmet is a good complement to an iron armor.",
+  "entity.villager.talk.armorer.11": "Chainmail armor is rare nowadays, may you be interested in it?",
+  "entity.villager.talk.armorer.12": "These leggings are lighter than the usual iron. Good for travel.",
+  "entity.villager.talk.armorer.13": "Wanna buy these chainmail boots?",
+  "entity.villager.talk.armorer.14": "Do you fancy a new shiny helmet? It also glows faintly in the dark.",
+  "entity.villager.talk.armorer.15": "I don't know much about magic, but this is a great deal, I assure you.",
+  "entity.villager.talk.armorer.16": "I have new armor, empowered by effective enchantments!",
+  "entity.villager.talk.armorer.17": "I forged these by the careful instructions of some ancient books, so they must be very powerful boots. They could secure adventuring through the deepest of dungeons, so take a close look at them."
+}

assets/minecraft/models/item/carrot_on_a_stick.json

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "textures": {
+    "layer0": "minecraft:item/carrot_on_a_stick"
+  },
+  "overrides": [
+  	{ "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" }
+  ]
+}

assets/minecraft/models/item/diamond_axe.json

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/diamond_axe"
+  },
+  "overrides": [
+    { "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" }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/diamond_sword"
+  },
+  "overrides": [
+    { "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/generated.json

@@ -0,0 +1,30 @@
+{
+    "parent": "builtin/generated",
+    "gui_light": "front",
+    "display": {
+        "ground": {
+            "rotation": [ 90, 0, 0 ],
+            "translation": [ 0, -1, 0],
+            "scale":[ 0.5, 0.5, 0.5 ]
+        },
+        "head": {
+            "rotation": [ 0, 180, 0 ],
+            "translation": [ 0, 13, 7],
+            "scale":[ 1, 1, 1]
+        },
+        "thirdperson_righthand": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 0, 3, 1 ],
+            "scale": [ 0.55, 0.55, 0.55 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, -90, 25 ],
+            "translation": [ 1.13, 3.2, 1.13],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        },
+        "fixed": {
+            "rotation": [ 0, 180, 0 ],
+            "scale": [ 1, 1, 1 ]
+        }
+    }
+}

assets/minecraft/models/item/golden_axe.json

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/golden_axe"
+  },
+  "overrides": [
+    { "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" }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/golden_sword"
+  },
+  "overrides": [
+    { "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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/iron_axe"
+  },
+  "overrides": [
+    { "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" }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/iron_sword"
+  },
+  "overrides": [
+    { "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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/netherite_axe"
+  },
+  "overrides": [
+    { "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" }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/netherite_sword"
+  },
+  "overrides": [
+    { "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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/stone_axe"
+  },
+  "overrides": [
+    { "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" }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/stone_sword"
+  },
+  "overrides": [
+    { "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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/wooden_axe"
+  },
+  "overrides": [
+    { "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" }
+  ]
+}

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

@@ -0,0 +1,13 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "minecraft:item/wooden_sword"
+  },
+  "overrides": [
+    { "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/base_magic_staff.json

@@ -0,0 +1,34 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "undeadm-m1:item/staff_magic_missile"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [68, -90, 55],
+			"translation": [0, 2.5, 4.5],
+			"scale": [2.55, 2.55, 0.85]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [68, 90, -55],
+			"translation": [0, 2.5, 4],
+			"scale": [2.55, 2.55, 0.85]
+		},
+		"firstperson_righthand": {
+			"rotation": [-40, -90, 25],
+			"translation": [3.87, 3.2, 0.87],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-40, 90, -25],
+			"translation": [4.13, 3.2, 1.13],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"ground": {
+			"rotation": [90, -180, 0],
+			"translation": [0, -3.5, 0],
+			"scale": [2, 2, 1]
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "undeadm-m1:item/diamond_halbard"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [68, -90, 55],
+			"translation": [0, 4, 8],
+			"scale": [2.55, 2.55, 0.85]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [68, 90, -55],
+			"translation": [0, 4, 8],
+			"scale": [2.55, 2.55, 0.85]
+		},
+		"firstperson_righthand": {
+			"rotation": [-40, -90, 25],
+			"translation": [3.87, 3.2, 0.87],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-40, 90, -25],
+			"translation": [4.13, 3.2, 1.13],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"ground": {
+			"scale": [3, 3, 1]
+		}
+	}
+}

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

@@ -0,0 +1,31 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "undeadm-m1:item/diamond_warhammer"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [35, -90, 55],
+			"translation": [0, 4.5, 4.5],
+			"scale": [1.275, 1.275, 0.85]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [35, 90, -55],
+			"translation": [0, 4, 3.5],
+			"scale": [1.28, 1.275, 0.85]
+		},
+		"firstperson_righthand": {
+			"rotation": [-40, -90, 25],
+			"translation": [3.87, 3.2, 0.87],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-40, 90, -25],
+			"translation": [4.13, 3.2, 1.13],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"ground": {
+			"scale": [3, 3, 1]
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "undeadm-m1:item/melee_weapon/diamond_katana"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 89, 55],
+			"translation": [0, 8, 4],
+			"scale": [1.275, 1.275, 0.85]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [35, 90, -55],
+			"translation": [0, 4, 3.5],
+			"scale": [1.28, 1.275, 0.85]
+		},
+		"firstperson_righthand": {
+			"rotation": [-40, -90, 25],
+			"translation": [3.87, 3.2, 0.87],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-40, 90, -25],
+			"translation": [4.13, 3.2, 1.13],
+			"scale": [2.04, 2.04, 0.68]
+		},
+		"ground": {
+			"scale": [3, 3, 1]
+		}
+	}
+}

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

@@ -0,0 +1,33 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "undeadm-m1:item/diamond_pike"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, -90, 55],
+			"translation": [0, 9, 21.25],
+			"scale": [3.4, 3.4, 0.85]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 90, -55],
+			"translation": [0, 9, 21.25],
+			"scale": [3.4, 3.4, 0.85]
+		},
+		"firstperson_righthand": {
+			"rotation": [-20, -90, 25],
+			"translation": [3.87, 3.2, 0.87],
+			"scale": [2.72, 2.72, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-20, 90, -25],
+			"translation": [4.13, 3.2, 1.13],
+			"scale": [2.72, 2.72, 0.68]
+		},
+		"head": {
+			"rotation": [0, 0, -45],
+			"scale": [4, 4, 4]
+		}
+	}
+}

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/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/particles/snowflake.json

@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "undeadm-m1:snowflake"
+  ]
+}

assets/undeadm-m1/sounds.json

@@ -0,0 +1,24 @@
+{
+	"entity.magic_missile.spawn": {
+		"from":"freesounds.org",
+		"creator":"spookymodem",
+		"audio_id": 249817,
+		"sounds": [
+			{
+				"name": "undeadm-m1:entity/magic_missile/spawn",
+				"volume": 0.5
+			}
+		]
+  },
+	"entity.magic_missile.die": {
+		"from":"freesounds.org",
+		"creator":"bertz",
+		"audio_id": 500911,
+		"sounds": [
+			{
+				"name": "undeadm-m1:entity/magic_missile/die",
+				"volume": 0.5
+			}
+		]
+  }
+}