Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-11-19 22:40:18 +01:00
Code Issues Projekte Releases Wiki Aktivität

Un-revert Crop and reorder skull textures to eliminate unused space

Quellcode durchsuchen 
Should reduce memory & storage usage for Bedrock clients

Bug with top face flipping + per-face uv's was fixed in 1.19.40+
https://bugs.mojang.com/browse/MCPE-160073
Geometry is still offset by 0.5 to prevent lighting bugs
Dieser Commit ist enthalten in:
davchoo 2022-12-22 21:11:22 -05:00
Ursprung 88ad6cee00
Commit bc7564f82a
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 501B6F4FD961CF9A
5 geänderte Dateien mit 127 neuen und 32 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

33
core/src/main/java/org/geysermc/geyser/pack/SkullResourcePackManager.java
Datei anzeigen

@ -54,7 +54,7 @@ import java.util.zip.ZipOutputStream;
public class SkullResourcePackManager { public class SkullResourcePackManager {
private static final long RESOURCE_PACK_VERSION = 6; private static final long RESOURCE_PACK_VERSION = 8;
private static final Path SKULL_SKIN_CACHE_PATH = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("player_skulls"); private static final Path SKULL_SKIN_CACHE_PATH = GeyserImpl.getInstance().getBootstrap().getConfigFolder().resolve("cache").resolve("player_skulls");
@ -113,21 +113,24 @@ public class SkullResourcePackManager {
} }
BufferedImage image = SkinProvider.requestImage(skinUrl, null); BufferedImage image = SkinProvider.requestImage(skinUrl, null);
if (image.getHeight() != 64) { // Resize skins to 48x16 to save on space and memory
// We have to resize legacy skins to 64x64 for them to be displayed properly BufferedImage skullTexture = new BufferedImage(48, 16, image.getType());
BufferedImage modernSkin = new BufferedImage(64, 64, image.getType()); // Reorder skin parts to fit into the space
// Right, Front, Left, Back, Top, Bottom - head
// Right, Front, Left, Back, Top, Bottom - hat
Graphics g = skullTexture.createGraphics();
// Right, Front, Left, Back of the head
g.drawImage(image, 0, 0, 32, 8, 0, 8, 32, 16, null);
// Right, Front, Left, Back of the hat
g.drawImage(image, 0, 8, 32, 16, 32, 8, 64, 16, null);
// Top and bottom of the head
g.drawImage(image, 32, 0, 48, 8, 8, 0, 24, 8, null);
// Top and bottom of the hat
g.drawImage(image, 32, 8, 48, 16, 40, 0, 56, 8, null);
g.dispose();
image.flush();
Graphics g = modernSkin.createGraphics(); ImageIO.write(skullTexture, "png", skinPath.toFile());
g.drawImage(image, 0, 0, null);
g.setColor(new Color(0, 0, 0, 0));
g.fillRect(0, 32, 64, 32);
g.dispose();
image.flush();
image = modernSkin;
}
ImageIO.write(image, "png", skinPath.toFile());
SKULL_SKINS.put(skinHash, skinPath); SKULL_SKINS.put(skinHash, skinPath);
GeyserImpl.getInstance().getLogger().debug("Cached player skull to " + skinPath + " for " + skinHash); GeyserImpl.getInstance().getLogger().debug("Cached player skull to " + skinPath + " for " + skinHash);
} }

33
core/src/main/resources/bedrock/skull_resource_pack/models/blocks/player_skull.geo.json
Datei anzeigen

@ -4,8 +4,8 @@
{ {
"description": { "description": {
"identifier": "geometry.geyser.player_skull", "identifier": "geometry.geyser.player_skull",
"texture_width": 64, "texture_width": 48,
"texture_height": 64 "texture_height": 16
}, },
"bones": [ "bones": [
{ {
@ -33,7 +33,18 @@
"parent": "root_z", "parent": "root_z",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 8, -4], "size": [8, 8, 8], "uv": [0, 0]} {
"origin": [-4, 8, -4],
"size": [8, 8, 8],
"uv": {
"north": {"uv": [8, 0], "uv_size": [8, 8]},
"east": {"uv": [0, 0], "uv_size": [8, 8]},
"south": {"uv": [24, 0], "uv_size": [8, 8]},
"west": {"uv": [16, 0], "uv_size": [8, 8]},
"up": {"uv": [32, 0], "uv_size": [8, 8]},
"down": {"uv": [40, 8], "uv_size": [8, -8]}
}
}
] ]
}, },
{ {
@ -41,10 +52,22 @@
"parent": "player_skull", "parent": "player_skull",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 8, -4], "size": [8, 8, 8], "uv": [32, 0], "inflate": 0.25} {
"origin": [-4, 8, -4],
"size": [8, 8, 8],
"inflate": 0.25,
"uv": {
"north": {"uv": [8, 8], "uv_size": [8, 8]},
"east": {"uv": [0, 8], "uv_size": [8, 8]},
"south": {"uv": [24, 8], "uv_size": [8, 8]},
"west": {"uv": [16, 8], "uv_size": [8, 8]},
"up": {"uv": [32, 8], "uv_size": [8, 8]},
"down": {"uv": [40, 16], "uv_size": [8, -8]}
}
}
] ]
} }
] ]
} }
] ]
} }

31
core/src/main/resources/bedrock/skull_resource_pack/models/blocks/player_skull_floor.geo.json
Datei anzeigen

