Skip to content

Commit

Permalink
Merge pull request #748 from Dablakbandit/Ender-Main
Browse files Browse the repository at this point in the history 
Stattues
  • Loading branch information
@EnderSven
EnderSven authored Jan 17, 2024
2 parents 5a0c8ab + b90c233 commit 2d797bd
Show file tree
Hide file tree
Showing 9 changed files with 5,892 additions and 6 deletions.
2 changes: 1 addition & 1 deletion assets/minecraft/models/item/apple.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{"predicate": {"custom_model_data":36},"model":"ms:mobs/barbarian_assault/penance_fighter"},
{"predicate": {"custom_model_data":37},"model":"ms:mobs/barbarian_assault/penance_healer"},
{"predicate": {"custom_model_data":38},"model":"ms:mobs/barbarian_assault/penance_runner"},
{"predicate": {"custom_model_data":39},"model":"item/empty"},
{"predicate": {"custom_model_data":39},"model":"ms:mobs/barbarian_assault/queen_spawn"},
{"predicate": {"custom_model_data":40},"model":"item/empty"},
{"predicate": {"custom_model_data":41},"model":"item/empty"},
{"predicate": {"custom_model_data":42},"model":"item/empty"},
Expand Down
10 changes: 5 additions & 5 deletions assets/minecraft/models/item/arrow.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@
{"predicate": {"custom_model_data":110},"model":"ms:clutter/rotten_apple_pile"},
{"predicate": {"custom_model_data":111},"model":"ms:clutter/apple_press"},
{"predicate": {"custom_model_data":112},"model":"ms:clutter/dolmen"},
{"predicate": {"custom_model_data":113},"model":"item/empty"},
{"predicate": {"custom_model_data":114},"model":"item/empty"},
{"predicate": {"custom_model_data":115},"model":"item/empty"},
{"predicate": {"custom_model_data":116},"model":"item/empty"},
{"predicate": {"custom_model_data":117},"model":"item/empty"},
{"predicate": {"custom_model_data":113},"model":"ms:mobs/barbarian_assault/fighter_stattue"},
{"predicate": {"custom_model_data":114},"model":"ms:mobs/barbarian_assault/runner_stattue"},
{"predicate": {"custom_model_data":115},"model":"ms:mobs/barbarian_assault/healer_stattue"},
{"predicate": {"custom_model_data":116},"model":"ms:mobs/barbarian_assault/ranger_stattue"},
{"predicate": {"custom_model_data":117},"model":"ms:mobs/barbarian_assault/queen_spawn_stattue"},
{"predicate": {"custom_model_data":118},"model":"item/empty"},
{"predicate": {"custom_model_data":119},"model":"item/empty"},
{"predicate": {"custom_model_data":120},"model":"item/empty"},
Expand Down
Binary file added assets/minecraft/textures/item/custom/colors/penance_set/rockwings.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.
1,287 changes: 1,287 additions & 0 deletions assets/ms/models/mobs/barbarian_assault/fighter_stattue.json
View file

Large diffs are not rendered by default.

