Skip to content

Commit

Permalink
fixed models in hotbar
Browse files Browse the repository at this point in the history
adjusted the view model while its in the hot bar/inventory as to match the other models.
Also scaled up the dungeon_bench to be 2 blocks in length instead of just 1, fits in builds better this way. Might need to revisit its previous placements elsewhere.
  • Loading branch information
Regorty committed Jan 21, 2024
1 parent 247e63e commit 84b365d
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 22 deletions.
4 changes: 3 additions & 1 deletion assets/ms/models/clutter/curtains_2x2.json
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,9 @@
],
"display": {
"gui": {
"rotation": [0, 88, 0]
"rotation": [12, 115, 0],
"translation": [0, -0.5, 0],
"scale": [0.9, 0.9, 0.9]
},
"fixed": {
"rotation": [0, -90, 0],
Expand Down
43 changes: 24 additions & 19 deletions assets/ms/models/clutter/dungeon_bench.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"elements": [
{
"from": [-2, 0, 0],
"to": [18, 1.5, 6],
"from": [-8, 0, 0],
"to": [24, 1.5, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0.5, 0]},
"faces": {
"north": {"uv": [0, 0, 1.5, 16], "rotation": 90, "texture": "#0"},
Expand All @@ -20,36 +20,41 @@
}
},
{
"from": [16.9, 3.5481, -2.00876],
"to": [17.9, 4.5481, 6.64124],
"from": [22.15, 5.5481, -4.25876],
"to": [23.4, 6.7981, 8.89124],
"rotation": {"angle": 45, "axis": "x", "origin": [7.9, 3.7981, 2.64124]},
"faces": {
"north": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"east": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"south": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"west": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"up": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"down": {"uv": [0, 0, 8.65, 1], "texture": "#1"}
"north": {"uv": [0, 0, 1.25, 1.25], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 11.9, 1.25], "texture": "#1"},
"south": {"uv": [0, 0, 1.25, 1.25], "rotation": 90, "texture": "#1"},
"west": {"uv": [0, 0, 11.9, 1.25], "texture": "#1"},
"up": {"uv": [0, 0, 11.9, 1.25], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 11.9, 1.25], "rotation": 90, "texture": "#1"}
}
},
{
"from": [-1.9, 3.5481, -2.00876],
"to": [-0.9, 4.5481, 6.64124],
"from": [-7.4, 5.5481, -4.25876],
"to": [-6.15, 6.7981, 8.89124],
"rotation": {"angle": 45, "axis": "x", "origin": [8.1, 3.7981, 2.64124]},
"faces": {
"north": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"east": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"south": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"west": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"up": {"uv": [0, 0, 8.65, 1], "texture": "#1"},
"down": {"uv": [0, 0, 8.65, 1], "texture": "#1"}
"north": {"uv": [0, 0, 1.25, 1.25], "rotation": 90, "texture": "#1"},
"east": {"uv": [0, 0, 11.9, 1.25], "texture": "#1"},
"south": {"uv": [0, 0, 1.25, 1.25], "rotation": 90, "texture": "#1"},
"west": {"uv": [0, 0, 11.9, 1.25], "texture": "#1"},
"up": {"uv": [0, 0, 11.9, 1.25], "rotation": 90, "texture": "#1"},
"down": {"uv": [0, 0, 11.9, 1.25], "rotation": 90, "texture": "#1"}
}
}
],
"display": {
"gui": {
"rotation": [12, 25, 0],
"translation": [0.5, 0, 0],
"scale": [0.5, 0.5, 0.5]
},
"fixed": {
"rotation": [0, -180, 0],
"translation": [0, 0, -15],
"translation": [-16, -3, -14],
"scale": [2, 2, 2]
}
}
Expand Down
5 changes: 5 additions & 0 deletions assets/ms/models/clutter/mangle.json
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,11 @@
}
],
"display": {
"gui": {
"rotation": [12, 25, 0],
"translation": [2, -2, 0],
"scale": [0.65, 0.65, 0.65]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -15],
Expand Down
4 changes: 2 additions & 2 deletions assets/ms/models/clutter/spear_barrier.json
Original file line number Diff line number Diff line change
Expand Up @@ -661,8 +661,8 @@
"translation": [4.1739, -5.565, -3.478]
},
"gui": {
"rotation": [0, 0, -45],
"scale": [0.5, 0.44, 0.5]
"rotation": [12, 25, 0],
"scale": [0.35, 0.35, 0.35]
},
"head": {
"rotation": [0, -9, 22],
Expand Down
5 changes: 5 additions & 0 deletions assets/ms/models/clutter/tanning_line.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@
}
],
"display": {
"gui": {
"rotation": [12, -155, 0],
"translation": [-0.5, -2, 0],
"scale": [0.5, 0.5, 0.5]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -23.5],
Expand Down

0 comments on commit 84b365d

Please sign in to comment.