improve the robustness of the update checker, plus RFB compat

Author: FalsePattern

dependencies.gradle

@@ -7,6 +7,8 @@ dependencies {
 
     compileOnly("org.jetbrains:annotations:24.0.1")
 
+    compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.2")
+
     //Mod deps
     def unimixinsVersion = "0.1.17"
     compileOnly("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")

repositories.gradle

@@ -15,4 +15,11 @@ repositories {
         name = "repsy_ventooth"
         url = "https://repo.repsy.io/mvn/ventooth/public/"
     }
+    maven {
+        name = "horizon"
+        url = "https://mvn.falsepattern.com/horizon/"
+        content {
+            includeGroup("com.gtnewhorizons.retrofuturabootstrap")
+        }
+    }
 }

src/main/java/com/falsepattern/lib/config/event/ConfigValidationFailureEvent.java

@@ -23,6 +23,7 @@
 import com.falsepattern.lib.StableAPI;
 import com.falsepattern.lib.config.Config;
 import com.falsepattern.lib.internal.EventUtil;
+import com.falsepattern.lib.internal.FPLog;
 import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.text.FormattedText;
 import com.falsepattern.lib.toasts.GuiToast;
@@ -131,7 +132,7 @@ public void logWarn() {
         }
         customText(errorString);
         for (val line : errorString.toString().split("\n")) {
-            Share.LOG.error(line);
+            FPLog.LOG.error(line);
         }
     }
 

src/main/java/com/falsepattern/lib/internal/FPLog.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022-2023 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice and this permission notice
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.lib.internal;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class FPLog {
+    public static final Logger LOG = LogManager.getLogger(Tags.MODNAME);
+
+    public static void deprecatedWarning(Throwable stacktrace) {
+        LOG.warn("DEPRECATED API CALLED!", stacktrace);
+    }
+}

src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java

