Skip to content

Commit

Permalink
Merge pull request #759 from Dablakbandit/Ender-Main
Browse files Browse the repository at this point in the history 
Old Armor Stand
  • Loading branch information
@EnderSven
EnderSven authored Jan 19, 2024
2 parents 134f6f4 + dfdc6e7 commit 6be7d43
Show file tree
Hide file tree
Showing 4 changed files with 322 additions and 1 deletion.
2 changes: 1 addition & 1 deletion assets/minecraft/models/item/arrow.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
{"predicate": {"custom_model_data":120},"model":"item/cities/draynor/wise_old_man_bed"},
{"predicate": {"custom_model_data":121},"model":"ms:clutter/glarial_stattue"},
{"predicate": {"custom_model_data":122},"model":"ms:clutter/baxtorian_stattue"},
{"predicate": {"custom_model_data":123},"model":"item/empty"},
{"predicate": {"custom_model_data":123},"model":"ms:clutter/old_armor_stand"},
{"predicate": {"custom_model_data":124},"model":"item/empty"},
{"predicate": {"custom_model_data":125},"model":"item/empty"},
{"predicate": {"custom_model_data":126},"model":"item/empty"},
Expand Down
Binary file added assets/minecraft/textures/item/custom/shields/old_book.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.
Binary file added assets/minecraft/textures/item/custom/shields/old_shield.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.
321 changes: 321 additions & 0 deletions assets/ms/models/clutter/old_armor_stand.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,321 @@
{
"credit": "Made by Regorty",
"parent": "ms:mobs/hill_giant/static",
"textures": {
"1": "item/custom/shields/old_shield",
"2": "item/custom/shields/old_book",
"3": "item/custom/shields/shield_necromancer",
"particle": "item/custom/shields/old_book"
},
"elements": [
{
"from": [7.79688, 3.64913, 3.99375],
"to": [12.16488, 13.63313, 4.61775],
"rotation": {"angle": -22.5, "axis": "y", "origin": [9.98088, 8.64113, 4.30575]},
"faces": {
"north": {"uv": [0, 0, 8, 16], "texture": "#1"},
"east": {"uv": [15.5, 0, 16, 16], "texture": "#1"},
"south": {"uv": [8, 0, 16, 16], "texture": "#1"},
"west": {"uv": [0, 0, 0.5, 16], "texture": "#1"},
"up": {"uv": [10, 0, 16, 0.5], "texture": "#1"},
"down": {"uv": [0.5, 15, 2, 15.5], "texture": "#1"}
}
},
{
"from": [4.03002, 3.64913, 4.84489],
"to": [8.39802, 13.63313, 5.46889],
"rotation": {"angle": 22.5, "axis": "y", "origin": [4.03002, 3.64913, 4.84489]},
"faces": {
"north": {"uv": [8, 0, 16, 16], "texture": "#1"},
"east": {"uv": [15.5, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 8, 16], "texture": "#1"},
"west": {"uv": [0, 0, 0.5, 16], "texture": "#1"},
"up": {"uv": [0, 0, 6, 0.5], "texture": "#1"},
"down": {"uv": [15.5, 15.5, 14, 15], "texture": "#1"}
}
},
{
"from": [6.37338, 8.49488, 4.27104],
"to": [8.19663, 9.74288, 4.58304],
"rotation": {"angle": 0, "axis": "y", "origin": [8.08938, 8.49488, 4.023]},
"faces": {
"north": {"uv": [13, 7.5, 16, 8.5], "texture": "#1"},
"east": {"uv": [0, 7.5, 0.5, 8.5], "texture": "#1"},
"south": {"uv": [0, 7.5, 3, 8.5], "texture": "#1"},
"west": {"uv": [15.5, 7.5, 16, 8.5], "texture": "#1"},
"up": {"uv": [16, 8.5, 12.5, 7.5], "texture": "#1"},
"down": {"uv": [3.5, 8.5, 0, 7.5], "texture": "#1"}
}
},
{
"from": [8.12838, 8.49488, 4.296],
"to": [9.44462, 9.74288, 4.608],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8.12838, 8.49488, 4.296]},
"faces": {
"north": {"uv": [0, 7.5, 3, 8.5], "texture": "#1"},
"south": {"uv": [13, 7.5, 16, 8.5], "texture": "#1"},
"west": {"uv": [15.5, 7.5, 16, 8.5], "texture": "#1"},
"up": {"uv": [12, 7.5, 16, 8.5], "texture": "#1"},
"down": {"uv": [0, 7.5, 4, 8.5], "texture": "#1"}
}
},
{
"from": [2.17812, 2.39063, 1.35],
"to": [14.18125, 3.05, 12.47812],
"rotation": {"angle": 0, "axis": "y", "origin": [8.57813, 8.79063, 7.75]},
"faces": {
"north": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"east": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"south": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"west": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"up": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"down": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"}
}
},
{
"from": [2.77828, 3.01656, 1.90641],
"to": [13.58109, 3.59594, 11.92172],
"rotation": {"angle": 0, "axis": "y", "origin": [8.53828, 8.77656, 7.66641]},
"faces": {
"north": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"east": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"south": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"west": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"up": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"},
"down": {"uv": [11.75, 3.125, 12.5, 4.125], "texture": "#3"}
}
},
{
"name": "Voxels-8F7F63",
"from": [5.39208, 20.058, 5.56923],
"to": [10.91208, 21.07801, 8.06923],
"rotation": {"angle": 0, "axis": "y", "origin": [8.19208, 15.688, 6.54923]},
"faces": {
"east": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2", "cullface": "up"},
"west": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2", "cullface": "up"},
"up": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2", "cullface": "up"}
}
},
{
"name": "Voxels-8F7F63",
"from": [5.39208, 14.248, 4.67828],
"to": [10.91208, 20.18706, 8.96018],
"rotation": {"angle": 0, "axis": "y", "origin": [8.19208, 15.688, 6.90923]},
"faces": {
"north": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"east": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"south": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"west": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"down": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"}
}
},
{
"name": "Voxels-FFECAF",
"from": [3.19688, 16.82546, 5.47662],
"to": [13.19688, 20.82546, 7.97662],
"rotation": {"angle": 0, "axis": "y", "origin": [8.37328, 15.39186, 6.79142]},
"faces": {
"east": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"west": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"up": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"down": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"}
}
},
{
"name": "Voxels-FFECAF",
"from": [3.19688, 17.74934, 5.09394],
"to": [13.19688, 19.90158, 8.3593],
"rotation": {"angle": 0, "axis": "y", "origin": [8.37328, 15.21798, 6.9241]},
"faces": {
"north": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"east": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"south": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"west": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"}
}
},
{
"name": "Cube4",
"from": [3.19688, 19.67217, 7.70602],
"to": [13.19688, 20.67217, 8.20602],
"rotation": {"angle": -22.5, "axis": "x", "origin": [11.41968, 20.17217, 7.70599]},
"faces": {
"east": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"south": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"},
"west": {"uv": [10.5, 5.625, 11.5, 6.5], "texture": "#1", "cullface": "up"}
}
},
{
"name": "Cube5",
"from": [3.19688, 16.97875, 7.70602],
"to": [13.19688, 17.97875, 8.20602],
"rotation": {"angle": 22.5, "axis": "x", "origin": [11.41968, 17.47875, 7.70599]},
"faces": {
"east": {"uv": [10.5, 6.5, 11.5, 5.625], "texture": "#1", "cullface": "up"},
"south": {"uv": [10.5, 6.5, 11.5, 5.625], "texture": "#1", "cullface": "up"},
"west": {"uv": [10.5, 6.5, 11.5, 5.625], "texture": "#1", "cullface": "up"}
}
},
{
"name": "Cube6",
"from": [3.19688, 16.97875, 5.24722],
"to": [13.19688, 17.97875, 5.74722],
"rotation": {"angle": -22.5, "axis": "x", "origin": [11.41968, 17.47875, 5.74725]},
"faces": {
"north": {"uv": [11.5, 6.5, 10.5, 5.625], "texture": "#1", "cullface": "up"},
"east": {"uv": [11.5, 6.5, 10.5, 5.625], "texture": "#1", "cullface": "up"},
"west": {"uv": [11.5, 6.5, 10.5, 5.625], "texture": "#1", "cullface": "up"}
}
},
{
"name": "Cube5",
"from": [3.19688, 19.67217, 5.24722],
"to": [13.19688, 20.67217, 5.74722],
"rotation": {"angle": 22.5, "axis": "x", "origin": [11.41968, 20.17217, 5.74725]},
"faces": {
"north": {"uv": [11.5, 5.625, 10.5, 6.5], "texture": "#1", "cullface": "up"},
"east": {"uv": [11.5, 5.625, 10.5, 6.5], "texture": "#1", "cullface": "up"},
"west": {"uv": [11.5, 5.625, 10.5, 6.5], "texture": "#1", "cullface": "up"}
}
},
{
"name": "Cube1",
"from": [5.39208, 20.09194, 7.97144],
"to": [10.91208, 21.10195, 9.23144],
"rotation": {"angle": 45, "axis": "x", "origin": [5.39208, 20.97194, 7.99144]},
"faces": {
"east": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2", "cullface": "up"},
"west": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2", "cullface": "up"},
"up": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2", "cullface": "up"}
}
},
{
"name": "Cube2",
"from": [5.39208, 20.09194, 4.40702],
"to": [10.91208, 21.10195, 5.66702],
"rotation": {"angle": -45, "axis": "x", "origin": [5.39208, 20.97194, 5.64702]},
"faces": {
"east": {"uv": [11.375, 15.313, 10.375, 15.813], "texture": "#2", "cullface": "up"},
"west": {"uv": [11.375, 15.313, 10.375, 15.813], "texture": "#2", "cullface": "up"},
"up": {"uv": [10.375, 15.813, 11.375, 15.313], "texture": "#2", "cullface": "up"}
}
},
{
"name": "Element",
"from": [5.24389, 12.28446, 4.9664],
"to": [11.04664, 14.34227, 8.62515],
"rotation": {"angle": 0, "axis": "z", "origin": [8.14612, 12.97923, 6.78015]},
"faces": {
"north": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"east": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"south": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"west": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"up": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"},
"down": {"uv": [10.375, 15.313, 11.375, 15.813], "texture": "#2"}
}
},
{
"from": [7.125, 3.6, 9.9],
"to": [9.125, 23.4, 11.9],
"faces": {
"north": {"uv": [0.875, 8, 2, 9.625], "texture": "#3"},
"east": {"uv": [0.875, 8, 2, 9.625], "texture": "#3"},
"south": {"uv": [0.875, 8, 2, 9.625], "texture": "#3"},
"west": {"uv": [0.875, 8, 2, 9.625], "texture": "#3"},
"up": {"uv": [0.875, 8, 2, 9.625], "texture": "#3"},
"down": {"uv": [0.875, 8, 2, 9.625], "texture": "#3"}
}
},
{
"from": [7.125, 21.4, 5.8],
"to": [9.125, 23.4, 9.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8.125, 22.4, 0]},
"faces": {
"north": {"uv": [0.875, 1.625, 2, 4.1], "rotation": 270, "texture": "#3"},
"east": {"uv": [0.875, 1.625, 2, 4.1], "rotation": 270, "texture": "#3"},
"south": {"uv": [0.875, 1.625, 2, 4.1], "rotation": 270, "texture": "#3"},
"west": {"uv": [0.875, 1.625, 2, 4.1], "rotation": 270, "texture": "#3"},
"up": {"uv": [0.875, 1.625, 2, 4.1], "rotation": 270, "texture": "#3"},
"down": {"uv": [0.875, 1.625, 2, 4.1], "rotation": 270, "texture": "#3"}
}
},
{
"from": [6.825, 19.35, 5.625],
"to": [9.425, 21.45, 8.025],
"rotation": {"angle": 0, "axis": "x", "origin": [8.125, 22.4, 2.85]},
"faces": {
"north": {"uv": [7.375, 7.625, 9.35, 7.1], "rotation": 90, "texture": "#3"},
"east": {"uv": [7.375, 7.625, 9.35, 7.1], "rotation": 90, "texture": "#3"},
"south": {"uv": [7.375, 7.625, 9.35, 7.1], "rotation": 90, "texture": "#3"},
"west": {"uv": [7.375, 7.625, 9.35, 7.1], "rotation": 90, "texture": "#3"},
"up": {"uv": [7.375, 7.625, 9.35, 7.1], "rotation": 90, "texture": "#3"},
"down": {"uv": [7.375, 7.625, 9.35, 7.1], "rotation": 90, "texture": "#3"}
}
},
{
"from": [7.125, 10.3, 8.3],
"to": [9.125, 12.3, 10.7],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.125, 10.8, 8.7]},
"faces": {
"north": {"uv": [0.875, 1.625, 2, 2.4], "rotation": 270, "texture": "#3"},
"east": {"uv": [0.875, 1.625, 2, 2.4], "rotation": 270, "texture": "#3"},
"south": {"uv": [0.875, 1.625, 2, 2.4], "rotation": 270, "texture": "#3"},
"west": {"uv": [0.875, 1.625, 2, 2.4], "rotation": 270, "texture": "#3"},
"up": {"uv": [0.875, 1.625, 2, 2.4], "rotation": 270, "texture": "#3"},
"down": {"uv": [0.875, 1.625, 2, 2.4], "rotation": 270, "texture": "#3"}
}
},
{
"from": [5.625, 11.79224, 5.31687],
"to": [10.625, 12.79224, 8.61687],
"rotation": {"angle": 0, "axis": "x", "origin": [8.125, 10.59224, 6.89187]},
"faces": {
"north": {"uv": [7.625, 7, 8.5, 9.375], "rotation": 270, "texture": "#3"},
"east": {"uv": [7.625, 7, 8.5, 9.375], "rotation": 270, "texture": "#3"},
"south": {"uv": [7.625, 7, 8.5, 9.375], "rotation": 270, "texture": "#3"},
"west": {"uv": [7.625, 7, 8.5, 9.375], "rotation": 270, "texture": "#3"},
"up": {"uv": [7.625, 7, 8.5, 9.375], "rotation": 270, "texture": "#3"},
"down": {"uv": [7.625, 7, 8.5, 9.375], "rotation": 270, "texture": "#3"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [77, -33, 0],
"translation": [0.82, 1, 2.5],
"scale": [0.75, 0.85, 1]
},
"thirdperson_lefthand": {
"rotation": [77, -33, 0],
"translation": [0.82, 1, 2.5],
"scale": [0.75, 0.85, 1]
},
"firstperson_righthand": {
"rotation": [-3, 101, -29],
"translation": [5.5, -1.5, -1],
"scale": [0.55, 0.55, 0.55]
},
"firstperson_lefthand": {
"rotation": [3, 101, -29],
"translation": [5.5, -1.5, -1],
"scale": [0.55, 0.55, 0.55]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 143.5, 0],
"translation": [0.25, -2.586, 0],
"scale": [0.5543, 0.5543, 0.5543]
},
"head": {
"translation": [0, -31.5, 0],
"scale": [2.25, 2.25, 2.25]
},
"fixed": {
"rotation": [-90.25, 180, 0],
"translation": [0, -2.5, -12.25],
"scale": [2.51156, 2.51156, 2.51156]
}
}
}

0 comments on commit 6be7d43

Please sign in to comment.