Skip to content

Commit

Permalink
more gnome stuff
Browse files Browse the repository at this point in the history
also barricaded door, place over top an iron door. for use in west ardy and other places.
  • Loading branch information
Regorty committed Jan 12, 2024
1 parent ab665f0 commit 64c631b
Show file tree
Hide file tree
Showing 3 changed files with 195 additions and 40 deletions.
2 changes: 1 addition & 1 deletion assets/minecraft/models/item/arrow.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
{"predicate": {"custom_model_data":103},"model":"ms:clutter/gnome_trapdoor"},
{"predicate": {"custom_model_data":104},"model":"ms:clutter/tailoring_supplies"},
{"predicate": {"custom_model_data":105},"model":"ms:clutter/tailoring_clothes_model"},
{"predicate": {"custom_model_data":106},"model":"item/empty"},
{"predicate": {"custom_model_data":106},"model":"ms:clutter/barricaded_door"},
{"predicate": {"custom_model_data":107},"model":"item/empty"},
{"predicate": {"custom_model_data":108},"model":"item/empty"},
{"predicate": {"custom_model_data":109},"model":"item/empty"},
Expand Down
168 changes: 168 additions & 0 deletions assets/ms/models/clutter/barricaded_door.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
{
"credit": "Made by Regorty",
"textures": {
"0": "block/oak_door_bottom",
"1": "block/oak_door_top",
"2": "item/custom/stone_pickaxe/wood_planks_box",
"3": "item/custom/tools/iron",
"particle": "block/oak_door_bottom"
},
"elements": [
{
"from": [1, -6, -1],
"to": [15, 8, 2.25],
"faces": {
"north": {"uv": [0, 2, 16, 16], "texture": "#0"},
"south": {"uv": [0, 2, 16, 16], "texture": "#0"}
}
},
{
"from": [1, 8, -1],
"to": [15, 22, 2.25],
"faces": {
"north": {"uv": [0, 0, 16, 14], "texture": "#1"},
"south": {"uv": [0, 0, 16, 14], "texture": "#1"}
}
},
{
"from": [-1, -8.25, -1.25],
"to": [1, 24.25, 2.5],
"rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#2"},
"east": {"uv": [0, 0, 16, 3.5], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 0, 16, 3.5], "rotation": 90, "texture": "#2"},
"up": {"uv": [0, 0, 2, 3.5], "texture": "#2"},
"down": {"uv": [0, 0, 2, 3.5], "texture": "#2"}
}
},
{
"from": [15, -8.25, -1.25],
"to": [17, 24.25, 2.5],
"rotation": {"angle": 0, "axis": "y", "origin": [19, 0, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#2"},
"east": {"uv": [0, 0, 16, 3.5], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 0, 16, 3.5], "rotation": 90, "texture": "#2"},
"up": {"uv": [0, 0, 2, 3.5], "texture": "#2"},
"down": {"uv": [0, 0, 2, 3.5], "texture": "#2"}
}
},
{
"from": [1, 22, -1.25],
"to": [15, 24.25, 2.5],
"rotation": {"angle": 0, "axis": "y", "origin": [20, 0, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#2"},
"south": {"uv": [0, 0, 16, 2], "texture": "#2"},
"up": {"uv": [0, 0, 16, 3.5], "texture": "#2"},
"down": {"uv": [0, 0, 16, 3.5], "texture": "#2"}
}
},
{
"from": [1, -8.25, -1.25],
"to": [15, -6, 2.25],
"rotation": {"angle": 0, "axis": "y", "origin": [20, -30, 0]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#2"},
"south": {"uv": [0, 0, 16, 2], "texture": "#2"},
"up": {"uv": [0, 0, 16, 3.5], "texture": "#2"},
"down": {"uv": [0, 0, 16, 3.5], "texture": "#2"}
}
},
{
"from": [5.5, -6, -1.75],
"to": [9.5, 23, 2.75],
"rotation": {"angle": 22.5, "axis": "z", "origin": [8.5, 8, 0.5]},
"faces": {
"north": {"uv": [0, 5, 16, 9], "rotation": 270, "texture": "#2"},
"east": {"uv": [0, 5, 16, 9.25], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 5, 16, 9], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 5, 16, 9.25], "rotation": 90, "texture": "#2"},
"up": {"uv": [0, 5, 4.25, 9], "rotation": 90, "texture": "#2"},
"down": {"uv": [0, 5, 4.25, 9], "rotation": 90, "texture": "#2"}
}
},
{
"from": [6.5, -6, -1.5],
"to": [10.5, 22, 3],
"rotation": {"angle": -22.5, "axis": "z", "origin": [8.5, 8, 0.5]},
"faces": {
"north": {"uv": [0, 5, 16, 9], "rotation": 270, "texture": "#2"},
"east": {"uv": [0, 5, 16, 9.25], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 5, 16, 9], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 5, 16, 9.25], "rotation": 90, "texture": "#2"},
"up": {"uv": [0, 5, 4.25, 9], "rotation": 90, "texture": "#2"},
"down": {"uv": [0, 5, 4.25, 9], "rotation": 90, "texture": "#2"}
}
},
{
"from": [12.5, 4.5, 3],
"to": [13.75, 9.25, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 1.75]},
"faces": {
"north": {"uv": [0, 0, 1.25, 4.75], "texture": "#3"},
"east": {"uv": [0, 0, 1, 4.75], "texture": "#3"},
"south": {"uv": [0, 0, 1.25, 4.75], "texture": "#3"},
"west": {"uv": [0, 0, 1, 4.75], "texture": "#3"},
"up": {"uv": [0, 0, 1.25, 1], "texture": "#3"},
"down": {"uv": [0, 0, 1.25, 1], "texture": "#3"}
}
},
{
"from": [12.5, 4.5, -2.75],
"to": [13.75, 9.25, -1.75],
"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, -4]},
"faces": {
"north": {"uv": [0, 0, 1.25, 4.75], "texture": "#3"},
"east": {"uv": [0, 0, 1, 4.75], "texture": "#3"},
"south": {"uv": [0, 0, 1.25, 4.75], "texture": "#3"},
"west": {"uv": [0, 0, 1, 4.75], "texture": "#3"},
"up": {"uv": [0, 0, 1.25, 1], "texture": "#3"},
"down": {"uv": [0, 0, 1.25, 1], "texture": "#3"}
}
},
{
"from": [12.25, 8, -1.75],
"to": [14, 9.5, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 0.5]},
"faces": {
"north": {"uv": [0, 0, 1.75, 1.5], "texture": "#3"},
"east": {"uv": [0, 0, 4.5, 1.5], "texture": "#3"},
"south": {"uv": [0, 0, 1.75, 1.5], "texture": "#3"},
"west": {"uv": [0, 0, 4.5, 1.5], "texture": "#3"},
"up": {"uv": [0, 0, 1.75, 4.5], "texture": "#3"},
"down": {"uv": [0, 0, 1.75, 4.5], "texture": "#3"}
}
},
{
"from": [12.25, 4.25, -1.75],
"to": [14, 5.75, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [12, 4.25, 0.5]},
"faces": {
"north": {"uv": [0, 0, 1.75, 1.5], "texture": "#3"},
"east": {"uv": [0, 0, 4.5, 1.5], "texture": "#3"},
"south": {"uv": [0, 0, 1.75, 1.5], "texture": "#3"},
"west": {"uv": [0, 0, 4.5, 1.5], "texture": "#3"},
"up": {"uv": [0, 0, 1.75, 4.5], "texture": "#3"},
"down": {"uv": [0, 0, 1.75, 4.5], "texture": "#3"}
}
}
],
"display": {
"firstperson_righthand": {
"rotation": [0, -80, 0],
"scale": [0.4, 0.4, 0.4]
},
"gui": {
"rotation": [12, 25, 0],
"scale": [0.5, 0.5, 0.5]
},
"fixed": {
"translation": [0, -16, 19.75],
"scale": [2, 2, 2]
}
}
}
65 changes: 26 additions & 39 deletions assets/ms/models/clutter/gnome_throne.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
},
"elements": [
{
"from": [0, -8, 14],
"to": [3, -7, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -8, 14]},
"from": [0, -9, 14],
"to": [3, -8, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 14]},
"faces": {
"north": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"east": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
Expand All @@ -21,9 +21,9 @@
}
},
{
"from": [13, -8, 14],
"to": [16, -7, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -8, 14]},
"from": [13, -9, 14],
"to": [16, -8, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -6, 14]},
"faces": {
"north": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"east": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
Expand All @@ -34,9 +34,9 @@
}
},
{
"from": [0, -8, 1],
"to": [3, -7, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -8, 1]},
"from": [0, -9, 1],
"to": [3, -8, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 1]},
"faces": {
"north": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"east": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
Expand Down Expand Up @@ -145,7 +145,7 @@
}
},
{
"from": [0.25, -7, 1.25],
"from": [0.25, -8, 1.25],
"to": [2.75, 4, 2.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 1]},
"faces": {
Expand All @@ -156,7 +156,7 @@
}
},
{
"from": [13.25, -7, 1.25],
"from": [13.25, -8, 1.25],
"to": [15.75, 4, 2.75],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -6, 1]},
"faces": {
Expand All @@ -167,25 +167,13 @@
}
},
{
"from": [3, -1, 0.25],
"to": [13, 6, 1.75],
"rotation": {"angle": 0, "axis": "y", "origin": [2.75, -6, 0]},
"faces": {
"north": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"east": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"south": {"uv": [3, 0, 13, 7], "texture": "#2"},
"west": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"down": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"}
}
},
{
"from": [2.5, 6, 0.25],
"from": [2.5, -1, 0.25],
"to": [13.5, 10, 1.75],
"rotation": {"angle": 0, "axis": "y", "origin": [2.75, 1, 0]},
"faces": {
"north": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"east": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"south": {"uv": [5, 12, 16, 16], "texture": "#2"},
"south": {"uv": [5, 5, 16, 16], "texture": "#2"},
"west": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"down": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"}
}
Expand Down Expand Up @@ -263,8 +251,8 @@
}
},
{
"from": [13.25, -7, 14.25],
"to": [15.75, -1, 15.75],
"from": [13.25, -8, 14.25],
"to": [15.75, -3, 15.75],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -6, 14]},
"faces": {
"north": {"uv": [5.625, 12.625, 5.875, 12.875], "texture": "#0"},
Expand All @@ -274,8 +262,8 @@
}
},
{
"from": [0.25, -7, 14.25],
"to": [2.75, -1, 15.75],
"from": [0.25, -8, 14.25],
"to": [2.75, -3, 15.75],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 14]},
"faces": {
"north": {"uv": [5.625, 12.625, 5.875, 12.875], "texture": "#0"},
Expand All @@ -285,7 +273,7 @@
}
},
{
"from": [-0.25, -1, 13.5],
"from": [-0.25, -3, 13.5],
"to": [3.25, 4, 16.5],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -1, 14]},
"faces": {
Expand All @@ -297,7 +285,7 @@
}
},
{
"from": [12.75, -1, 13.5],
"from": [12.75, -3, 13.5],
"to": [16.25, 4, 16.5],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -1, 14]},
"faces": {
Expand All @@ -309,7 +297,7 @@
}
},
{
"from": [2.75, -1, 1.75],
"from": [2.75, -2, 1.75],
"to": [13.25, 0, 13.75],
"rotation": {"angle": 0, "axis": "y", "origin": [6, -1, 14]},
"faces": {
Expand All @@ -322,9 +310,9 @@
}
},
{
"from": [13, -8, 1],
"to": [16, -7, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -8, 1]},
"from": [13, -9, 1],
"to": [16, -8, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [13, -6, 1]},
"faces": {
"north": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
"east": {"uv": [7.125, 12.625, 7.375, 12.875], "texture": "#0"},
Expand Down Expand Up @@ -735,7 +723,7 @@
},
"fixed": {
"rotation": [-90, -180, 0],
"translation": [0, 0, -5.75],
"translation": [0, 0, -8.5],
"scale": [2.25, 2.5, 2.25]
}
},
Expand Down Expand Up @@ -767,7 +755,6 @@
24,
25,
26,
27,
{
"name": "standard_green",
"origin": [8, 8, 8],
Expand All @@ -779,6 +766,7 @@
"color": 0,
"children": []
},
27,
28,
29,
30,
Expand Down Expand Up @@ -818,8 +806,7 @@
64,
65,
66,
67,
68
67
]
}
]
Expand Down

0 comments on commit 64c631b

Please sign in to comment.