@@ -52,7 +52,7 @@ public class FalsePatternLib {
     private static CommonProxy proxy;
 
     public FalsePatternLib() {
-        Share.LOG.info("Version " + Tags.VERSION + " initialized!");
+        FPLog.LOG.info("Version " + Tags.VERSION + " initialized!");
     }
 
     @Mod.EventHandler

src/main/java/com/falsepattern/lib/internal/Internet.java

@@ -45,22 +45,11 @@
 public class Internet {
     private static final Map<String, String> NO_HEADERS = Collections.emptyMap();
 
-    public static void connect(URL URL, Consumer<Exception> onError, Consumer<InputStream> onSuccess) {
-        connect(URL, NO_HEADERS, onError, onSuccess);
+    public static void connect(URL URL, Consumer<Exception> onError, Consumer<InputStream> onSuccess, Consumer<Long> contentLengthCallback) {
+        connect(URL, NO_HEADERS, onError, onSuccess, contentLengthCallback);
     }
 
-    public static Map<String, String> constructHeaders(String... entries) {
-        if (entries.length % 2 != 0) {
-            throw new IllegalArgumentException("Entries must be in pairs");
-        }
-        val map = new java.util.HashMap<String, String>();
-        for (int i = 0; i < entries.length; i += 2) {
-            map.put(entries[i], entries[i + 1]);
-        }
-        return map;
-    }
-
-    public static void connect(URL URL, Map<String, String> headers, Consumer<Exception> onError, Consumer<InputStream> onSuccess) {
+    public static void connect(URL URL, Map<String, String> headers, Consumer<Exception> onError, Consumer<InputStream> onSuccess, Consumer<Long> contentLengthCallback) {
         try {
             val connection = (HttpURLConnection) URL.openConnection();
             connection.setConnectTimeout(3500);
@@ -85,6 +74,7 @@ public static void connect(URL URL, Map<String, String> headers, Consumer<Except
             if (connection.getResponseCode() != 200) {
                 onError.accept(new Exception("HTTP response code " + connection.getResponseCode()));
             } else {
+                contentLengthCallback.accept(connection.getContentLengthLong());
                 onSuccess.accept(connection.getInputStream());
             }
             connection.disconnect();
@@ -103,57 +93,14 @@ public static void connect(URL URL, Map<String, String> headers, Consumer<Except
         }
     }
 
-    public static CompletableFuture<byte[]> download(URL... urls) {
-        return CompletableFuture.supplyAsync(() -> {
-            val result = new ByteArrayOutputStream();
-            val caught = new AtomicReference<Exception>();
-            val success = new AtomicBoolean(false);
-            for (val url : urls) {
-                connect(url, caught::set, (input) -> {
-                    try {
-                        transferAndClose(input, result);
-                        success.set(true);
-                    } catch (IOException e) {
-                        throw new CompletionException(e);
-                    }
-                });
-                if (success.get()) {
-                    return result.toByteArray();
-                }
-            }
-            throw new CompletionException(caught.get());
-        });
-    }
-
-    public static CompletableFuture<Void> downloadFile(File file, URL... urls) {
-        return CompletableFuture.runAsync(() -> {
-            val caught = new AtomicReference<Exception>();
-            val success = new AtomicBoolean(false);
-            for (val url : urls) {
-                connect(url, caught::set, (input) -> {
-                    try {
-                        @Cleanup val outputStream = Files.newOutputStream(file.toPath());
-                        transferAndClose(input, outputStream);
-                        success.set(true);
-                    } catch (IOException e) {
-                        throw new CompletionException(e);
-                    }
-                });
-                if (success.get()) {
-                    return;
-                }
-            }
-            throw new CompletionException(caught.get());
-        });
-    }
-
-
-    public static void transferAndClose(InputStream is, OutputStream target) throws IOException {
+    public static void transferAndClose(InputStream is, OutputStream target, Consumer<Integer> downloadSizeCallback)
+            throws IOException {
         var bytesRead = 0;
 
-        byte[] smallBuffer = new byte[4096];
+        byte[] smallBuffer = new byte[256 * 1024];
         while ((bytesRead = is.read(smallBuffer)) >= 0) {
             target.write(smallBuffer, 0, bytesRead);
+            downloadSizeCallback.accept(bytesRead);
         }
         target.close();
         is.close();

src/main/java/com/falsepattern/lib/internal/asm/CoreLoadingPlugin.java

@@ -20,6 +20,7 @@
  */
 package com.falsepattern.lib.internal.asm;
 
+import com.falsepattern.lib.internal.FPLog;
 import com.falsepattern.lib.internal.Share;
 import com.falsepattern.lib.internal.Tags;
 import com.falsepattern.lib.internal.impl.dependencies.DependencyLoaderImpl;
@@ -48,19 +49,19 @@ public class CoreLoadingPlugin implements IFMLLoadingPlugin {
     private static boolean obfuscated;
 
     static {
-        Share.LOG.info("Removing skill issues...");
+        FPLog.LOG.info("Removing skill issues...");
         try {
             Class.forName("thermos.Thermos");
-            Share.LOG.fatal("Sorry, i prefer iced coffee.");
+            FPLog.LOG.fatal("Sorry, i prefer iced coffee.");
             throw skillIssue("Thermos is not supported by FalsePatternLib, please use a normal forge server.");
         } catch (ClassNotFoundException ignored) {
         }
         //Scan for dependencies now
-        Share.LOG.info("Scanning for deps...");
+        FPLog.LOG.info("Scanning for deps...");
         long start = System.nanoTime();
-        DependencyLoaderImpl.scanDeps();
+        DependencyLoaderImpl.executeDependencyLoading(true);
         long end = System.nanoTime();
-        Share.LOG.info("Scanned in " + (end - start) / 1000000 + "ms");
+        FPLog.LOG.info("Scanned in " + (end - start) / 1000000 + "ms");
         //Initializing the rest
         MappingManager.initialize();
     }
@@ -116,7 +117,7 @@ private static Error skillIssue(String message) {
     }
 
     public static void validateGasStation() {
-        Share.LOG.info("Got any gas?");
+        FPLog.LOG.info("Got any gas?");
         //Make sure everything is loaded correctly, crash if gasstation is bugged
         // @formatter:off
         if (!isClassPresentSafe("com.falsepattern.gasstation.core.GasStationCore") //Validate core class
@@ -126,7 +127,7 @@ public static void validateGasStation() {
             || !isClassPresentSafe("org.spongepowered.asm.lib.Opcodes") //Validate correct mixins class
             || isClassPresentSafe("org.spongepowered.libraries.org.objectweb.asm.Opcodes")
         ) {
-            Share.LOG.fatal("Somebody put diesel in my gas tank!");
+            FPLog.LOG.fatal("Somebody put diesel in my gas tank!");
             throw new Error("Failed to validate your GasStation mixin plugin installation. "
                             + "Please make sure you have the latest GasStation installed from the official source: "
                             + "https://github.com/FalsePattern/GasStation");

src/main/java/com/falsepattern/lib/internal/asm/RFBLoadingPlugin.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022-2023 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice and this permission notice
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.lib.internal.asm;
+
+import com.falsepattern.lib.internal.core.LowLevelCallMultiplexer;
+import com.falsepattern.lib.internal.impl.dependencies.DependencyLoaderImpl;
+import com.gtnewhorizons.retrofuturabootstrap.api.RfbPlugin;
+
+public class RFBLoadingPlugin implements RfbPlugin {
+    static {
+        LowLevelCallMultiplexer.rfbDetected();
+        DependencyLoaderImpl.executeDependencyLoading(false);
+    }
+}

src/main/java/com/falsepattern/lib/internal/config/EarlyConfig.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2022-2023 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice and this permission notice
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.lib.internal.config;
+
+import com.falsepattern.lib.StableAPI;
+import com.falsepattern.lib.internal.core.LowLevelCallMultiplexer;
+import com.google.gson.Gson;
+import com.google.gson.annotations.Expose;
+import lombok.Data;
+import lombok.SneakyThrows;
+import lombok.experimental.Accessors;
+import lombok.val;
+
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+//For stuff that runs before FML does
+@Data
+@Accessors(fluent = true)
+public class EarlyConfig {
+    @Expose
+    @StableAPI.Expose(since = "__INTERNAL__")
+    private boolean enableLibraryDownloads;
+
+    private static EarlyConfig instance = null;
+
+    @SneakyThrows
+    public static EarlyConfig load() {
+        if (instance != null)
+            return instance;
+        val configFile = LowLevelCallMultiplexer.gameDir().resolve("config").resolve("falsepatternlib-early.json");
+        val gson = new Gson();
+        EarlyConfig config;
+        if (!Files.exists(configFile)) {
+            config = new EarlyConfig();
+            config.enableLibraryDownloads(true);
+        } else {
+            config = gson.fromJson(new String(Files.readAllBytes(configFile), StandardCharsets.UTF_8), EarlyConfig.class);
+        }
+        Files.write(configFile, gson.toJson(config).getBytes(StandardCharsets.UTF_8));
+        instance = config;
+        return config;
+    }
+}

src/main/java/com/falsepattern/lib/internal/config/InGameModOptionsFix.java

@@ -1,5 +1,6 @@
 package com.falsepattern.lib.internal.config;
 
+import com.falsepattern.lib.internal.FPLog;
 import com.falsepattern.lib.internal.Share;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -37,7 +38,7 @@ public static void init() {
             MODS_FIELD.setAccessible(true);
         } catch (NoSuchFieldException e) {
             MODS_FIELD = null;
-            Share.LOG.error("Failed to get field: cpw.mods.fml.client.GuiModList.mods,"
+            FPLog.LOG.error("Failed to get field: cpw.mods.fml.client.GuiModList.mods,"
                             + " In-Game Mod Options Fix will not work", e);
             return;
         }