Update 1.1.0

Fox2Code · Fox2Code · commit d3287c00ad10 · 2023-05-08T11:30:42.000+02:00
diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/DependencyHelper.java b/common/src/main/java/com/fox2code/foxloader/launcher/DependencyHelper.java
@@ -48,6 +48,16 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
 
     private static File mcLibraries;
 
+    static {
+        if (Platform.getJvmVersion() == 8) {
+            try {
+                LetsEncryptHelper.installCertificates();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     static void loadDependencies(boolean client) {
         if (client) {
             URL url = DependencyHelper.class.getResource("/org/lwjgl/opengl/GLChecks.class");
diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/FoxClassLoader.java b/common/src/main/java/com/fox2code/foxloader/launcher/FoxClassLoader.java
@@ -193,6 +193,9 @@ public URL getResource(String name) {
                 return this.getParent().getResource(name);
             }
         }
+        if (name.startsWith("assets/foxloader/certificates/")) {
+            return this.getParent().getResource(name);
+        }
         URL resource = this.findResource(name);
         if (resource != null) return resource;
         if (minecraftExclusiveSource != null) {
diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/FoxLauncher.java b/common/src/main/java/com/fox2code/foxloader/launcher/FoxLauncher.java
@@ -75,8 +75,8 @@ static void initForClientFromArgs(String[] args) {
         foxClassLoader.addTransformerExclusion("org.spongepowered.tools.");
         foxClassLoader.addTransformerExclusion("com.llamalad7.mixinextras.");
         foxClassLoader.addTransformerExclusion("com.fox2code.foxloader.loader.");
+        installLoggerHelper(); // Install special logger before libraries loading
         DependencyHelper.loadDependencies(true);
-        installLoggerHelper();
     }
 
     static void initForServerFromArgs(String[] args) {
@@ -97,8 +97,8 @@ static void initForServerFromArgs(String[] args) {
         foxClassLoader.addTransformerExclusion("org.spongepowered.tools.");
         foxClassLoader.addTransformerExclusion("com.llamalad7.mixinextras.");
         foxClassLoader.addTransformerExclusion("com.fox2code.foxloader.loader.");
+        installLoggerHelper(); // Install special logger before libraries loading
         DependencyHelper.loadDependencies(false);
-        installLoggerHelper();
     }
 
     private static void installLoggerHelper() {
diff --git a/common/src/main/java/com/fox2code/foxloader/launcher/LetsEncryptHelper.java b/common/src/main/java/com/fox2code/foxloader/launcher/LetsEncryptHelper.java
@@ -0,0 +1,116 @@
+package com.fox2code.foxloader.launcher;
+
+import javax.net.ssl.*;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Objects;
+
+final class LetsEncryptHelper {
+    private static final String prefix = "/assets/foxloader/certificates/";
+    private static final String[] certificates = new String[]{"jitpack-io-chain.pem",
+            "lets_encrypt_x1_cross_signed.pem", "lets_encrypt_x2_cross_signed.pem",
+            "lets_encrypt_x3_cross_signed.pem", "lets_encrypt_x4_cross_signed.pem"};
+
+    public static void installCertificates() throws Exception {
+        System.out.println("Using let's encrypt certificates");
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance(
+                TrustManagerFactory.getDefaultAlgorithm());
+        X509TrustManager letsEncryptTrustManager = makeLetsEncryptTrustManager();
+        tmf.init((KeyStore) null);
+        SSLContext sslContext = SSLContext.getInstance("TLS");
+        TrustManager[] systemTrustManagers = tmf.getTrustManagers();
+        X509TrustManager systemTrustManager;
+        if (systemTrustManagers.length != 1 || !(systemTrustManagers[0] instanceof X509TrustManager)) {
+            throw new IllegalStateException("Unexpected default trust managers:" +
+                    Arrays.toString(systemTrustManagers));
+        }
+        systemTrustManager = (X509TrustManager) systemTrustManagers[0];
+        sslContext.init(null, new TrustManager[]{
+                new X509DualTrustManager(letsEncryptTrustManager, systemTrustManager)
+        }, null);
+        Field field = SSLSocketFactory.class.getDeclaredField("theFactory");
+        field.setAccessible(true);
+        field.set(null, sslContext.getSocketFactory());
+    }
+
+    public static X509TrustManager makeLetsEncryptTrustManager()
+            throws GeneralSecurityException, IOException {
+        LinkedList<Certificate> certificates = new LinkedList<>();
+        CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
+        for (String certificate : LetsEncryptHelper.certificates) {
+            certificates.addAll(certificateFactory.generateCertificates(Objects.requireNonNull(
+                    LetsEncryptHelper.class.getResourceAsStream(prefix + certificate), certificate)));
+        }
+
+        // Put the certificates a key store.
+        char[] password = "password".toCharArray(); // Any password will work.
+        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        keyStore.load(null, password);
+        int index = 0;
+        for (Certificate certificate : certificates) {
+            String certificateAlias = Integer.toString(index++);
+            keyStore.setCertificateEntry(certificateAlias, certificate);
+        }
+
+        // Use it to build an X509 trust manager.
+        KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        keyManagerFactory.init(keyStore, password);
+        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustManagerFactory.init(keyStore);
+        TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+        if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
+            throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
+        }
+
+        return (X509TrustManager) trustManagers[0];
+    }
+
+    public static class X509DualTrustManager implements X509TrustManager {
+        private final X509TrustManager letsEncrypt;
+        private final X509TrustManager system;
+        private final X509Certificate[] certificates;
+
+        public X509DualTrustManager(X509TrustManager letsEncrypt, X509TrustManager system) {
+            this.letsEncrypt = letsEncrypt;
+            this.system = system;
+            HashSet<X509Certificate> certificates = new HashSet<>();
+            certificates.addAll(Arrays.asList(this.letsEncrypt.getAcceptedIssuers()));
+            certificates.addAll(Arrays.asList(this.system.getAcceptedIssuers()));
+            this.certificates = certificates.toArray(new X509Certificate[0]);
+        }
+
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+            try {
+                this.letsEncrypt.checkClientTrusted(chain, authType);
+            } catch (CertificateException | SecurityException e) {
+                this.system.checkClientTrusted(chain, authType);
+            }
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+            try {
+                this.letsEncrypt.checkServerTrusted(chain, authType);
+                System.out.println("checkServerTrusted let's encrypt trust!");
+            } catch (CertificateException | SecurityException e) {
+                this.system.checkServerTrusted(chain, authType);
+                System.out.println("checkServerTrusted system trust!");
+            }
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return this.certificates;
+        }
+    }
+}
diff --git a/common/src/main/java/com/fox2code/foxloader/loader/transformer/MinecraftClientDebugTransformer.java b/common/src/main/java/com/fox2code/foxloader/loader/transformer/MinecraftClientDebugTransformer.java
@@ -5,6 +5,12 @@
 public class MinecraftClientDebugTransformer implements PreClassTransformer {
     @Override
     public void transform(ClassNode classNode, String className) {
+        if ("net.minecraft.src.client.ThreadGetSkin".equals(className)) {
+            MethodNode methodNode = TransformerUtils.getMethod(classNode, "run");
+            if (methodNode.tryCatchBlocks == null) return;
+            hotfixThreadGetSkin(methodNode);
+            return;
+        }
         if (!"net.minecraft.client.Minecraft".equals(className)) return;
         MethodNode methodNode = TransformerUtils.getMethod(classNode, "run");
         if (methodNode.tryCatchBlocks == null) return;
@@ -37,6 +43,23 @@ private void patchExceptionPrint(MethodNode methodNode, String type) {
                 return;
             }
         }
+    }
 
+    private void hotfixThreadGetSkin(MethodNode methodNode) {
+        for (TryCatchBlockNode tryCatchBlockNode : methodNode.tryCatchBlocks) {
+            if ("java/lang/Exception".equals(tryCatchBlockNode.type)) {
+                tryCatchBlockNode.type = "java/lang/Throwable";
+                AbstractInsnNode abstractInsnNode = tryCatchBlockNode.handler.getNext();
+                if (abstractInsnNode instanceof FrameNode) {
+                    FrameNode frameNode = (FrameNode) abstractInsnNode;
+                    if (frameNode.stack.size() == 1 &&
+                            "java/lang/Exception".equals(
+                                    frameNode.stack.get(0))) {
+                        frameNode.stack.set(0, "java/lang/Throwable");
+                    }
+                }
+                return;
+            }
+        }
     }
 }
diff --git a/common/src/main/resources/assets/foxloader/certificates/jitpack-io-chain.pem b/common/src/main/resources/assets/foxloader/certificates/jitpack-io-chain.pem
@@ -0,0 +1,54 @@
+-----BEGIN CERTIFICATE-----
+MIIDvTCCA0OgAwIBAgISBBqIEbKz7bjULLax9b8z7IstMAoGCCqGSM49BAMDMDIx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
+MTAeFw0yMzA0MTgwMDIyMTVaFw0yMzA3MTcwMDIyMTRaMBUxEzARBgNVBAMTCmpp
+dHBhY2suaW8wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASdFNjZ77uKTX8tx26o
+uA70KAIPBOoT0ekyS0JOYtjRAgEyVFua7cCJurroUj9h4lBT8jIbKVkEUFaAcThC
+7LJso4ICVDCCAlAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTeJxT/CIBCHh5yl7Kh
+hYd1/yLTiDAfBgNVHSMEGDAWgBRa8+0r/DbCN3m5UjDqVG/PVcsurDBVBggrBgEF
+BQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lMS5vLmxlbmNyLm9yZzAiBggr
+BgEFBQcwAoYWaHR0cDovL2UxLmkubGVuY3Iub3JnLzAjBgNVHREEHDAaggwqLmpp
+dHBhY2suaW+CCmppdHBhY2suaW8wTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYB
+BAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5v
+cmcwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwB6MoxU2LcttiDqOOBSHumEFnAy
+E4VNO9IrwTpXo1LrUgAAAYeR9IpvAAAEAwBIMEYCIQDr5GzIx23g9xv6keIW/Iy9
+mBPx5M+nscK8NXvF66lgAAIhAP9xFK1sycgyNYOzouq5e6aR5de8Ci7sIHeH9L7D
+woDtAHYArfe++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooAAAGHkfSKjQAA
+BAMARzBFAiBZPsjEUheq8D1oymy1qQz5neMSVnDpU2dwAzMUu8n/PgIhAIfx5Vko
+n3Vf+zR253EFyCIlnpFWgbGnmVFJxQYHX+TdMAoGCCqGSM49BAMDA2gAMGUCMDkT
+ZB1vUkZ75l3QZn4ykvaL7eElmjT2H7EWsfuNuCrnaG6Vqdd7lnIcMiLEW8o2PwIx
+APz5nJEyqCz5a6cODT+rtPQhvlAOq7ihtf6fhB+BEukUaPaiJJA4GaI+MyR8pVGL
+Yg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICxjCCAk2gAwIBAgIRALO93/inhFu86QOgQTWzSkUwCgYIKoZIzj0EAwMwTzEL
+MAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNo
+IEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDIwHhcNMjAwOTA0MDAwMDAwWhcN
+MjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3MgRW5j
+cnlwdDELMAkGA1UEAxMCRTEwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQkXC2iKv0c
+S6Zdl3MnMayyoGli72XoprDwrEuf/xwLcA/TmC9N/A8AmzfwdAVXMpcuBe8qQyWj
++240JxP2T35p0wKZXuskR5LBJJvmsSGPwSSB/GjMH2m6WPUZIvd0xhajggEIMIIB
+BDAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFrz7Sv8NsI3eblSMOpUb89V
+yy6sMB8GA1UdIwQYMBaAFHxClq7eS0g7+pL4nozPbYupcjeVMDIGCCsGAQUFBwEB
+BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gyLmkubGVuY3Iub3JnLzAnBgNVHR8E
+IDAeMBygGqAYhhZodHRwOi8veDIuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYG
+Z4EMAQIBMA0GCysGAQQBgt8TAQEBMAoGCCqGSM49BAMDA2cAMGQCMHt01VITjWH+
+Dbo/AwCd89eYhNlXLr3pD5xcSAQh8suzYHKOl9YST8pE9kLJ03uGqQIwWrGxtO3q
+YJkgsTgDyj2gJrjubi1K9sZmHzOa25JK1fUpE8ZwYii6I4zPPS/Lgul/
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQsw
+CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg
+R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00
+MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBT
+ZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW
++1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9
+ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZI
+zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW
+tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1
+/q4AaOeMSQ+2b1tbFfLn
+-----END CERTIFICATE-----
diff --git a/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x1_cross_signed.pem b/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x1_cross_signed.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEqDCCA5CgAwIBAgIRAJgT9HUT5XULQ+dDHpceRL0wDQYJKoZIhvcNAQELBQAw
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjMzMzZaFw0yMDEwMTkyMjMzMzZa
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAJzTDPBa5S5Ht3JdN4OzaGMw6tc1Jhkl4b2+NfFwki+3uEtB
+BaupnjUIWOyxKsRohwuj43Xk5vOnYnG6eYFgH9eRmp/z0HhncchpDpWRz/7mmelg
+PEjMfspNdxIknUcbWuu57B43ABycrHunBerOSuu9QeU2mLnL/W08lmjfIypCkAyG
+dGfIf6WauFJhFBM/ZemCh8vb+g5W9oaJ84U/l4avsNwa72sNlRZ9xCugZbKZBDZ1
+gGusSvMbkEl4L6KWTyogJSkExnTA0DHNjzE4lRa6qDO4Q/GxH8Mwf6J5MRM9LTb4
+4/zyM2q5OTHFr8SNDR1kFjOq+oQpttQLwNh9w5MCAwEAAaOCAZIwggGOMBIGA1Ud
+EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
+BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
+b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
+ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
+AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
+MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
+LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUqEpqYwR93brm0Tm3
+pkVl7/Oo7KEwDQYJKoZIhvcNAQELBQADggEBANHIIkus7+MJiZZQsY14cCoBG1hd
+v0J20/FyWo5ppnfjL78S2k4s2GLRJ7iD9ZDKErndvbNFGcsW+9kKK/TnY21hp4Dd
+ITv8S9ZYQ7oaoqs7HwhEMY9sibED4aXw09xrJZTC9zK1uIfW6t5dHQjuOWv+HHoW
+ZnupyxpsEUlEaFb+/SCI4KCSBdAsYxAcsHYI5xxEI4LutHp6s3OT2FuO90WfdsIk
+6q78OMSdn875bNjdBYAqxUp2/LEIHfDBkLoQz0hFJmwAbYahqKaLn73PAAm1X2kj
+f1w8DdnkabOLGeOVcj9LQ+s67vBykx4anTjURkbqZslUEUsn2k5xeua2zUk=
+-----END CERTIFICATE-----
diff --git a/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x2_cross_signed.pem b/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x2_cross_signed.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEqDCCA5CgAwIBAgIRAMODTJjAvWslLKN5tm+lKw4wDQYJKoZIhvcNAQELBQAw
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjM1MDFaFw0yMDEwMTkyMjM1MDFa
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOEkdEJ7t5Ex2XP/OKrYzkRctzkK3ESuDb1FuZc3Z6+9UE9f
+0xBUa/dB2o5j5m1bwOhAqYxB/NEDif9iYQlg1gcFeJqQvRpkPk/cz3cviWvLZ69B
+TcWNAMBr/o2E3LXylTGo6PaQoENKk3Rcsz5DaUuJIkd0UT6ZZMPNJAH5hC8odxci
+p93DbAhMZi83dMVvk46wRjcWYdFQmMiwD09YU3ys9totlmFQrUPcCqZPnrVSuZyO
+707fRrMx3CD8acKjIHU+7DgbNk5mZtLf9Wakky97pg6UPmA9Skscb7q0TRw8kVhu
+L03E2nDb7QE5dsBJ5+k1tRQGkMHlkuIQ/Wu5tIUCAwEAAaOCAZIwggGOMBIGA1Ud
+EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
+BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
+b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
+ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
+AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
+MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
+LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUxbGrTkyxzWQwk37B
+hJkFq+YD4iUwDQYJKoZIhvcNAQELBQADggEBAAcSAhaE7rvHxyUnhgkEpMR56o2I
+IH+mlw5kknjhAuvaBIAM59MZkFbFg5CrNWt8K+G3UoxJgFwv7HvJJxqwgPpNgXC/
+uT3prkvwt+2lvzKJKbqdH+lo40P8EuSyyJOz2hjrRzNMHbJHYDS9OhF5WC5LOQQa
+ydgLZ/JHxXgJypEZqcmVgQ+yYBs0XPwXjE7OE8vbx5REwu7gToMIqAoWRoWW2MxS
+g28RGPVnHzHk2XV1nZGy9T+NYQ91vWWJr1pzNEFZ0cnA2xGwTeJ+zZ3URCfw3Z1U
++YAL3YUmrvdoRBlASOTmNJmXSo9qvMYPa3DEomAPoFQFZqsSN6kuqDEIqMA=
+-----END CERTIFICATE-----
diff --git a/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x3_cross_signed.pem b/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x3_cross_signed.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----
diff --git a/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x4_cross_signed.pem b/common/src/main/resources/assets/foxloader/certificates/lets_encrypt_x4_cross_signed.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc6bLEeMfizANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDEwMloXDTIxMDMxNzE2NDEwMlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFg0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4SR0Qnu3kTHZc/84qtjORFy3OQrcRK4NvUW5lzdnr71QT1/T
+EFRr90HajmPmbVvA6ECpjEH80QOJ/2JhCWDWBwV4mpC9GmQ+T9zPdy+Ja8tnr0FN
+xY0AwGv+jYTctfKVMajo9pCgQ0qTdFyzPkNpS4kiR3RRPplkw80kAfmELyh3FyKn
+3cNsCExmLzd0xW+TjrBGNxZh0VCYyLAPT1hTfKz22i2WYVCtQ9wKpk+etVK5nI7v
+Tt9GszHcIPxpwqMgdT7sOBs2TmZm0t/1ZqSTL3umDpQ+YD1KSxxvurRNHDyRWG4v
+TcTacNvtATl2wEnn6TW1FAaQweWS4hD9a7m0hQIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBTFsatOTLHNZDCTfsGEmQWr5gPiJTANBgkqhkiG9w0BAQsF
+AAOCAQEANlaeSdstfAtqFN3jdRZJFjx9X+Ob3PIDlekPYQ1OQ1Uw43rE1FUj7hUw
+g2MJKfs9b7M0WoQg7C20nJY/ajsg7pWhUG3J6rlkDTfVY9faeWi0qsPYXE6BpBDr
+5BrW/Xv8yT8U2BiEAmNggWq8dmFl82fghmLzHBM8X8NZ3ZwA1fGePA53AP5IoD+0
+ArpW8Ik1sSuQBjZ8oQLfN+G8OoY7MNRopyLyQQCNy4aWfE+xYnoVoa5+yr+aPiX0
+7YQrY/cKawAn7QB4PyF5//IKSAVs7mAuB68wbMdE3FKfOHfJ24W4z/bIJTrTY8Y5
+Sr4AUhtzf8oVDrHZYWRrP4joIcOu/Q==
+-----END CERTIFICATE-----
diff --git a/final/src/main/java/com/fox2code/foxloader/installer/Main.java b/final/src/main/java/com/fox2code/foxloader/installer/Main.java
@@ -78,7 +78,8 @@ public static void main(String[] args) throws ReflectiveOperationException, Malf
         }
         if (update || installerPlatform.doSilentInstall) {
             System.setErr(System.out); // Redirect errors to stdout
-            LauncherType launcherType = LauncherType.valueOf(args[1].toUpperCase(Locale.ROOT));
+            LauncherType launcherType = !update ? LauncherType.VANILLA_LIKE :
+                    LauncherType.valueOf(args[1].toUpperCase(Locale.ROOT));
             try {
                 System.out.println("Updating...");
                 new InstallerGUI(installerPlatform, launcherType).doSilentInstall();

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,9 @@ public URL getResource(String name) {`
`193`	`193`	`return this.getParent().getResource(name);`
`194`	`194`	`}`
`195`	`195`	`}`
	`196`	`+ if (name.startsWith("assets/foxloader/certificates/")) {`
	`197`	`+ return this.getParent().getResource(name);`
	`198`	`+ }`
`196`	`199`	`URL resource = this.findResource(name);`
`197`	`200`	`if (resource != null) return resource;`
`198`	`201`	`if (minecraftExclusiveSource != null) {`