Support 1.21. (#297)

This commit is contained in:
ZekerZhayard authored and GitHub committed 2024-07-02 22:43:35 +08:00
1 parent cd1922844c
commit 64490f1d18
90 files changed
+733 -375

No files matched your search

@@ -1,8 +0,0 @@
package customskinloader;
/**
* @deprecated From 14.16, use <code>customskinloader.log.Logger</code> instead.
*/
@Deprecated
public class Logger extends customskinloader.log.Logger {
}
@@ -2,7 +2,11 @@ package customskinloader.config;
import java.io.File;
import java.lang.reflect.Field;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import customskinloader.CustomSkinLoader;
import customskinloader.loader.ProfileLoader;
@@ -10,7 +14,6 @@ import customskinloader.plugin.ICustomSkinLoaderPlugin;
import customskinloader.plugin.PluginLoader;
import customskinloader.utils.HttpRequestUtil;
import customskinloader.utils.HttpTextureUtil;
import customskinloader.utils.HttpUtil0;
import customskinloader.utils.Version;
import org.apache.commons.io.FileUtils;
@@ -12,7 +12,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
public class FakeCapeBuffer extends FakeSkinBuffer {
private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("textures/entity/elytra.png");
private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("minecraft", "textures/entity/elytra.png");
private static int loadedGlobal = 0;
private static FakeImage elytraImage;
@@ -1,6 +1,5 @@
package customskinloader.fake.itf;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
@@ -7,7 +7,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.function.Function;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import customskinloader.CustomSkinLoader;
import customskinloader.utils.TimeUtil;
import org.apache.commons.io.FileUtils;
@@ -4,14 +4,7 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.security.cert.X509Certificate;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.commons.lang3.StringUtils;
@@ -40,7 +40,7 @@ public class MinecraftUtil {
}
//version.json can be found in 1.14+
URL versionFile = MinecraftUtil.class.getResource("/version.json");
URL versionFile = ClassLoader.getSystemClassLoader().getResource("version.json");
if (versionFile != null) {
try (
InputStream is = versionFile.openStream();