@ -4,8 +4,8 @@
{ {
"description": { "description": {
"identifier": "geometry.geyser.player_skull_floor_${quadrant}", "identifier": "geometry.geyser.player_skull_floor_${quadrant}",
"texture_width": 64, "texture_width": 48,
"texture_height": 64 "texture_height": 16
}, },
"bones": [ "bones": [
{ {
@ -13,7 +13,18 @@
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"rotation": [0, ${y_rotation}, 0], "rotation": [0, ${y_rotation}, 0],
"cubes": [ "cubes": [
{"origin": [-4, 0.5, -4], "size": [8, 8, 8], "uv": [0, 0]} {
"origin": [-4, 0.5, -4],
"size": [8, 8, 8],
"uv": {
"north": {"uv": [8, 0], "uv_size": [8, 8]},
"east": {"uv": [0, 0], "uv_size": [8, 8]},
"south": {"uv": [24, 0], "uv_size": [8, 8]},
"west": {"uv": [16, 0], "uv_size": [8, 8]},
"up": {"uv": [32, 0], "uv_size": [8, 8]},
"down": {"uv": [40, 8], "uv_size": [8, -8]}
}
}
] ]
}, },
{ {
@ -21,7 +32,19 @@
"parent": "head", "parent": "head",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 0.5, -4], "size": [8, 8, 8], "uv": [32, 0], "inflate": 0.5} {
"origin": [-4, 0.5, -4],
"size": [8, 8, 8],
"inflate": 0.5,
"uv": {
"north": {"uv": [8, 8], "uv_size": [8, 8]},
"east": {"uv": [0, 8], "uv_size": [8, 8]},
"south": {"uv": [24, 8], "uv_size": [8, 8]},
"west": {"uv": [16, 8], "uv_size": [8, 8]},
"up": {"uv": [32, 8], "uv_size": [8, 8]},
"down": {"uv": [40, 16], "uv_size": [8, -8]}
}
}
] ]
} }
] ]

31
core/src/main/resources/bedrock/skull_resource_pack/models/blocks/player_skull_hand.geo.json
Datei anzeigen

@ -4,15 +4,26 @@
{ {
"description": { "description": {
"identifier": "geometry.geyser.player_skull_hand", "identifier": "geometry.geyser.player_skull_hand",
"texture_width": 64, "texture_width": 48,
"texture_height": 64 "texture_height": 16
}, },
"bones": [ "bones": [
{ {
"name": "head", "name": "head",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 4, -4], "size": [8, 8, 8], "uv": [0, 0]} {
"origin": [-4, 4, -4],
"size": [8, 8, 8],
"uv": {
"north": {"uv": [8, 0], "uv_size": [8, 8]},
"east": {"uv": [0, 0], "uv_size": [8, 8]},
"south": {"uv": [24, 0], "uv_size": [8, 8]},
"west": {"uv": [16, 0], "uv_size": [8, 8]},
"up": {"uv": [32, 0], "uv_size": [8, 8]},
"down": {"uv": [40, 8], "uv_size": [8, -8]}
}
}
] ]
}, },
{ {
@ -20,7 +31,19 @@
"parent": "head", "parent": "head",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 4, -4], "size": [8, 8, 8], "uv": [32, 0], "inflate": 0.5} {
"origin": [-4, 4, -4],
"size": [8, 8, 8],
"inflate": 0.5,
"uv": {
"north": {"uv": [8, 8], "uv_size": [8, 8]},
"east": {"uv": [0, 8], "uv_size": [8, 8]},
"south": {"uv": [24, 8], "uv_size": [8, 8]},
"west": {"uv": [16, 8], "uv_size": [8, 8]},
"up": {"uv": [32, 8], "uv_size": [8, 8]},
"down": {"uv": [40, 16], "uv_size": [8, -8]}
}
}
] ]
} }
] ]

31
core/src/main/resources/bedrock/skull_resource_pack/models/blocks/player_skull_wall.geo.json
Datei anzeigen

@ -4,15 +4,26 @@
{ {
"description": { "description": {
"identifier": "geometry.geyser.player_skull_wall", "identifier": "geometry.geyser.player_skull_wall",
"texture_width": 64, "texture_width": 48,
"texture_height": 64 "texture_height": 16
}, },
"bones": [ "bones": [
{ {
"name": "head", "name": "head",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 4, -0.5], "size": [8, 8, 8], "uv": [0, 0]} {
"origin": [-4, 4, -0.5],
"size": [8, 8, 8],
"uv": {
"north": {"uv": [8, 0], "uv_size": [8, 8]},
"east": {"uv": [0, 0], "uv_size": [8, 8]},
"south": {"uv": [24, 0], "uv_size": [8, 8]},
"west": {"uv": [16, 0], "uv_size": [8, 8]},
"up": {"uv": [32, 0], "uv_size": [8, 8]},
"down": {"uv": [40, 8], "uv_size": [8, -8]}
}
}
] ]
}, },
{ {
@ -20,7 +31,19 @@
"parent": "head", "parent": "head",
"pivot": [0, 24, 0], "pivot": [0, 24, 0],
"cubes": [ "cubes": [
{"origin": [-4, 4, -0.5], "size": [8, 8, 8], "uv": [32, 0], "inflate": 0.5} {
"origin": [-4, 4, -0.5],
"size": [8, 8, 8],
"inflate": 0.5,
"uv": {
"north": {"uv": [8, 8], "uv_size": [8, 8]},
"east": {"uv": [0, 8], "uv_size": [8, 8]},
"south": {"uv": [24, 8], "uv_size": [8, 8]},
"west": {"uv": [16, 8], "uv_size": [8, 8]},
"up": {"uv": [32, 8], "uv_size": [8, 8]},
"down": {"uv": [40, 16], "uv_size": [8, -8]}
}
}
] ]
} }
] ]