Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix capes being scaled wrong and invisible skins #1940

Merged
merged 5 commits into from
Mar 3, 2021
Merged

Fix capes being scaled wrong and invisible skins #1940

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dc1ea5
Fix capes being scaled wrong and invisible skins
rtm516 Feb 17, 2021
c9fa951
Flush old image objects
rtm516 Feb 17, 2021
ff4d2c7
Remove alpha workaround and fix more scaling issues
Camotoy Mar 3, 2021
c787f1a
Remove unnecessary scale
Camotoy Mar 3, 2021
b5847bd
Reduce diff
Camotoy Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions connector/src/main/java/org/geysermc/connector/skin/SkinProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,14 +413,23 @@ private static byte[] requestImage(String imageUrl, CapeProvider provider) throw
// if the requested image is a cape
if (provider != null) {
if (image.getWidth() > 64) {
image = scale(image, 64, 32);
// Prevent weirdly-scaled capes from being cut off
BufferedImage newImage = new BufferedImage(128, 64, BufferedImage.TYPE_INT_ARGB);
Graphics g = newImage.createGraphics();
g.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null);
g.dispose();
image.flush();
image = scale(newImage, 64, 32);
}
} else {
// Very rarely, skins can be larger than Minecraft's default.
// Bedrock will not render anything above a width of 128.
if (image.getWidth() > 128) {
image = scale(image, 128, image.getHeight() / (image.getWidth() / 128));
// On Height: Scale by the amount we divided width by, or simply cut down to 128
image = scale(image, 128, image.getHeight() >= 256 ? (image.getHeight() / (image.getWidth() / 128)) : 128);
}

// TODO remove alpha channel
}

byte[] data = bufferedImageToImageData(image);
Expand Down