Merge pull request #80 from Alathra/feat/xavbeat03

Xavbeat03 · web-flow · commit e62f7f8bcad0 · 2024-12-18T17:04:44.000-05:00
feat: adding christmas tools and weapon
diff --git a/assets/minecraft/models/item/diamond_axe.json b/assets/minecraft/models/item/diamond_axe.json
@@ -19,6 +19,7 @@
 		{ "predicate": {"custom_model_data": 543}, "model": "item/weapons/diamond_axe/diamond_hammer"},
 		{ "predicate": {"custom_model_data": 544}, "model": "item/weapons/diamond_axe/diamond_guisarme"},
 		{ "predicate": {"custom_model_data": 545}, "model": "item/weapons/diamond_axe/eric_hammer"},
+		{ "predicate": {"custom_model_data": 2000}, "model": "item/tools/diamond/christmas_chopper"},
 		{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_axe"}
 	]
 }
diff --git a/assets/minecraft/models/item/diamond_hoe.json b/assets/minecraft/models/item/diamond_hoe.json
@@ -4,6 +4,8 @@
         "layer0": "minecraft:item/diamond_hoe"
     },
 	"overrides": [
+		{ "predicate": {"custom_model_data": 2000}, "model": "item/tools/diamond/christmas_harvester"},
 		{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_hoe"}
-	]
+	
+    ]
 }
diff --git a/assets/minecraft/models/item/diamond_pickaxe.json b/assets/minecraft/models/item/diamond_pickaxe.json
@@ -0,0 +1,9 @@
+{
+    "parent": "minecraft:item/handheld",
+    "textures": {
+        "layer0": "minecraft:item/diamond_shovel"
+    },
+	"overrides": [
+		{ "predicate": {"custom_model_data": 2000}, "model": "item/tools/diamond/christmas_miner"}
+	]
+}
diff --git a/assets/minecraft/models/item/diamond_shovel.json b/assets/minecraft/models/item/diamond_shovel.json
@@ -0,0 +1,9 @@
+{
+    "parent": "minecraft:item/handheld",
+    "textures": {
+        "layer0": "minecraft:item/diamond_shovel"
+    },
+	"overrides": [
+		{ "predicate": {"custom_model_data": 2000}, "model": "item/tools/diamond/christmas_digger"}
+	]
+}
diff --git a/assets/minecraft/models/item/diamond_sword.json b/assets/minecraft/models/item/diamond_sword.json
@@ -37,6 +37,8 @@
 		{ "predicate": {"custom_model_data": 358}, "model": "item/weapons/diamond_sword/diamond_lance"},
 		{ "predicate": {"custom_model_data": 359}, "model": "item/weapons/diamond_sword/diamond_leviathan_blade"},
 		{ "predicate": {"custom_model_data": 1000}, "model": "block/custom/skysplitter"},
+		{ "predicate": {"custom_model_data": 2000}, "model": "item/weapons/diamond_sword/christmas_basher"},
+		
 		{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_knife"}
 	]
 }
diff --git a/assets/minecraft/models/item/tools/diamond/christmas_chopper.json b/assets/minecraft/models/item/tools/diamond/christmas_chopper.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "item/tools/diamond/christmas_chopper"
+    }
+}
diff --git a/assets/minecraft/models/item/tools/diamond/christmas_digger.json b/assets/minecraft/models/item/tools/diamond/christmas_digger.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "item/tools/diamond/christmas_digger"
+    }
+}
diff --git a/assets/minecraft/models/item/tools/diamond/christmas_harvester.json b/assets/minecraft/models/item/tools/diamond/christmas_harvester.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "item/tools/diamond/christmas_harvester"
+    }
+}
diff --git a/assets/minecraft/models/item/tools/diamond/christmas_miner.json b/assets/minecraft/models/item/tools/diamond/christmas_miner.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "item/tools/diamond/christmas_miner"
+    }
+}
diff --git a/assets/minecraft/models/item/weapons/diamond_sword/christmas_basher.json b/assets/minecraft/models/item/weapons/diamond_sword/christmas_basher.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/handheld",
+    "textures": {
+        "layer0": "item/weapons/diamond/christmas_basher"
+    }
+}
diff --git a/assets/minecraft/textures/item/tools/diamond/christmas_chopper.png b/assets/minecraft/textures/item/tools/diamond/christmas_chopper.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3fd1455980ce81edffdc7b096f663e975d015051e60c9147137c17594dd8d0d
+size 310
diff --git a/assets/minecraft/textures/item/tools/diamond/christmas_digger.png b/assets/minecraft/textures/item/tools/diamond/christmas_digger.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f45284581480cb0d3ba6efcd731ce2a8b5fa3edbd9661550a205cf2d4d3490d
+size 277
diff --git a/assets/minecraft/textures/item/tools/diamond/christmas_harvester.png b/assets/minecraft/textures/item/tools/diamond/christmas_harvester.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e586610bca09e83808abb8c8b1f3a149c74b6c6ef27c219bd8835c9feda9efc9
+size 288
diff --git a/assets/minecraft/textures/item/tools/diamond/christmas_miner.png b/assets/minecraft/textures/item/tools/diamond/christmas_miner.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84ceead54ede6021e4256e16872a3dbcad2e95c8cded1a68f8260f6ef466d2a0
+size 382
diff --git a/assets/minecraft/textures/item/weapons/diamond/christmas_basher.png b/assets/minecraft/textures/item/weapons/diamond/christmas_basher.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2182ccbbd12428b54e03f6ba57fb6b0a02947c8f9e2e1ead68d1032032bc6019
+size 315

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`{ "predicate": {"custom_model_data": 543}, "model": "item/weapons/diamond_axe/diamond_hammer"},`
`20`	`20`	`{ "predicate": {"custom_model_data": 544}, "model": "item/weapons/diamond_axe/diamond_guisarme"},`
`21`	`21`	`{ "predicate": {"custom_model_data": 545}, "model": "item/weapons/diamond_axe/eric_hammer"},`
	`22`	`+ { "predicate": {"custom_model_data": 2000}, "model": "item/tools/diamond/christmas_chopper"},`
`22`	`23`	`{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_axe"}`
`23`	`24`	`]`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@`
`37`	`37`	`{ "predicate": {"custom_model_data": 358}, "model": "item/weapons/diamond_sword/diamond_lance"},`
`38`	`38`	`{ "predicate": {"custom_model_data": 359}, "model": "item/weapons/diamond_sword/diamond_leviathan_blade"},`
`39`	`39`	`{ "predicate": {"custom_model_data": 1000}, "model": "block/custom/skysplitter"},`
	`40`	`+ { "predicate": {"custom_model_data": 2000}, "model": "item/weapons/diamond_sword/christmas_basher"},`
	`41`	`+`
`40`	`42`	`{ "predicate": {"custom_model_data": 14700}, "model": "item/extras/halloween_knife"}`
`41`	`43`	`]`
`42`	`44`	`}`