Skip to content

Commit

Permalink
Fix trims & add studded trims
Browse files Browse the repository at this point in the history
  • Loading branch information
@AshleyThew
AshleyThew committed Apr 20, 2024
1 parent 9b6450a commit 8695e56
Show file tree
Hide file tree
Showing 8 changed files with 181 additions and 146 deletions.
12 changes: 6 additions & 6 deletions assets/minecraft/models/item/leather_chestplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,37 +290,37 @@
"predicate": {
"damage": 0.5802469135802468
},
"model":"ms:chestplate/leather_bandos_robetop"
"model":"ms:chestplate/leather_chestplate"
},
{
"predicate": {
"damage": 0.5925925925925926
},
"model":"ms:chestplate/leather_armadyl_robetop"
"model":"ms:chestplate/leather_chestplate"
},
{
"predicate": {
"damage": 0.6049382716049383
},
"model":"ms:chestplate/leather_ancient_robetop"
"model":"ms:chestplate/leather_chestplate"
},
{
"predicate": {
"damage": 0.6172839506172839
},
"model":"ms:chestplate/leather_guthix_robetop"
"model":"ms:chestplate/leather_chestplate"
},
{
"predicate": {
"damage": 0.6296296296296295
},
"model":"ms:chestplate/leather_zamorak_robetop"
"model":"ms:chestplate/studded_body_blue"
},
{
"predicate": {
"damage": 0.6419753086419753
},
"model":"ms:chestplate/leather_saradomin_robetop"
"model":"ms:chestplate/studded_body_gold"
},
{
"predicate": {
Expand Down
12 changes: 6 additions & 6 deletions assets/minecraft/models/item/leather_leggings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,37 +266,37 @@
"predicate": {
"damage": 0.5657894736842105
},
"model":"ms:leggings/leather_bandos_robelegs"
"model":"ms:leggings/leather_leggings"
},
{
"predicate": {
"damage": 0.5789473684210527
},
"model":"ms:leggings/leather_armadyl_robelegs"
"model":"ms:leggings/leather_leggings"
},
{
"predicate": {
"damage": 0.5921052631578947
},
"model":"ms:leggings/leather_ancient_robelegs"
"model":"ms:leggings/leather_leggings"
},
{
"predicate": {
"damage": 0.6052631578947368
},
"model":"ms:leggings/leather_guthix_robelegs"
"model":"ms:leggings/leather_leggings"
},
{
"predicate": {
"damage": 0.6184210526315789
},
"model":"ms:leggings/leather_zamorak_robelegs"
"model":"ms:leggings/studded_chaps_blue"
},
{
"predicate": {
"damage": 0.631578947368421
},
"model":"ms:leggings/leather_saradomin_robelegs"
"model":"ms:leggings/studded_chaps_gold"
},
{
"predicate": {
Expand Down
7 changes: 7 additions & 0 deletions assets/ms/models/chestplate/studded_body_blue.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "item/custom/diamond_pickaxe/armor/studded_body_t",
"layer1": "item/custom/diamond_pickaxe/armor/studded_body_t"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/chestplate/studded_body_gold.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "item/custom/diamond_pickaxe/armor/studded_body_g",
"layer1": "item/custom/diamond_pickaxe/armor/studded_body_g"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/leggings/studded_chaps_blue.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "item/custom/diamond_pickaxe/armor/ranging/studded_chaps_t",
"layer1": "item/custom/diamond_pickaxe/armor/ranging/studded_chaps_t"
}
}
7 changes: 7 additions & 0 deletions assets/ms/models/leggings/studded_chaps_gold.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "item/custom/diamond_pickaxe/armor/studded_chaps_g",
"layer1": "item/custom/diamond_pickaxe/armor/studded_chaps_g"
}
}
141 changes: 74 additions & 67 deletions assets/ms/models/trim/goldtrim_combined.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"credit": "Made with Blockbench",
"textures": {
"trimchest": "item/custom/colors/yellow",
"crest": "item/custom/colors/blank"
"crest": "item/custom/colors/blank",
"trimlegs": "item/custom/colors/yellow"
},
"elements": [
{
Expand All @@ -11,23 +12,25 @@
"to": [7.24967, 6.213, 5.893],
"rotation": {"angle": -22.5, "axis": "z", "origin": [3.925, 4.395, 9.529]},
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt2",
"from": [12.7239, 4.25, 4.075],
"to": [14.62371, 6.068, 11.347],
"faces": {
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [0, 0, 0, 0], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [0, 0, 0, 0], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
Expand All @@ -36,24 +39,25 @@
"to": [7.24967, 6.213, 11.347],
"rotation": {"angle": -22.5, "axis": "z", "origin": [3.925, 4.395, 9.529]},
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt",
"from": [1.375, 4.25, 4.125],
"to": [3.27481, 6.068, 11.397],
"faces": {
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [0, 0, 0, 0], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
Expand Down Expand Up @@ -191,49 +195,51 @@
"from": [11.325, 4.25, 4.075],
"to": [14.64967, 6.068, 5.893],
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [0, 0, 0, 0], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt3",
"from": [11.325, 4.25, 9.529],
"to": [14.64967, 6.068, 11.347],
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [0, 0, 0, 0], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt3",
"from": [1.325, 4.25, 9.529],
"to": [4.64967, 6.068, 11.347],
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt1",
"from": [1.325, 4.25, 4.075],
"to": [4.64967, 6.068, 5.893],
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
Expand All @@ -242,11 +248,12 @@
"to": [12.27467, 4.943, 11.347],
"rotation": {"angle": 22.5, "axis": "z", "origin": [8.95, 3.125, 9.529]},
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [0, 0, 0, 0], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
Expand All @@ -255,38 +262,38 @@
"to": [12.27467, 4.943, 5.893],
"rotation": {"angle": 22.5, "axis": "z", "origin": [8.95, 3.125, 9.529]},
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt3",
"from": [6.95, 3.125, 9.529],
"to": [8.9529, 4.943, 11.347],
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
"name": "belt1",
"from": [7, 3.125, 4.125],
"to": [9.00291, 4.943, 5.943],
"faces": {
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimchest"}
"north": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"east": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"south": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"west": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"up": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"},
"down": {"uv": [5, 0.5, 6, 2], "texture": "#trimlegs"}
}
},
{
Expand Down
Loading

0 comments on commit 8695e56

Please sign in to comment.