forked from GeyserMC/Geyser
Adds skin ears from MinecraftCapes.co.uk + Clientside linked account skins + Elytra textures (#539)
* Added ears geometry support * Added ear fetching from mc capes * Added support for deadmau5 * Commented, documented and cleaned code * Allow bedrock players to see their java skin/cape/ears when joining * Optimised Imports * Fix missing else statement * Moved ears and fixed elytra skins * Added ears config option * Fixed cape/elytra transparency * Fixed slim skin geometry * Fixed async ears request and added alex skin * Fixed default elytra not showing with no cape * Moved to normal Base64 functions Co-authored-by: James Harrison <james@fasttortoise.co.uk>
This commit is contained in:
rtm516
GitHub
parent
1664221fa9
commit
fc6532732d
14 changed files with 838 additions and 43 deletions
|
|
@ -0,0 +1,249 @@
|
|||
{
|
||||
"format_version": "1.14.0",
|
||||
"minecraft:geometry": [
|
||||
{
|
||||
"bones": [
|
||||
{
|
||||
"name" : "root",
|
||||
"pivot" : [ 0.0, 0.0, 0.0 ]
|
||||
},
|
||||
|
||||
{
|
||||
"name" : "waist",
|
||||
"parent" : "root",
|
||||
"pivot" : [ 0.0, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes" : []
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "body",
|
||||
"parent" : "waist",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 12.0, -2.0 ],
|
||||
"size": [ 8, 12, 4 ],
|
||||
"uv": [ 16, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "jacket",
|
||||
"parent" : "body",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 12.0, -2.0 ],
|
||||
"size": [ 8, 12, 4 ],
|
||||
"uv": [ 16, 32 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "head",
|
||||
"parent" : "body",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 24.0, -4.0 ],
|
||||
"size": [ 8, 8, 8 ],
|
||||
"uv": [ 0, 0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "hat",
|
||||
"parent" : "head",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 24.0, -4.0 ],
|
||||
"size": [ 8, 8, 8 ],
|
||||
"uv": [ 32, 0 ],
|
||||
"inflate": 0.5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "leftArm",
|
||||
"parent" : "body",
|
||||
"pivot": [ 5.0, 22.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ 4.0, 12.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 32, 48 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "rightArm",
|
||||
"parent" : "body",
|
||||
"pivot": [ -5.0, 22.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -8.0, 12.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 40, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "leftSleeve",
|
||||
"parent" : "leftArm",
|
||||
"pivot": [ 5.0, 22.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ 4.0, 12.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 48, 48 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightSleeve",
|
||||
"parent" : "rightArm",
|
||||
"pivot": [ -5.0, 22.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -8.0, 12.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 40, 32 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "leftLeg",
|
||||
"parent" : "root",
|
||||
"pivot": [ 1.9, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -0.1, 0.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightLeg",
|
||||
"parent" : "root",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -3.9, 0.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "leftPants",
|
||||
"parent" : "leftLeg",
|
||||
"pivot": [1.9, 12.0, 0.0],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -0.1, 0.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 48 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightPants",
|
||||
"parent" : "rightLeg",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -3.9, 0.0, -2.0] ,
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 32],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name" : "rightItem",
|
||||
"parent" : "rightArm",
|
||||
"pivot" : [ -6.0, 15.0, 1.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes" : []
|
||||
},
|
||||
|
||||
{
|
||||
"name" : "leftItem",
|
||||
"parent" : "leftArm",
|
||||
"pivot" : [ 6.0, 15.0, 1.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes" : []
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "leftEar",
|
||||
"parent" : "head",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ 3.0, 31.0, -0.5 ],
|
||||
"size": [ 6, 6, 1 ],
|
||||
"uv": [ 24, 0 ],
|
||||
"inflate": 0.5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightEar",
|
||||
"parent" : "head",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -9.0, 31.0, -0.5 ],
|
||||
"size": [ 6, 6, 1 ],
|
||||
"uv": [ 24, 0 ],
|
||||
"inflate": 0.5
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"description": {
|
||||
"identifier": "geometry.humanoid.ears",
|
||||
"texture_height": 64,
|
||||
"texture_width": 64
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,249 @@
|
|||
{
|
||||
"format_version": "1.14.0",
|
||||
"minecraft:geometry": [
|
||||
{
|
||||
"bones": [
|
||||
{
|
||||
"name" : "root",
|
||||
"pivot" : [ 0.0, 0.0, 0.0 ]
|
||||
},
|
||||
|
||||
{
|
||||
"name" : "waist",
|
||||
"parent" : "root",
|
||||
"pivot" : [ 0.0, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes" : []
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "body",
|
||||
"parent" : "waist",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 12.0, -2.0 ],
|
||||
"size": [ 8, 12, 4 ],
|
||||
"uv": [ 16, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "jacket",
|
||||
"parent" : "body",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 12.0, -2.0 ],
|
||||
"size": [ 8, 12, 4 ],
|
||||
"uv": [ 16, 32 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "head",
|
||||
"parent" : "body",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 24.0, -4.0 ],
|
||||
"size": [ 8, 8, 8 ],
|
||||
"uv": [ 0, 0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "hat",
|
||||
"parent" : "head",
|
||||
"pivot": [ 0.0, 24.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -4.0, 24.0, -4.0 ],
|
||||
"size": [ 8, 8, 8 ],
|
||||
"uv": [ 32, 0 ],
|
||||
"inflate": 0.5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "leftArm",
|
||||
"parent" : "body",
|
||||
"pivot": [ 5.0, 21.5, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ 4.0, 12, -2.0 ],
|
||||
"size": [ 3, 12, 4 ],
|
||||
"uv": [ 32, 48 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "rightArm",
|
||||
"parent" : "body",
|
||||
"pivot": [ -5.0, 21.5, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -7.0, 12, -2.0 ],
|
||||
"size": [ 3, 12, 4 ],
|
||||
"uv": [ 40, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "leftSleeve",
|
||||
"parent" : "leftArm",
|
||||
"pivot": [ 5.0, 21.5, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ 4.0, 11.5, -2.0 ],
|
||||
"size": [ 3, 12, 4 ],
|
||||
"uv": [ 48, 48 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightSleeve",
|
||||
"parent" : "rightArm",
|
||||
"pivot": [ -5.0, 21.5, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -7.0, 11.5, -2.0 ],
|
||||
"size": [ 3, 12, 4 ],
|
||||
"uv": [ 40, 32 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "leftLeg",
|
||||
"parent" : "root",
|
||||
"pivot": [ 1.9, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -0.1, 0.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightLeg",
|
||||
"parent" : "root",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -3.9, 0.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 16 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "leftPants",
|
||||
"parent" : "leftLeg",
|
||||
"pivot": [1.9, 12.0, 0.0],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -0.1, 0.0, -2.0 ],
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 48 ],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightPants",
|
||||
"parent" : "rightLeg",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -3.9, 0.0, -2.0] ,
|
||||
"size": [ 4, 12, 4 ],
|
||||
"uv": [ 0, 32],
|
||||
"inflate": 0.25
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name" : "rightItem",
|
||||
"parent" : "rightArm",
|
||||
"pivot" : [ -6.0, 15.0, 1.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes" : []
|
||||
},
|
||||
|
||||
{
|
||||
"name" : "leftItem",
|
||||
"parent" : "leftArm",
|
||||
"pivot" : [ 6.0, 15.0, 1.0 ],
|
||||
"rotation" : [ 0.0, 0.0, 0.0 ],
|
||||
"cubes" : []
|
||||
},
|
||||
|
||||
|
||||
{
|
||||
"name": "leftEar",
|
||||
"parent" : "head",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ 3.0, 31.0, -0.5 ],
|
||||
"size": [ 6, 6, 1 ],
|
||||
"uv": [ 24, 0 ],
|
||||
"inflate": 0.5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
{
|
||||
"name": "rightEar",
|
||||
"parent" : "head",
|
||||
"pivot": [ -1.9, 12.0, 0.0 ],
|
||||
"cubes": [
|
||||
{
|
||||
"origin": [ -9.0, 31.0, -0.5 ],
|
||||
"size": [ 6, 6, 1 ],
|
||||
"uv": [ 24, 0 ],
|
||||
"inflate": 0.5
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"description": {
|
||||
"identifier": "geometry.humanoid.earsSlim",
|
||||
"texture_height": 64,
|
||||
"texture_width": 64
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
BIN
connector/src/main/resources/bedrock/skin/skin_alex.png
Normal file
BIN
connector/src/main/resources/bedrock/skin/skin_alex.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
|
|
@ -61,6 +61,10 @@ general-thread-pool: 32
|
|||
# OptiFine capes, LabyMod capes, 5Zig capes and MinecraftCapes
|
||||
allow-third-party-capes: true
|
||||
|
||||
# Allow third party deadmau5 ears to be visible. Currently allowing:
|
||||
# MinecraftCapes
|
||||
allow-third-party-ears: false
|
||||
|
||||
# The default locale if we dont have the one the client requested
|
||||
default-locale: en_us
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue