Merge pull request #109 from freeserverproject/develop

halloween update
freeserverproject · Oct 31, 2022 · 72396d1 · 72396d1
2 parents 37fd93a + 6869f48
commit 72396d1
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 2 deletions.
diff --git a/pack/assets/minecraft/models/hats/witch_hat.json b/pack/assets/minecraft/models/hats/witch_hat.json
@@ -0,0 +1,134 @@
+{
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "block/black_wool",
+		"1": "block/cyan_wool",
+		"particle": "block/black_wool"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 2, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
+				"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
+				"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
+				"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3, 1.5, 3],
+			"to": [13, 2.5, 13],
+			"faces": {
+				"north": {"uv": [0, 0, 10, 1], "texture": "#1"},
+				"east": {"uv": [0, 0, 10, 1], "texture": "#1"},
+				"south": {"uv": [0, 0, 10, 1], "texture": "#1"},
+				"west": {"uv": [0, 0, 10, 1], "texture": "#1"},
+				"up": {"uv": [0, 0, 10, 10], "texture": "#1"},
+				"down": {"uv": [0, 0, 10, 10], "texture": "#1"}
+			}
+		},
+		{
+			"from": [3, 2.5, 3],
+			"to": [13, 6.75, 13],
+			"faces": {
+				"north": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
+				"east": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
+				"south": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
+				"west": {"uv": [0, 0, 10, 4.25], "texture": "#0"},
+				"up": {"uv": [0, 0, 10, 10], "texture": "#0"},
+				"down": {"uv": [0, 0, 10, 10], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3.5, 3.75, 3.75],
+			"to": [12.5, 9.25, 13.75],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4.375, 8]},
+			"faces": {
+				"north": {"uv": [0, 0, 9, 5.5], "texture": "#0"},
+				"east": {"uv": [0, 0, 10, 5.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 9, 5.5], "texture": "#0"},
+				"west": {"uv": [0, 0, 10, 5.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 9, 10], "texture": "#0"},
+				"down": {"uv": [0, 0, 9, 10], "texture": "#0"}
+			}
+		},
+		{
+			"from": [3.75, 4.02297, 8.83363],
+			"to": [12, 10.02297, 16.58363],
+			"rotation": {"angle": 45, "axis": "x", "origin": [8, 9.14797, 13.83363]},
+			"faces": {
+				"north": {"uv": [0, 0, 8.25, 6], "texture": "#0"},
+				"east": {"uv": [0, 0, 7.75, 6], "texture": "#0"},
+				"south": {"uv": [0, 0, 8.25, 6], "texture": "#0"},
+				"west": {"uv": [0, 0, 7.75, 6], "texture": "#0"},
+				"up": {"uv": [0, 0, 8.25, 7.75], "texture": "#0"},
+				"down": {"uv": [0, 0, 8.25, 7.75], "texture": "#0"}
+			}
+		},
+		{
+			"from": [5.5, 5.52297, 9.83363],
+			"to": [10.25, 11.52297, 14.58363],
+			"rotation": {"angle": 45, "axis": "x", "origin": [8, 9.14797, 13.83363]},
+			"faces": {
+				"north": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
+				"east": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
+				"south": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
+				"west": {"uv": [0, 0, 4.75, 6], "texture": "#0"},
+				"up": {"uv": [0, 0, 4.75, 4.75], "texture": "#0"},
+				"down": {"uv": [0, 0, 4.75, 4.75], "texture": "#0"}
+			}
+		},
+		{
+			"from": [6.5, 10.77817, 10.87652],
+			"to": [9.25, 13.52817, 16.87652],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [7.875, 12.15317, 13.12652]},
+			"faces": {
+				"north": {"uv": [0, 0, 2.75, 2.75], "rotation": 180, "texture": "#0"},
+				"east": {"uv": [0, 0, 2.75, 6], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [0, 0, 2.75, 2.75], "texture": "#0"},
+				"west": {"uv": [0, 0, 2.75, 6], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [0, 0, 2.75, 6], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [0, 0, 2.75, 6], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 4, 1],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 4, 1],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 13, 0],
+			"translation": [0, 4, 1],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 13, 0],
+			"translation": [0, 4, 1],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"ground": {
+			"translation": [0, 1.75, 0],
+			"scale": [0.75, 0.75, 0.75]
+		},
+		"gui": {
+			"rotation": [-158.5, 34, -180],
+			"translation": [0, 1, 0],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"head": {
+			"translation": [0, 14.5, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -8.75]
+		}
+	}
+}
diff --git a/pack/assets/minecraft/models/item/stick.json b/pack/assets/minecraft/models/item/stick.json
@@ -68,6 +68,7 @@
         {"predicate": {"custom_model_data":523}, "model":"item/otheritem/spinner"},
         {"predicate": {"custom_model_data":524}, "model":"placeable/kadomatu"},
         {"predicate": {"custom_model_data":525}, "model":"item/figure/others/komainu"},
+        {"predicate": {"custom_model_data":526}, "model":"hats/witch_hat"},
         {"predicate": {"custom_model_data":1000}, "model":"item/otheritem/eva_meds/ifak"},
         {"predicate": {"custom_model_data":1100}, "model":"item/otheritem/eva_weapons/scar_l"},
         {"predicate": {"custom_model_data":5000}, "model":"item/figure/others/momizidani"},

diff --git a/pack/pack.mcmeta b/pack/pack.mcmeta
@@ -1,7 +1,7 @@
 {
 	"pack":{
 		"pack_format": 6,
-		"pack_version": "v1.17.6",
-		"description": "F-Tex %pack_version% §c夏祭り§eアップデート"
+		"pack_version": "v1.17.7",
+		"description": "F-Tex %pack_version% §6ハロウィン§eアップデート"
 	}
 }