Experimental skin fix, inspired by craftycodie's
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
48
libraries/launcher/org/prismlauncher/fix/Fix.java
Normal file
48
libraries/launcher/org/prismlauncher/fix/Fix.java
Normal file
@ -0,0 +1,48 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* Linking this library statically or dynamically with other modules is
|
||||
* making a combined work based on this library. Thus, the terms and
|
||||
* conditions of the GNU General Public License cover the whole
|
||||
* combination.
|
||||
*
|
||||
* As a special exception, the copyright holders of this library give
|
||||
* you permission to link this library with independent modules to
|
||||
* produce an executable, regardless of the license terms of these
|
||||
* independent modules, and to copy and distribute the resulting
|
||||
* executable under terms of your choice, provided that you also meet,
|
||||
* for each linked independent module, the terms and conditions of the
|
||||
* license of that module. An independent module is a module which is
|
||||
* not derived from or based on this library. If you modify this
|
||||
* library, you may extend this exception to your version of the
|
||||
* library, but you are not obliged to do so. If you do not wish to do
|
||||
* so, delete this exception statement from your version.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.prismlauncher.fix;
|
||||
|
||||
import org.prismlauncher.utils.Parameters;
|
||||
|
||||
public interface Fix {
|
||||
|
||||
String getName();
|
||||
|
||||
boolean isApplicable(Parameters parameters);
|
||||
|
||||
void apply();
|
||||
|
||||
}
|
56
libraries/launcher/org/prismlauncher/fix/Fixes.java
Normal file
56
libraries/launcher/org/prismlauncher/fix/Fixes.java
Normal file
@ -0,0 +1,56 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* Linking this library statically or dynamically with other modules is
|
||||
* making a combined work based on this library. Thus, the terms and
|
||||
* conditions of the GNU General Public License cover the whole
|
||||
* combination.
|
||||
*
|
||||
* As a special exception, the copyright holders of this library give
|
||||
* you permission to link this library with independent modules to
|
||||
* produce an executable, regardless of the license terms of these
|
||||
* independent modules, and to copy and distribute the resulting
|
||||
* executable under terms of your choice, provided that you also meet,
|
||||
* for each linked independent module, the terms and conditions of the
|
||||
* license of that module. An independent module is a module which is
|
||||
* not derived from or based on this library. If you modify this
|
||||
* library, you may extend this exception to your version of the
|
||||
* library, but you are not obliged to do so. If you do not wish to do
|
||||
* so, delete this exception statement from your version.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.prismlauncher.fix;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.prismlauncher.fix.skins.SkinFix;
|
||||
import org.prismlauncher.utils.Parameters;
|
||||
|
||||
public final class Fixes {
|
||||
|
||||
private static final Fix[] FIXES = { new SkinFix() };
|
||||
|
||||
public static void apply(Parameters parameters) {
|
||||
List<String> fixes = parameters.getList("fixes", Collections.<String>emptyList());
|
||||
|
||||
for (Fix fix : FIXES)
|
||||
if (fixes.contains(fix.getName()) && fix.isApplicable(parameters))
|
||||
fix.apply();
|
||||
}
|
||||
|
||||
}
|
107
libraries/launcher/org/prismlauncher/fix/skins/SkinFix.java
Normal file
107
libraries/launcher/org/prismlauncher/fix/skins/SkinFix.java
Normal file
@ -0,0 +1,107 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* Linking this library statically or dynamically with other modules is
|
||||
* making a combined work based on this library. Thus, the terms and
|
||||
* conditions of the GNU General Public License cover the whole
|
||||
* combination.
|
||||
*
|
||||
* As a special exception, the copyright holders of this library give
|
||||
* you permission to link this library with independent modules to
|
||||
* produce an executable, regardless of the license terms of these
|
||||
* independent modules, and to copy and distribute the resulting
|
||||
* executable under terms of your choice, provided that you also meet,
|
||||
* for each linked independent module, the terms and conditions of the
|
||||
* license of that module. An independent module is a module which is
|
||||
* not derived from or based on this library. If you modify this
|
||||
* library, you may extend this exception to your version of the
|
||||
* library, but you are not obliged to do so. If you do not wish to do
|
||||
* so, delete this exception statement from your version.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.prismlauncher.fix.skins;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.Proxy;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLStreamHandler;
|
||||
import java.net.URLStreamHandlerFactory;
|
||||
|
||||
import org.prismlauncher.fix.Fix;
|
||||
import org.prismlauncher.utils.Parameters;
|
||||
import org.prismlauncher.utils.logging.Log;
|
||||
|
||||
public final class SkinFix implements Fix, URLStreamHandlerFactory {
|
||||
|
||||
private static URLStreamHandler http;
|
||||
private static MethodHandle openConnection;
|
||||
private static MethodHandle openConnection2;
|
||||
|
||||
static {
|
||||
try {
|
||||
Method getURLStreamHandler = URL.class.getDeclaredMethod("getURLStreamHandler", String.class);
|
||||
getURLStreamHandler.setAccessible(true);
|
||||
http = (URLStreamHandler) getURLStreamHandler.invoke(null, "http");
|
||||
|
||||
Method openConnectionReflect = URLStreamHandler.class.getDeclaredMethod("openConnection", URL.class);
|
||||
openConnectionReflect.setAccessible(true);
|
||||
openConnection = MethodHandles.lookup().unreflect(openConnectionReflect);
|
||||
|
||||
Method openConnectionReflect2 = URLStreamHandler.class.getDeclaredMethod("openConnection", URL.class,
|
||||
Proxy.class);
|
||||
openConnectionReflect2.setAccessible(true);
|
||||
openConnection2 = MethodHandles.lookup().unreflect(openConnectionReflect2);
|
||||
} catch (Throwable e) {
|
||||
Log.error("Could not perform URL reflection; skin fix will not be availble", e);
|
||||
}
|
||||
}
|
||||
|
||||
static URLConnection openConnection(URL url) throws Throwable {
|
||||
return (URLConnection) openConnection.invokeExact(http, url);
|
||||
}
|
||||
|
||||
static URLConnection openConnection(URL url, Proxy proxy) throws Throwable {
|
||||
return (URLConnection) openConnection2.invokeExact(http, url, proxy);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "legacySkinFix";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isApplicable(Parameters parameters) {
|
||||
return http != null && openConnection != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply() {
|
||||
URL.setURLStreamHandlerFactory(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public URLStreamHandler createURLStreamHandler(String protocol) {
|
||||
if ("http".equals(protocol))
|
||||
return new SkinFixUrlStreamHandler();
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,182 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* Linking this library statically or dynamically with other modules is
|
||||
* making a combined work based on this library. Thus, the terms and
|
||||
* conditions of the GNU General Public License cover the whole
|
||||
* combination.
|
||||
*
|
||||
* As a special exception, the copyright holders of this library give
|
||||
* you permission to link this library with independent modules to
|
||||
* produce an executable, regardless of the license terms of these
|
||||
* independent modules, and to copy and distribute the resulting
|
||||
* executable under terms of your choice, provided that you also meet,
|
||||
* for each linked independent module, the terms and conditions of the
|
||||
* license of that module. An independent module is a module which is
|
||||
* not derived from or based on this library. If you modify this
|
||||
* library, you may extend this exception to your version of the
|
||||
* library, but you are not obliged to do so. If you do not wish to do
|
||||
* so, delete this exception statement from your version.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.prismlauncher.fix.skins;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.Proxy;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLStreamHandler;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.xml.bind.DatatypeConverter;
|
||||
|
||||
import org.prismlauncher.utils.JsonParser;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
final class SkinFixUrlStreamHandler extends URLStreamHandler {
|
||||
|
||||
private URL redirect(URL address) throws IOException {
|
||||
String skinOwner = findSkinOwner(address);
|
||||
|
||||
if (skinOwner != null)
|
||||
return convertSkin(address, skinOwner);
|
||||
|
||||
String capeOwner = findCapeOwner(address);
|
||||
|
||||
if (capeOwner != null)
|
||||
return convertCape(address, capeOwner);
|
||||
|
||||
return address;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected URLConnection openConnection(URL address) throws IOException {
|
||||
address = redirect(address);
|
||||
|
||||
try {
|
||||
return SkinFix.openConnection(address);
|
||||
} catch (RuntimeException | Error e) {
|
||||
throw e;
|
||||
} catch (Throwable e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected URLConnection openConnection(URL address, Proxy proxy) throws IOException {
|
||||
address = redirect(address);
|
||||
|
||||
try {
|
||||
return SkinFix.openConnection(address, proxy);
|
||||
} catch (RuntimeException | Error e) {
|
||||
throw e;
|
||||
} catch (Throwable e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private URL convertSkin(URL defaultUrl, String owner) throws IOException {
|
||||
Map<String, Object> textures = getTextures(owner);
|
||||
|
||||
if (textures != null) {
|
||||
textures = (Map<String, Object>) textures.get("SKIN");
|
||||
return new URL((String) textures.get("url"));
|
||||
}
|
||||
|
||||
return defaultUrl;
|
||||
}
|
||||
|
||||
private URL convertCape(URL defaultUrl, String owner) throws IOException {
|
||||
Map<String, Object> textures = getTextures(owner);
|
||||
|
||||
if (textures != null) {
|
||||
textures = (Map<String, Object>) textures.get("CAPE");
|
||||
|
||||
if (textures == null)
|
||||
return defaultUrl;
|
||||
|
||||
return new URL((String) textures.get("url"));
|
||||
}
|
||||
|
||||
return defaultUrl;
|
||||
}
|
||||
|
||||
private static Map<String, Object> getTextures(String owner) throws IOException {
|
||||
try (InputStream in = new URL("https://api.mojang.com/users/profiles/minecraft/" + owner).openStream()) {
|
||||
Map<String, Object> map = (Map<String, Object>) JsonParser.parse(in);
|
||||
String id = (String) map.get("id");
|
||||
|
||||
try (InputStream profileIn = new URL("https://sessionserver.mojang.com/session/minecraft/profile/" + id)
|
||||
.openStream()) {
|
||||
Map<String, Object> profile = (Map<String, Object>) JsonParser.parse(profileIn);
|
||||
|
||||
for (Map<String, Object> property : (Iterable<Map<String, Object>>) profile.get("properties")) {
|
||||
if (property.get("name").equals("textures")) {
|
||||
Map<String, Object> result = (Map<String, Object>) JsonParser
|
||||
.parse(new String(DatatypeConverter.parseBase64Binary((String) property.get("value"))));
|
||||
result = (Map<String, Object>) result.get("textures");
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String findSkinOwner(URL address) {
|
||||
switch (address.getHost()) {
|
||||
case "www.minecraft.net":
|
||||
return stripPng(strip(address.getPath(), "/skin/"));
|
||||
|
||||
case "s3.amazonaws.com":
|
||||
case "skins.minecraft.net":
|
||||
return stripPng(strip(address.getPath(), "/MinecraftSkins/"));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static String findCapeOwner(URL address) {
|
||||
switch (address.getHost()) {
|
||||
case "www.minecraft.net":
|
||||
return stripPng(strip(address.getQuery(), "user="));
|
||||
|
||||
case "s3.amazonaws.com":
|
||||
case "skins.minecraft.net":
|
||||
return stripPng(strip(address.getPath(), "/MinecraftCloaks/"));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static String stripPng(String string) {
|
||||
if (string != null && string.endsWith(".png"))
|
||||
return string.substring(0, string.lastIndexOf('.'));
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
private static String strip(String string, String prefix) {
|
||||
if (string != null && string.startsWith(prefix))
|
||||
return string.substring(prefix.length());
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user