Skip to content

Commit

Permalink
Merge pull request #756 from Dablakbandit/Ender-Main
Browse files Browse the repository at this point in the history
Masks
  • Loading branch information
EnderSven authored Jan 18, 2024
2 parents e717c31 + a1c760d commit c7f90fb
Show file tree
Hide file tree
Showing 162 changed files with 9,822 additions and 1,399 deletions.
1,513 changes: 114 additions & 1,399 deletions assets/minecraft/models/item/beetroot.json

Large diffs are not rendered by default.

92 changes: 92 additions & 0 deletions assets/minecraft/models/item/carved_pumpkin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"parent": "block/carved_pumpkin",
"overrides": [
{ "predicate": { "custom_model_data": 6}, "model": "item/masks/snow_fox_mask"},
{ "predicate": { "custom_model_data": 7}, "model": "item/masks/enderman_mask"},
{ "predicate": { "custom_model_data": 8}, "model": "item/masks/drowned_mask"},
{ "predicate": { "custom_model_data": 9}, "model": "item/masks/husk_mask"},
{ "predicate": { "custom_model_data": 10}, "model": "item/masks/skeleton_mask"},
{ "predicate": { "custom_model_data": 11}, "model": "item/masks/spider_mask"},
{ "predicate": { "custom_model_data": 12}, "model": "item/masks/zombie_mask"},
{ "predicate": { "custom_model_data": 13}, "model": "item/masks/all_black_cat_mask"},
{ "predicate": { "custom_model_data": 14}, "model": "item/masks/black_cat_mask"},
{ "predicate": { "custom_model_data": 15}, "model": "item/masks/british_shorthair_cat_mask"},
{ "predicate": { "custom_model_data": 16}, "model": "item/masks/calico_cat_mask"},
{ "predicate": { "custom_model_data": 17}, "model": "item/masks/jellie_cat_mask"},
{ "predicate": { "custom_model_data": 18}, "model": "item/masks/ocelot_mask"},
{ "predicate": { "custom_model_data": 19}, "model": "item/masks/persian_cat_mask"},
{ "predicate": { "custom_model_data": 20}, "model": "item/masks/ragdoll_cat_mask"},
{ "predicate": { "custom_model_data": 21}, "model": "item/masks/red_cat_mask"},
{ "predicate": { "custom_model_data": 22}, "model": "item/masks/siamese_cat_mask"},
{ "predicate": { "custom_model_data": 23}, "model": "item/masks/tabby_cat_mask"},
{ "predicate": { "custom_model_data": 24}, "model": "item/masks/white_cat_mask"},
{ "predicate": { "custom_model_data": 25}, "model": "item/masks/black_horse_mask"},
{ "predicate": { "custom_model_data": 26}, "model": "item/masks/brown_horse_mask"},
{ "predicate": { "custom_model_data": 27}, "model": "item/masks/chestnut_horse_mask"},
{ "predicate": { "custom_model_data": 28}, "model": "item/masks/creamy_horse_mask"},
{ "predicate": { "custom_model_data": 29}, "model": "item/masks/darkbrown_horse_mask"},
{ "predicate": { "custom_model_data": 30}, "model": "item/masks/gray_horse_mask"},
{ "predicate": { "custom_model_data": 31}, "model": "item/masks/white_horse_mask"},
{ "predicate": { "custom_model_data": 32}, "model": "item/masks/bat_mask"},
{ "predicate": { "custom_model_data": 33}, "model": "item/masks/oak_mask"},
{ "predicate": { "custom_model_data": 34}, "model": "item/masks/birch_mask"},
{ "predicate": { "custom_model_data": 35}, "model": "item/masks/spruce_mask"},
{ "predicate": { "custom_model_data": 36}, "model": "item/masks/jungle_mask"},
{ "predicate": { "custom_model_data": 37}, "model": "item/masks/acacia_mask"},
{ "predicate": { "custom_model_data": 38}, "model": "item/masks/dark_oak_mask"},
{ "predicate": { "custom_model_data": 39}, "model": "item/masks/fox_mask"},
{ "predicate": { "custom_model_data": 40}, "model": "item/masks/blaze_mask"},
{ "predicate": { "custom_model_data": 41}, "model": "item/masks/cave_spider_mask"},
{ "predicate": { "custom_model_data": 42}, "model": "item/masks/creeper_mask"},
{ "predicate": { "custom_model_data": 43}, "model": "item/masks/stray_mask"},
{ "predicate": { "custom_model_data": 44}, "model": "item/masks/vex_mask"},
{ "predicate": { "custom_model_data": 45}, "model": "item/masks/wither_skeleton_mask"},
{ "predicate": { "custom_model_data": 46}, "model": "item/masks/zombie_pigman_mask"},
{ "predicate": { "custom_model_data": 47}, "model": "item/masks/skeleton_horse_mask"},
{ "predicate": { "custom_model_data": 48}, "model": "item/masks/zombie_horse_mask"},
{ "predicate": { "custom_model_data": 49}, "model": "item/masks/brown_mooshroom_mask"},
{ "predicate": { "custom_model_data": 50}, "model": "item/masks/red_mooshroom_mask"},
{ "predicate": { "custom_model_data": 51}, "model": "item/masks/cow_mask"},
{ "predicate": { "custom_model_data": 52}, "model": "item/masks/pig_mask"},
{ "predicate": { "custom_model_data": 53}, "model": "item/masks/dolphin_mask"},
{ "predicate": { "custom_model_data": 54}, "model": "item/masks/wolf_mask"},
{ "predicate": { "custom_model_data": 55}, "model": "item/masks/polar_bear_mask"},
{ "predicate": { "custom_model_data": 56}, "model": "item/masks/turtle_mask"},
{ "predicate": { "custom_model_data": 57}, "model": "item/masks/blue_parrot_mask"},
{ "predicate": { "custom_model_data": 58}, "model": "item/masks/green_parrot_mask"},
{ "predicate": { "custom_model_data": 59}, "model": "item/masks/grey_parrot_mask"},
{ "predicate": { "custom_model_data": 60}, "model": "item/masks/red_blue_parrot_mask"},
{ "predicate": { "custom_model_data": 61}, "model": "item/masks/yellow_blue_parrot_mask"},
{ "predicate": { "custom_model_data": 62}, "model": "item/masks/chicken_mask"},
{ "predicate": { "custom_model_data": 63}, "model": "item/masks/squid_mask"},
{ "predicate": { "custom_model_data": 64}, "model": "item/masks/donkey_mask"},
{ "predicate": { "custom_model_data": 65}, "model": "item/masks/mule_mask"},
{ "predicate": { "custom_model_data": 66}, "model": "item/masks/black_rabbit_mask"},
{ "predicate": { "custom_model_data": 67}, "model": "item/masks/brown_rabbit_mask"},
{ "predicate": { "custom_model_data": 68}, "model": "item/masks/caerbannog_rabbit_mask"},
{ "predicate": { "custom_model_data": 69}, "model": "item/masks/gold_rabbit_mask"},
{ "predicate": { "custom_model_data": 70}, "model": "item/masks/salt_rabbit_mask"},
{ "predicate": { "custom_model_data": 71}, "model": "item/masks/toast_rabbit_mask"},
{ "predicate": { "custom_model_data": 72}, "model": "item/masks/white_rabbit_mask"},
{ "predicate": { "custom_model_data": 73}, "model": "item/masks/white_splotched_rabbit_mask"},
{ "predicate": { "custom_model_data": 74}, "model": "item/masks/ghast_mask"},
{ "predicate": { "custom_model_data": 75}, "model": "item/masks/panda_mask"},
{ "predicate": { "custom_model_data": 76}, "model": "item/masks/aggressive_panda_mask"},
{ "predicate": { "custom_model_data": 77}, "model": "item/masks/brown_panda_mask"},
{ "predicate": { "custom_model_data": 78}, "model": "item/masks/lazy_panda_mask"},
{ "predicate": { "custom_model_data": 79}, "model": "item/masks/playful_panda_mask"},
{ "predicate": { "custom_model_data": 80}, "model": "item/masks/weak_panda_mask"},
{ "predicate": { "custom_model_data": 81}, "model": "item/masks/worried_panda_mask"},
{ "predicate": { "custom_model_data": 82}, "model": "item/masks/guardian_mask"},
{ "predicate": { "custom_model_data": 83}, "model": "item/masks/elder_guardian_mask"},
{ "predicate": { "custom_model_data": 84}, "model": "item/masks/brown_llama_mask"},
{ "predicate": { "custom_model_data": 85}, "model": "item/masks/creamy_llama_mask"},
{ "predicate": { "custom_model_data": 86}, "model": "item/masks/gray_llama_mask"},
{ "predicate": { "custom_model_data": 87}, "model": "item/masks/white_llama_mask"},
{ "predicate": { "custom_model_data": 88}, "model": "item/masks/ravager_mask"},
{ "predicate": { "custom_model_data": 89}, "model": "item/masks/iron_golem_mask"},
{ "predicate": { "custom_model_data": 90}, "model": "item/masks/wither_mask"},
{ "predicate": { "custom_model_data": 91}, "model": "item/masks/snow_golem_mask"},
{ "predicate": { "custom_model_data": 92}, "model": "item/masks/shulker_mask"}
]
}
111 changes: 111 additions & 0 deletions assets/minecraft/models/item/masks/aggressive_panda_mask.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"__comment": "Made by EnderSven",
"textures": {
"texture": "item/masks/aggressive_panda_mask",
"particle": "block/anvil"
},
"elements": [
{
"__comment": "Box5",
"from": [ 1.5, 3.5, 6 ],
"to": [ 14.5, 4.5, 17 ],
"faces": {
"north": { "uv": [ 1.5, 11.5, 14.5, 12.5 ], "texture": "#particle" },
"south": { "uv": [ 1.5, 11.5, 14.5, 12.5 ], "texture": "#particle" },
"west": { "uv": [ 5, 11.5, 16, 12.5 ], "texture": "#particle" },
"east": { "uv": [ 0, 11.5, 11, 12.5 ], "texture": "#particle" }
}
},
{
"__comment": "Box3",
"from": [ 1.5, 0, 4 ],
"to": [ 14.5, 10, 6 ],
"faces": {
"down": { "uv": [ 7.5, 0, 14, 1 ], "texture": "#texture" },
"up": { "uv": [ 1, 0, 7.5, 1 ], "texture": "#texture" },
"north": { "uv": [ 1, 1, 7.5, 6 ], "texture": "#texture" },
"south": { "uv": [ 8.5, 1, 15, 6 ], "texture": "#texture" },
"west": { "uv": [ 7.5, 1, 8.5, 6 ], "texture": "#texture" },
"east": { "uv": [ 0, 1, 1, 6 ], "texture": "#texture" }
}
},
{
"__comment": "Box4",
"from": [ 4.5, 0, 2 ],
"to": [ 11.5, 5, 4 ],
"faces": {
"down": { "uv": [ 4.5, 7, 8, 6 ], "texture": "#texture" },
"up": { "uv": [ 1, 6, 4.5, 7 ], "texture": "#texture" },
"north": { "uv": [ 1, 7, 4.5, 9.5 ], "texture": "#texture" },
"south": { "uv": [ 5.5, 7, 9, 9.5 ], "texture": "#texture" },
"west": { "uv": [ 4.5, 7, 5.5, 9.5 ], "texture": "#texture" },
"east": { "uv": [ 0, 7, 1, 9.5 ], "texture": "#texture" }
}
},
{
"__comment": "Box5",
"from": [ -1.5, 9, 5.5 ],
"to": [ 3.5, 13, 6.5 ],
"faces": {
"down": { "uv": [ 12, 7, 14.5, 7.5 ], "texture": "#texture" },
"up": { "uv": [ 9.5, 7, 12, 7.5 ], "texture": "#texture" },
"north": { "uv": [ 9.5, 7.5, 12, 9.5 ], "texture": "#texture" },
"south": { "uv": [ 12.5, 7.5, 15, 9.5 ], "texture": "#texture" },
"west": { "uv": [ 12, 7.5, 12.5, 9.5 ], "texture": "#texture" },
"east": { "uv": [ 9, 7.5, 9.5, 9.5 ], "texture": "#texture" }
}
},
{
"__comment": "Box5",
"from": [ 12.5, 9, 5.5 ],
"to": [ 17.5, 13, 6.5 ],
"faces": {
"down": { "uv": [ 12, 7, 14.5, 7.5 ], "texture": "#texture" },
"up": { "uv": [ 9.5, 7, 12, 7.5 ], "texture": "#texture" },
"north": { "uv": [ 12, 7.5, 9.5, 9.5 ], "texture": "#texture" },
"south": { "uv": [ 15, 7.5, 12.5, 9.5 ], "texture": "#texture" },
"west": { "uv": [ 9, 7.5, 9.5, 9.5 ], "texture": "#texture" },
"east": { "uv": [ 12, 7.5, 12.5, 9.5 ], "texture": "#texture" }
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [ 0, 90, -55 ],
"translation": [ 0, 4, 0.5 ],
"scale": [ 0.85, 0.85, 0.85 ]
},
"thirdperson_lefthand": {
"rotation": [ 0, 90, -55 ],
"translation": [ 0, 4, 0.5 ],
"scale": [ 0.85, 0.85, 0.85 ]
},
"firstperson_righthand": {
"rotation": [ 0, 90, -25 ],
"translation": [ 1.13, 3.2, 1.13 ],
"scale": [ 0.68, 0.68, 0.68 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 90, -25 ],
"translation": [ 1.13, 3.2, 1.13 ],
"scale": [ 0.68, 0.68, 0.68 ]
},
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0.5, 2, 0 ]
},
"head": {
"translation": [ 0, 2, -3 ],
"scale": [ 1.125, 1.125, 1.125 ]
},
"ground": {
"translation": [ 0, 2, 0 ],
"scale": [ 0.5, 0.5, 0.5 ]
},
"fixed": {
"rotation": [ -22.5, 0, 0 ],
"translation": [ 0, 8, 2 ],
"scale": [ 2, 2, 2 ]
}
}
}
125 changes: 125 additions & 0 deletions assets/minecraft/models/item/masks/all_black_cat_mask.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
{
"__comment": "Made by EnderSven",
"textures": {
"texture": "item/masks/all_black_cat_mask",
"particle": "block/anvil"
},
"elements": [
{
"__comment": "Box1",
"from": [ 5.5, 1, 7 ],
"to": [ 10.5, 5, 12 ],
"faces": {
"down": { "uv": [ 5, 2.5, 7.5, 0 ], "texture": "#texture" },
"up": { "uv": [ 2.5, 2.5, 5, 0 ], "texture": "#texture" },
"north": { "uv": [ 2.5, 2.5, 5, 4.5 ], "texture": "#texture" },
"south": { "uv": [ 7.5, 2.5, 10, 4.5 ], "texture": "#texture" },
"west": { "uv": [ 5, 2.5, 7.5, 4.5 ], "texture": "#texture" },
"east": { "uv": [ 0, 2.5, 2.5, 4.5 ], "texture": "#texture" }
}
},
{
"__comment": "Box2",
"from": [ 6, 0, 3 ],
"to": [ 10, 2, 6 ],
"faces": {
"down": { "uv": [ 6.5, 9, 8.5, 10.5 ], "texture": "#texture" },
"up": { "uv": [ 4.5, 9, 6.5, 10.5 ], "texture": "#texture" },
"north": { "uv": [ 4.5, 10.5, 6.5, 11.5 ], "texture": "#texture" },
"south": { "uv": [ 8, 10.5, 10, 11.5 ], "texture": "#texture" },
"west": { "uv": [ 6.5, 10.5, 8, 11.5 ], "texture": "#texture" },
"east": { "uv": [ 3, 10.5, 4.5, 11.5 ], "texture": "#texture" }
}
},
{
"__comment": "Box5",
"from": [ 5, 3, 8.75 ],
"to": [ 11, 4, 14.5 ],
"faces": {
"north": { "uv": [ 4, 12, 12, 13 ], "texture": "#particle" },
"south": { "uv": [ 4, 12, 12, 13 ], "texture": "#particle" },
"west": { "uv": [ 12, 12, 15, 13 ], "texture": "#particle" },
"east": { "uv": [ 1, 12, 4, 13 ], "texture": "#particle" }
}
},
{
"__comment": "Box6",
"from": [ 6.5, 1, 6 ],
"to": [ 9.5, 3, 8 ],
"faces": {
"down": { "uv": [ 14.5, 3, 16, 4 ], "texture": "#texture" },
"up": { "uv": [ 13, 3, 14.5, 4 ], "texture": "#texture" },
"north": { "uv": [ 13, 4, 14.5, 5 ], "texture": "#texture" },
"south": { "uv": [ 6.5, 13, 9.5, 15 ], "texture": "#texture" },
"west": { "uv": [ 14.5, 4, 15.5, 5 ], "texture": "#texture" },
"east": { "uv": [ 12, 4, 13, 5 ], "texture": "#texture" }
}
},
{
"__comment": "Box7",
"from": [ 5.75, 5, 8.5 ],
"to": [ 6.75, 6, 10.5 ],
"faces": {
"down": { "uv": [ 2, 5, 3, 6 ], "texture": "#texture" },
"up": { "uv": [ 1, 5.5, 2, 6 ], "texture": "#texture" },
"north": { "uv": [ 1, 6, 1.5, 6.5 ], "texture": "#texture" },
"south": { "uv": [ 2.5, 6, 3, 6.5 ], "texture": "#texture" },
"west": { "uv": [ 0, 6, 1, 6.5 ], "texture": "#texture" },
"east": { "uv": [ 1.5, 6, 2.5, 6.5 ], "texture": "#texture" }
}
},
{
"__comment": "Box7",
"from": [ 9.25, 5, 8.5 ],
"to": [ 10.25, 6, 10.5 ],
"faces": {
"down": { "uv": [ 2, 5, 3, 6 ], "texture": "#texture" },
"up": { "uv": [ 4, 5.5, 5, 6 ], "texture": "#texture" },
"north": { "uv": [ 4, 6, 4.5, 6.5 ], "texture": "#texture" },
"south": { "uv": [ 5.5, 6, 6, 6.5 ], "texture": "#texture" },
"west": { "uv": [ 3, 6, 4, 6.5 ], "texture": "#texture" },
"east": { "uv": [ 4.5, 6, 5.5, 6.5 ], "texture": "#texture" }
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [ 0, 90, -55 ],
"translation": [ 0, 4, 0.5 ],
"scale": [ 0.85, 0.85, 0.85 ]
},
"thirdperson_lefthand": {
"rotation": [ 0, 90, -55 ],
"translation": [ 0, 4, 0.5 ],
"scale": [ 0.85, 0.85, 0.85 ]
},
"firstperson_righthand": {
"rotation": [ 0, 90, -25 ],
"translation": [ 1.13, 5.5, 1.13 ],
"scale": [ 0.68, 0.68, 0.68 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 90, -25 ],
"translation": [ 1.13, 5.5, 1.13 ],
"scale": [ 0.68, 0.68, 0.68 ]
},
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0.5, 6.25, 0 ],
"scale": [ 1.5, 1.5, 1.5 ]
},
"head": {
"translation": [ 0, 10.25, -9 ],
"scale": [ 2.5, 2.5, 2.5 ]
},
"ground": {
"translation": [ 0, 2, 0 ],
"scale": [ 0.5, 0.5, 0.5 ]
},
"fixed": {
"rotation": [ -67.5, 0, 0 ],
"translation": [ 0, 0, -16 ],
"scale": [ 3, 3, 3 ]
}
}
}
Loading

0 comments on commit c7f90fb

Please sign in to comment.