Skip to content

Commit

Permalink
Swapped to template system for item models, fixed bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@skykittenpuppy
skykittenpuppy committed Aug 21, 2024
1 parent 72116ca commit e2d33a5
Show file tree
Hide file tree
Showing 51 changed files with 1,067 additions and 660 deletions.
117 changes: 79 additions & 38 deletions PlateUp Resource-Pack/assets/plateup/models/item/bin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,94 +7,135 @@
},
"elements": [
{
"from": [2, 0, 3],
"to": [14, 7, 4],
"from": [2, 0, 12],
"to": [14, 7, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 9, 12, 16], "texture": "#0"},
"south": {"uv": [0, 9, 12, 16], "texture": "#1"}
"north": {"uv": [0, 9, 12, 16], "texture": "#1"},
"south": {"uv": [0, 9, 12, 16], "texture": "#0"}
}
},
{
"from": [2, 0, 3],
"to": [14, 1, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"up": {"uv": [0, 6, 12, 16], "texture": "#1"},
"down": {"uv": [0, 6, 12, 16], "texture": "#0"}
"up": {"uv": [0, 6, 12, 16], "rotation": 180, "texture": "#1"},
"down": {"uv": [0, 6, 12, 16], "rotation": 180, "texture": "#0"}
}
},
{
"from": [2, 0, 12],
"to": [14, 11, 13],
"from": [2, 0, 3],
"to": [14, 11, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 6.1, 12, 16], "texture": "#1"},
"south": {"uv": [0, 6, 12, 16], "texture": "#0"}
"north": {"uv": [0, 6, 12, 16], "texture": "#0"},
"south": {"uv": [0, 6.1, 12, 16], "texture": "#1"}
}
},
{
"from": [13, 0, 3],
"to": [14, 12, 13],
"from": [2, 0, 3],
"to": [3, 12, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"east": {"uv": [6, 0, 16, 12], "texture": "#0"},
"west": {"uv": [16, 0, 6, 12], "texture": "#1"}
"east": {"uv": [16, 0, 6, 12], "texture": "#1"},
"west": {"uv": [6, 0, 16, 12], "texture": "#0"}
}
},
{
"from": [2, 0, 3],
"to": [3, 12, 13],
"from": [13, 0, 3],
"to": [14, 12, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"east": {"uv": [6, 0, 16, 12], "texture": "#1"},
"west": {"uv": [16, 0, 6, 12], "texture": "#0"}
"east": {"uv": [16, 0, 6, 12], "texture": "#0"},
"west": {"uv": [6, 0, 16, 12], "texture": "#1"}
}
},
{
"from": [2.999, 6.499, 12.499],
"to": [13.001, 8.501, 14.001],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7, 3.5]},
"from": [2.999, 6.499, 1.999],
"to": [13.001, 8.501, 3.501],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7, 12.5]},
"faces": {
"north": {"uv": [0, 14, 10, 16], "texture": "#0"},
"south": {"uv": [0, 14, 10, 16], "texture": "#0"},
"up": {"uv": [0, 15, 10, 16], "texture": "#0"},
"down": {"uv": [0, 15, 10, 16], "texture": "#0"}
"up": {"uv": [0, 15, 10, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 15, 10, 16], "rotation": 180, "texture": "#0"}
}
},
{
"from": [12.999, 6.499, 2.499],
"to": [14.501, 8.501, 14.001],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7, 3.5]},
"from": [1.499, 6.499, 1.999],
"to": [3.001, 8.501, 13.501],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7, 12.5]},
"faces": {
"north": {"uv": [0, 14, 2, 16], "texture": "#0"},
"east": {"uv": [0, 14, 11, 16], "texture": "#0"},
"south": {"uv": [0, 14, 2, 16], "texture": "#0"},
"west": {"uv": [0, 14, 11, 16], "texture": "#0"},
"up": {"uv": [0, 15, 11, 16], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 15, 11, 16], "rotation": 90, "texture": "#0"}
"up": {"uv": [0, 15, 11, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 15, 11, 16], "rotation": 270, "texture": "#0"}
}
},
{
"from": [2.999, 6.499, 2.499],
"to": [13.001, 8.501, 4.001],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7, 3.5]},
"from": [2.999, 6.499, 11.999],
"to": [13.001, 8.501, 13.501],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7, 12.5]},
"faces": {
"north": {"uv": [0, 14, 10, 16], "texture": "#0"},
"south": {"uv": [0, 14, 10, 16], "texture": "#0"},
"up": {"uv": [0, 15, 10, 16], "texture": "#0"},
"down": {"uv": [0, 15, 10, 16], "texture": "#0"}
"up": {"uv": [0, 15, 10, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [0, 15, 10, 16], "rotation": 180, "texture": "#0"}
}
},
{
"from": [1.499, 6.499, 2.499],
"to": [3.001, 8.501, 14.001],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7, 3.5]},
"from": [12.999, 6.499, 1.999],
"to": [14.501, 8.501, 13.501],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7, 12.5]},
"faces": {
"north": {"uv": [0, 14, 2, 16], "texture": "#0"},
"east": {"uv": [0, 14, 11, 16], "texture": "#0"},
"south": {"uv": [0, 14, 2, 16], "texture": "#0"},
"west": {"uv": [0, 14, 11, 16], "texture": "#0"},
"up": {"uv": [0, 15, 11, 16], "rotation": 90, "texture": "#0"},
"down": {"uv": [0, 15, 11, 16], "rotation": 90, "texture": "#0"}
"up": {"uv": [0, 15, 11, 16], "rotation": 270, "texture": "#0"},
"down": {"uv": [0, 15, 11, 16], "rotation": 270, "texture": "#0"}
}
}
],
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [90, -90, 0],
"translation": [0, 2, 6.25],
"scale": [0.75, 0.75, 0.75]
},
"thirdperson_lefthand": {
"rotation": [90, -45, 0],
"translation": [0, 2, 6],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_righthand": {
"rotation": [0, -60, 0],
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_lefthand": {
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"ground": {
"translation": [0, 4, 0]
},
"gui": {
"rotation": [30, 45, 0],
"scale": [0.5, 0.5, 0.5]
},
"head": {
"scale": [0, 0, 0]
},
"fixed": {
"rotation": [90, 0, 0],
"translation": [0, 0, 7]
}
},
"groups": [
0,
1,
Expand Down
19 changes: 9 additions & 10 deletions PlateUp Resource-Pack/assets/plateup/models/item/burnt_food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,22 @@
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [90, 0, 0],
"translation": [0, 3, 6.25],
"rotation": [90, -90, 0],
"translation": [0, 2, 6.25],
"scale": [0.75, 0.75, 0.75]
},
"thirdperson_lefthand": {
"rotation": [90, 0, 0],
"translation": [0, 3, 6.25],
"rotation": [90, -45, 0],
"translation": [0, 2, 6],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_righthand": {
"rotation": [0, 30, 0],
"translation": [-1, 8, 0],
"rotation": [0, -60, 0],
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_lefthand": {
"rotation": [0, 30, 0],
"translation": [-1, 8, 0],
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"ground": {
Expand All @@ -52,8 +51,8 @@
"scale": [0, 0, 0]
},
"fixed": {
"rotation": [90, 90, 0],
"rotation": [90, 0, 0],
"translation": [0, 0, 7]
}
}
}
}
7 changes: 7 additions & 0 deletions PlateUp Resource-Pack/assets/plateup/models/item/burnt_steak.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "plateup:item/template/steak",
"textures": {
"0": "block/coal_block",
"particle": "block/coal_block"
}
}
11 changes: 6 additions & 5 deletions PlateUp Resource-Pack/assets/plateup/models/item/chopped_steak.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,17 @@
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [90, 0, 0],
"rotation": [90, -90, 0],
"translation": [0, 2, 6.25],
"scale": [0.75, 0.75, 0.75]
},
"thirdperson_lefthand": {
"rotation": [90, 0, 0],
"translation": [0, 2, 6.25],
"rotation": [90, -45, 0],
"translation": [0, 2, 6],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_righthand": {
"rotation": [0, -60, 0],
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
Expand All @@ -43,7 +44,7 @@
"translation": [0, 4, 0]
},
"gui": {
"rotation": [30, 45, 0],
"rotation": [30, 0, 0],
"translation": [0, 3, 0]
},
"head": {
Expand All @@ -54,4 +55,4 @@
"translation": [0, 0, 7]
}
}
}
}
38 changes: 37 additions & 1 deletion PlateUp Resource-Pack/assets/plateup/models/item/counter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,42 @@
}
}
],
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [90, -90, 0],
"translation": [0, 2, 6.25],
"scale": [0.75, 0.75, 0.75]
},
"thirdperson_lefthand": {
"rotation": [90, -45, 0],
"translation": [0, 2, 6],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_righthand": {
"rotation": [0, -60, 0],
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_lefthand": {
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"ground": {
"translation": [0, 4, 0]
},
"gui": {
"rotation": [30, 45, 0],
"scale": [0.5, 0.5, 0.5]
},
"head": {
"scale": [0, 0, 0]
},
"fixed": {
"rotation": [90, 0, 0],
"translation": [0, 0, 7]
}
},
"groups": [
{
"name": "cabinet",
Expand All @@ -128,4 +164,4 @@
"children": [4, 5, 6, 7, 8, 9]
}
]
}
}
38 changes: 37 additions & 1 deletion PlateUp Resource-Pack/assets/plateup/models/item/crate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,42 @@
}
}
],
"gui_light": "front",
"display": {
"thirdperson_righthand": {
"rotation": [90, -90, 0],
"translation": [0, 2, 6.25],
"scale": [0.75, 0.75, 0.75]
},
"thirdperson_lefthand": {
"rotation": [90, -45, 0],
"translation": [0, 2, 6],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_righthand": {
"rotation": [0, -60, 0],
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"firstperson_lefthand": {
"translation": [2, 7, 0],
"scale": [0.75, 0.75, 0.75]
},
"ground": {
"translation": [0, 4, 0]
},
"gui": {
"rotation": [30, 45, 0],
"scale": [0.5, 0.5, 0.5]
},
"head": {
"scale": [0, 0, 0]
},
"fixed": {
"rotation": [90, 0, 0],
"translation": [0, 0, 7]
}
},
"groups": [
{
"name": "Corners",
Expand All @@ -223,4 +259,4 @@
16,
17
]
}
}
Loading

0 comments on commit e2d33a5

Please sign in to comment.