Skip to content

Commit

Permalink
Tweaks, adjustments and bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@OpenBagTwo
OpenBagTwo committed Dec 2, 2022
1 parent afe0920 commit 205b7a9
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 65 deletions.
4 changes: 2 additions & 2 deletions Chappeau Resourcepack/assets/minecraft/models/item/carved_pumpkin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
{"predicate": {"custom_model_data": 7}, "model": "item/custom/rick"},
{"predicate": {"custom_model_data": 1000}, "model": "item/custom/shadow_dweller"},
{"predicate": {"custom_model_data": 1001}, "model": "item/custom/infinity_armor"},
{"predicate": {"custom_model_data": 1002}, "model": "item/custom/infinity_helmet"}
{"predicate": {"custom_model_data": 2001}, "model": "item/custom/jameson"},
{"predicate": {"custom_model_data": 1002}, "model": "item/custom/infinity_helmet"},
{"predicate": {"custom_model_data": 2001}, "model": "item/custom/jameson"}
]
}

125 changes: 62 additions & 63 deletions Chappeau Resourcepack/assets/minecraft/models/item/custom/jameson.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,46 @@
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "item/jameson",
"particle": "item/jameson"
"texture": "item/jameson"
},
"elements": [
{
"name": "bottom",
"from": [1, 0, 1],
"to": [7, 1, 7],
"faces": {
"north": {"uv": [5.5, 1, 7, 1.25], "texture": "#0"},
"east": {"uv": [5.5, 1.25, 7, 1.5], "texture": "#0"},
"south": {"uv": [5.5, 1.5, 7, 1.75], "texture": "#0"},
"west": {"uv": [5.5, 1.75, 7, 2], "texture": "#0"},
"up": {"uv": [5.5, 4.5, 4, 3], "texture": "#0"},
"down": {"uv": [5.5, 4.5, 4, 6], "texture": "#0"}
"north": {"uv": [5.5, 1, 7, 1.25], "texture": "#texture"},
"east": {"uv": [5.5, 1.25, 7, 1.5], "texture": "#texture"},
"south": {"uv": [5.5, 1.5, 7, 1.75], "texture": "#texture"},
"west": {"uv": [5.5, 1.75, 7, 2], "texture": "#texture"},
"up": {"uv": [5.5, 4.5, 4, 3], "texture": "#texture"},
"down": {"uv": [5.5, 4.5, 4, 6], "texture": "#texture"}
}
},
{
"name": "main housing",
"from": [0, 1, 0],
"to": [8, 8, 8],
"faces": {
"north": {"uv": [9, 8, 16, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [2, 1.75, 4, 3.5], "texture": "#0"},
"south": {"uv": [2, 3.5, 4, 5.25], "texture": "#0"},
"west": {"uv": [0, 4, 2, 5.75], "texture": "#0"},
"up": {"uv": [2, 2, 0, 0], "texture": "#0"},
"down": {"uv": [2, 2, 0, 4], "texture": "#0"}
"north": {"uv": [9, 8, 16, 16], "rotation": 90, "texture": "#texture"},
"east": {"uv": [2, 1.75, 4, 3.5], "texture": "#texture"},
"south": {"uv": [2, 3.5, 4, 5.25], "texture": "#texture"},
"west": {"uv": [0, 4, 2, 5.75], "texture": "#texture"},
"up": {"uv": [2, 2, 0, 0], "texture": "#texture"},
"down": {"uv": [2, 2, 0, 4], "texture": "#texture"}
}
},
{
"name": "top",
"from": [1, 8, 1],
"to": [7, 9, 7],
"faces": {
"north": {"uv": [5.5, 0, 7, 0.25], "texture": "#0"},
"east": {"uv": [5.5, 0.25, 7, 0.5], "texture": "#0"},
"south": {"uv": [5.5, 0.5, 7, 0.75], "texture": "#0"},
"west": {"uv": [5.5, 0.75, 7, 1], "texture": "#0"},
"up": {"uv": [5.5, 1.5, 4, 0], "texture": "#0"},
"down": {"uv": [5.5, 1.5, 4, 3], "texture": "#0"}
"north": {"uv": [5.5, 0, 7, 0.25], "texture": "#texture"},
"east": {"uv": [5.5, 0.25, 7, 0.5], "texture": "#texture"},
"south": {"uv": [5.5, 0.5, 7, 0.75], "texture": "#texture"},
"west": {"uv": [5.5, 0.75, 7, 1], "texture": "#texture"},
"up": {"uv": [5.5, 1.5, 4, 0], "texture": "#texture"},
"down": {"uv": [5.5, 1.5, 4, 3], "texture": "#texture"}
}
},
{
Expand All @@ -51,12 +50,12 @@
"to": [1, 1, 8],
"rotation": {"angle": -22.5, "axis": "x", "origin": [0.5, 0.5, 7.5]},
"faces": {
"north": {"uv": [5.5, 2, 5.75, 3.5], "texture": "#0"},
"east": {"uv": [5.5, 3.5, 5.75, 5], "texture": "#0"},
"south": {"uv": [5.5, 5, 5.75, 6.5], "texture": "#0"},
"west": {"uv": [0, 5.75, 0.25, 7.25], "texture": "#0"},
"up": {"uv": [2.75, 6.5, 2.5, 6.25], "texture": "#0"},
"down": {"uv": [3, 6.25, 2.75, 6.5], "texture": "#0"}
"north": {"uv": [5.5, 2, 5.75, 3.5], "texture": "#texture"},
"east": {"uv": [5.5, 3.5, 5.75, 5], "texture": "#texture"},
"south": {"uv": [5.5, 5, 5.75, 6.5], "texture": "#texture"},
"west": {"uv": [0, 5.75, 0.25, 7.25], "texture": "#texture"},
"up": {"uv": [2.75, 6.5, 2.5, 6.25], "texture": "#texture"},
"down": {"uv": [3, 6.25, 2.75, 6.5], "texture": "#texture"}
}
},
{
Expand All @@ -65,12 +64,12 @@
"to": [8, 1, 8],
"rotation": {"angle": -22.5, "axis": "x", "origin": [7.5, 0.5, 7.5]},
"faces": {
"north": {"uv": [0.25, 5.75, 0.5, 7.25], "texture": "#0"},
"east": {"uv": [0.5, 5.75, 0.75, 7.25], "texture": "#0"},
"south": {"uv": [0.75, 5.75, 1, 7.25], "texture": "#0"},
"west": {"uv": [1, 5.75, 1.25, 7.25], "texture": "#0"},
"up": {"uv": [3.25, 6.5, 3, 6.25], "texture": "#0"},
"down": {"uv": [3.5, 6.25, 3.25, 6.5], "texture": "#0"}
"north": {"uv": [0.25, 5.75, 0.5, 7.25], "texture": "#texture"},
"east": {"uv": [0.5, 5.75, 0.75, 7.25], "texture": "#texture"},
"south": {"uv": [0.75, 5.75, 1, 7.25], "texture": "#texture"},
"west": {"uv": [1, 5.75, 1.25, 7.25], "texture": "#texture"},
"up": {"uv": [3.25, 6.5, 3, 6.25], "texture": "#texture"},
"down": {"uv": [3.5, 6.25, 3.25, 6.5], "texture": "#texture"}
}
},
{
Expand All @@ -79,12 +78,12 @@
"to": [1, 1, 1],
"rotation": {"angle": 22.5, "axis": "x", "origin": [0.5, 0.5, 0.5]},
"faces": {
"north": {"uv": [1.25, 5.75, 1.5, 7.25], "texture": "#0"},
"east": {"uv": [1.5, 5.75, 1.75, 7.25], "texture": "#0"},
"south": {"uv": [1.75, 5.75, 2, 7.25], "texture": "#0"},
"west": {"uv": [5.75, 2, 6, 3.5], "texture": "#0"},
"up": {"uv": [3.75, 6.5, 3.5, 6.25], "texture": "#0"},
"down": {"uv": [6.5, 3.5, 6.25, 3.75], "texture": "#0"}
"north": {"uv": [1.25, 5.75, 1.5, 7.25], "texture": "#texture"},
"east": {"uv": [1.5, 5.75, 1.75, 7.25], "texture": "#texture"},
"south": {"uv": [1.75, 5.75, 2, 7.25], "texture": "#texture"},
"west": {"uv": [5.75, 2, 6, 3.5], "texture": "#texture"},
"up": {"uv": [3.75, 6.5, 3.5, 6.25], "texture": "#texture"},
"down": {"uv": [6.5, 3.5, 6.25, 3.75], "texture": "#texture"}
}
},
{
Expand All @@ -93,12 +92,12 @@
"to": [8, 1, 1],
"rotation": {"angle": 22.5, "axis": "x", "origin": [7.5, 0.5, 0.5]},
"faces": {
"north": {"uv": [5.75, 3.5, 6, 5], "texture": "#0"},
"east": {"uv": [5.75, 5, 6, 6.5], "texture": "#0"},
"south": {"uv": [6, 2, 6.25, 3.5], "texture": "#0"},
"west": {"uv": [6, 3.5, 6.25, 5], "texture": "#0"},
"up": {"uv": [4, 6.5, 3.75, 6.25], "texture": "#0"},
"down": {"uv": [6.5, 3.75, 6.25, 4], "texture": "#0"}
"north": {"uv": [5.75, 3.5, 6, 5], "texture": "#texture"},
"east": {"uv": [5.75, 5, 6, 6.5], "texture": "#texture"},
"south": {"uv": [6, 2, 6.25, 3.5], "texture": "#texture"},
"west": {"uv": [6, 3.5, 6.25, 5], "texture": "#texture"},
"up": {"uv": [4, 6.5, 3.75, 6.25], "texture": "#texture"},
"down": {"uv": [6.5, 3.75, 6.25, 4], "texture": "#texture"}
}
},
{
Expand All @@ -107,12 +106,12 @@
"to": [12, 10, 4.5],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 8.5, 4]},
"faces": {
"north": {"uv": [4, 6, 5.5, 6.25], "texture": "#0"},
"east": {"uv": [4, 6.25, 4.25, 6.5], "texture": "#0"},
"south": {"uv": [6, 5, 7.5, 5.25], "texture": "#0"},
"west": {"uv": [6.25, 4, 6.5, 4.25], "texture": "#0"},
"up": {"uv": [7.5, 5.5, 6, 5.25], "texture": "#0"},
"down": {"uv": [7.5, 5.5, 6, 5.75], "texture": "#0"}
"north": {"uv": [4, 6, 5.5, 6.25], "texture": "#texture"},
"east": {"uv": [4, 6.25, 4.25, 6.5], "texture": "#texture"},
"south": {"uv": [6, 5, 7.5, 5.25], "texture": "#texture"},
"west": {"uv": [6.25, 4, 6.5, 4.25], "texture": "#texture"},
"up": {"uv": [7.5, 5.5, 6, 5.25], "texture": "#texture"},
"down": {"uv": [7.5, 5.5, 6, 5.75], "texture": "#texture"}
}
},
{
Expand All @@ -121,12 +120,12 @@
"to": [1.5, 14.5, 4.5],
"rotation": {"angle": 45, "axis": "z", "origin": [1, 9.5, 4]},
"faces": {
"north": {"uv": [6, 5.75, 6.25, 7.25], "texture": "#0"},
"east": {"uv": [2, 6.25, 2.25, 7.75], "texture": "#0"},
"south": {"uv": [6.25, 2, 6.5, 3.5], "texture": "#0"},
"west": {"uv": [2.25, 6.25, 2.5, 7.75], "texture": "#0"},
"up": {"uv": [4.5, 6.5, 4.25, 6.25], "texture": "#0"},
"down": {"uv": [6.5, 4.25, 6.25, 4.5], "texture": "#0"}
"north": {"uv": [6, 5.75, 6.25, 7.25], "texture": "#texture"},
"east": {"uv": [2, 6.25, 2.25, 7.75], "texture": "#texture"},
"south": {"uv": [6.25, 2, 6.5, 3.5], "texture": "#texture"},
"west": {"uv": [2.25, 6.25, 2.5, 7.75], "texture": "#texture"},
"up": {"uv": [4.5, 6.5, 4.25, 6.25], "texture": "#texture"},
"down": {"uv": [6.5, 4.25, 6.25, 4.5], "texture": "#texture"}
}
},
{
Expand All @@ -135,12 +134,12 @@
"to": [-1.11611, 17.34099, 4],
"rotation": {"angle": -45, "axis": "z", "origin": [-2.11611, 14.59099, 4]},
"faces": {
"north": {"uv": [0, 8, 8, 16], "texture": "#0"},
"east": {"uv": [0, 0, 0, 1], "texture": "#0"},
"south": {"uv": [8, 8, 0, 16], "texture": "#0"},
"west": {"uv": [0, 0, 0, 1], "texture": "#0"},
"up": {"uv": [1, 0, 0, 0], "texture": "#0"},
"down": {"uv": [1, 0, 0, 0], "texture": "#0"}
"north": {"uv": [0, 8, 8, 16], "texture": "#texture"},
"east": {"uv": [0, 0, 0, 1], "texture": "#texture"},
"south": {"uv": [8, 8, 0, 16], "texture": "#texture"},
"west": {"uv": [0, 0, 0, 1], "texture": "#texture"},
"up": {"uv": [1, 0, 0, 0], "texture": "#texture"},
"down": {"uv": [1, 0, 0, 0], "texture": "#texture"}
}
}
],
Expand All @@ -160,7 +159,7 @@
"scale": [0.66, 0.66, 0.66]
},
"head": {
"translation": [-20, -20, 8],
"translation": [41, -20, 8],
"scale": [1.85, 1.85, 1.85]
},
"fixed": {
Expand Down
Binary file modified Chappeau Resourcepack/assets/minecraft/textures/item/jameson.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 205b7a9

Please sign in to comment.