2,764 changes: 2,764 additions & 0 deletions assets/ms/models/mobs/barbarian_assault/healer_stattue.json
View file

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions assets/ms/models/mobs/barbarian_assault/queen_spawn.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"credit": "Made with Blockbench",
"textures": {
"4": "item/custom/colors/penance_set/runnerleg1",
"5": "item/custom/colors/red_darker",
"6": "item/custom/colors/white",
"particle": "item/custom/colors/penance_set/rangerwings"
},
"elements": [
{
"from": [7.72125, 16.87475, 4.01152],
"to": [8.30445, 17.50655, 4.47227],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.025, 17.53085, 4.69097]},
"faces": {
"north": {"uv": [0, 0, 2.4, 2.6], "rotation": 180, "texture": "#5"},
"east": {"uv": [0, 0, 2.6, 0.25], "rotation": 90, "texture": "#5"},
"south": {"uv": [0, 0, 2.4, 2.6], "texture": "#5"},
"west": {"uv": [0, 0, 2.6, 0.25], "rotation": 270, "texture": "#5"},
"up": {"uv": [0, 0, 2.4, 0.25], "texture": "#5"},
"down": {"uv": [0, 0, 2.4, 0.25], "rotation": 180, "texture": "#5"}
}
},
{
"from": [7.42965, 16.56783, 3.90197],
"to": [8.59605, 17.83143, 4.52347],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.03715, 17.88003, 4.64497]},
"faces": {
"north": {"uv": [0, 0, 2.4, 2.6], "rotation": 180, "texture": "#6"},
"east": {"uv": [0, 0, 2.6, 0.25], "rotation": 90, "texture": "#6"},
"south": {"uv": [0, 0, 2.4, 2.6], "texture": "#6"},
"west": {"uv": [0, 0, 2.6, 0.25], "rotation": 270, "texture": "#6"},
"up": {"uv": [0, 0, 2.4, 0.25], "texture": "#6"},
"down": {"uv": [0, 0, 2.4, 0.25], "rotation": 180, "texture": "#6"}
}
},
{
"from": [7.28385, 16.42203, 4.43842],
"to": [8.74185, 17.97723, 6.50392],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.03715, 17.88003, 4.64497]},
"faces": {
"north": {"uv": [0, 0, 3, 3.2], "rotation": 180, "texture": "#4"},
"east": {"uv": [0, 0, 3.2, 4.25], "rotation": 90, "texture": "#4"},
"south": {"uv": [0, 0, 3, 3.2], "texture": "#4"},
"west": {"uv": [0, 0, 3.2, 4.25], "rotation": 270, "texture": "#4"},
"up": {"uv": [0, 0, 3, 4.25], "texture": "#4"},
"down": {"uv": [0, 0, 3, 4.25], "rotation": 180, "texture": "#4"}
}
},
{
"from": [7.50255, 17.15103, 6.23662],
"to": [8.57175, 18.60903, 8.30212],
"rotation": {"angle": 0, "axis": "y", "origin": [8.03715, 17.88003, 6.88057]},
"faces": {
"north": {"uv": [0, 0, 2.2, 3], "rotation": 180, "texture": "#4"},
"east": {"uv": [0, 0, 3, 4.25], "rotation": 90, "texture": "#4"},
"south": {"uv": [0, 0, 2.2, 3], "texture": "#4"},
"west": {"uv": [0, 0, 3, 4.25], "rotation": 270, "texture": "#4"},
"up": {"uv": [0, 0, 2.2, 4.25], "texture": "#4"},
"down": {"uv": [0, 0, 2.2, 4.25], "rotation": 180, "texture": "#4"}
}
},
{
"from": [7.30255, 16.3765, 7.72255],
"to": [8.76055, 17.8345, 9.70865],
"rotation": {"angle": 45, "axis": "x", "origin": [8.03155, 17.5555, 8.9406]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#4"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#4"},
"south": {"uv": [0, 0, 3, 3], "texture": "#4"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#4"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#4"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#4"}
}
},
{
"from": [7.30255, 16.17515, 8.6625],
"to": [8.76055, 17.33315, 10.9736],
"rotation": {"angle": 0, "axis": "x", "origin": [8.03155, 15.92915, 9.93055]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#4"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#4"},
"south": {"uv": [0, 0, 3, 3], "texture": "#4"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#4"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#4"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#4"}
}
},
{
"from": [7.55255, 16.75015, 10.7875],
"to": [8.51055, 17.70815, 12.4986],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.03155, 16.75415, 12.26805]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#4"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#4"},
"south": {"uv": [0, 0, 3, 3], "texture": "#4"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#4"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#4"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#4"}
}
},
{
"from": [7.71062, 17.48824, 12.32974],
"to": [8.35248, 17.81185, 13.47617],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.03155, 17.09767, 12.48295]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#4"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#4"},
"south": {"uv": [0, 0, 3, 3], "texture": "#4"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#4"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#4"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#4"}
}
}
],
"display": {
"gui": {
"rotation": [-159.5, -43.75, 180],
"translation": [0, -13.25, 0],
"scale": [1.64454, 1.64454, 1.64454]
},
"head": {
"translation": [-0.5, -73.75, 0],
"scale": [4, 4, 4]
}
}
}
190 changes: 190 additions & 0 deletions assets/ms/models/mobs/barbarian_assault/queen_spawn_stattue.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "item/custom/stone",
"particle": "item/custom/stone"
},
"elements": [
{
"from": [1.74616, -4.22715, 0.90121],
"to": [14.22616, -2.66715, 13.38121],
"rotation": {"angle": 0, "axis": "y", "origin": [1.74616, -0.58715, 0.90121]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
},
{
"from": [1.74616, 4.66485, 0.90121],
"to": [14.22616, 6.22485, 13.38121],
"rotation": {"angle": 0, "axis": "y", "origin": [1.74616, -0.58715, 0.90121]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
},
{
"from": [2.99416, -2.66715, 2.14921],
"to": [12.97816, 4.82085, 12.13321],
"rotation": {"angle": 0, "axis": "y", "origin": [2.99416, -0.11915, 2.14921]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
},
{
"from": [4.49176, -1.54395, 1.85281],
"to": [11.48056, 2.91765, 2.60161],
"rotation": {"angle": 0, "axis": "y", "origin": [4.49176, 1.37845, -0.16739]},
"faces": {
"north": {"uv": [0, 0, 16, 2], "texture": "#0"},
"east": {"uv": [0, 0, 16, 2], "texture": "#0"},
"south": {"uv": [0, 0, 16, 2], "texture": "#0"},
"west": {"uv": [0, 0, 16, 2], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
}
},
{
"from": [7.53728, 10.73709, -1.57088],
"to": [8.50539, 11.78587, -0.80603],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.0415, 11.82621, -0.44299]},
"faces": {
"north": {"uv": [0, 0, 2.4, 2.6], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 2.6, 0.25], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 2.4, 2.6], "texture": "#0"},
"west": {"uv": [0, 0, 2.6, 0.25], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 2.4, 0.25], "texture": "#0"},
"down": {"uv": [0, 0, 2.4, 0.25], "rotation": 180, "texture": "#0"}
}
},
{
"from": [7.05322, 10.2276, -1.75273],
"to": [8.98944, 12.32517, -0.72104],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.06167, 12.40585, -0.51935]},
"faces": {
"north": {"uv": [0, 0, 2.4, 2.6], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 2.6, 0.25], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 2.4, 2.6], "texture": "#0"},
"west": {"uv": [0, 0, 2.6, 0.25], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 2.4, 0.25], "texture": "#0"},
"down": {"uv": [0, 0, 2.4, 0.25], "rotation": 180, "texture": "#0"}
}
},
{
"from": [6.81119, 9.98557, -0.86222],
"to": [9.23147, 12.5672, 2.56651],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.06167, 12.40585, -0.51935]},
"faces": {
"north": {"uv": [0, 0, 3, 3.2], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 3.2, 4.25], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 3, 3.2], "texture": "#0"},
"west": {"uv": [0, 0, 3.2, 4.25], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 3, 4.25], "texture": "#0"},
"down": {"uv": [0, 0, 3, 4.25], "rotation": 180, "texture": "#0"}
}
},
{
"from": [7.17423, 11.19571, 2.12279],
"to": [8.94911, 13.61599, 5.55152],
"rotation": {"angle": 0, "axis": "y", "origin": [8.06167, 12.40585, 3.19175]},
"faces": {
"north": {"uv": [0, 0, 2.2, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 3, 4.25], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 2.2, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3, 4.25], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 2.2, 4.25], "texture": "#0"},
"down": {"uv": [0, 0, 2.2, 4.25], "rotation": 180, "texture": "#0"}
}
},
{
"from": [6.84223, 6.55999, 5.36444],
"to": [9.26251, 8.98027, 8.66136],
"rotation": {"angle": 45, "axis": "x", "origin": [8.05237, 8.51713, 7.3864]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 3, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#0"}
}
},
{
"from": [6.84223, 11.28256, 3.56194],
"to": [9.26251, 14.57948, 5.98222],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.05237, 12.53102, 10.87208]},
"faces": {
"north": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"east": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"south": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"west": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"up": {"uv": [0, 0, 3, 3], "texture": "#0"},
"down": {"uv": [0, 0, 3, 3], "texture": "#0"}
}
},
{
"from": [6.84223, 6.22575, 6.92475],
"to": [9.26251, 8.14803, 10.76118],
"rotation": {"angle": 0, "axis": "y", "origin": [8.05237, 5.81739, 9.02972]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 3, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#0"}
}
},
{
"from": [7.25723, 7.18025, 10.45225],
"to": [8.84751, 8.77053, 13.29268],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.05237, 7.18689, 12.90997]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 3, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#0"}
}
},
{
"from": [7.51963, 8.40547, 13.01236],
"to": [8.58512, 8.94266, 14.91545],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8.05237, 7.75712, 13.2667]},
"faces": {
"north": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#0"},
"east": {"uv": [0, 0, 3, 6.35], "rotation": 90, "texture": "#0"},
"south": {"uv": [0, 0, 3, 3], "texture": "#0"},
"west": {"uv": [0, 0, 3, 6.35], "rotation": 270, "texture": "#0"},
"up": {"uv": [0, 0, 3, 6.35], "texture": "#0"},
"down": {"uv": [0, 0, 3, 6.35], "rotation": 180, "texture": "#0"}
}
}
],
"display": {
"gui": {
"rotation": [-156.82, -34.98, 176.79],
"translation": [0, 3.5, 0],
"scale": [0.7207, 0.7207, 0.7207]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 4, -46.75],
"scale": [4, 4, 4]
}
}
}
Loading

0 comments on commit 2d797bd

Please sign in to comment.