Merge branch '0.8-dev'

Author: FalsePattern

README.MD

@@ -7,17 +7,24 @@ A library mod for 1.7.10 with lots of useful stuff. See the table below for more
 | [dependencies](src/main/java/com/falsepattern/lib/dependencies) | Runtime dependency loader which uses Maven                                                |
 | [mixin](src/main/java/com/falsepattern/lib/mixin)               | Mixin loader plugin boilerplate code                                                      |
 | [text](src/main/java/com/falsepattern/lib/text)                 | Better Chat and GUI text processing                                                       |
+| [updates](src/main/java/com/falsepattern/lib/updates)           | Helper code for update checking                                                           |
 | [util](src/main/java/com/falsepattern/lib/util)                 | Additional utilities that do not fit the above categories, see below for more information |
 
 The contents of the [util](src/main/java/com/falsepattern/lib/util) package so far:
 
 | Class                                                                     | Purpose                                                                                                       |
 |---------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
 | [ResourceUtil](src/main/java/com/falsepattern/lib/util/ResourceUtil.java) | Provides methods for efficiently retrieving resources from SPECIFIC jar files instead of the entire classpath |
+| [Async](src/main/java/com/falsepattern/lib/util/Async.java)               | Provides asynchronous execution utilities.                                                                    |
 
 
 Anything annotated with [@StableAPI](src/main/java/com/falsepattern/lib/StableAPI.java) is guaranteed to not change in patch versions.
 
+The update checker module and the library checker module can be toggled with the `ENABLE_UPDATE_CHECKER` and 
+`ENABLE_LIBRARY_DOWNLOADS` booleans in the `falsepatternlib.cfg` config file respectively. Note that the update checker
+depends on the module downloader to grab [FJson](https://github.com/FalsePattern/FJson), so if it's not already present
+on disk, disabling the library loader breaks the update checker. This is only required the first time though.
+
 ### This project WILL NOT be ported to any version beyond 1.7.10, don't even ask
 
 [![POOP badge](https://raw.githubusercontent.com/gist/poop-person/991e80f390384bbeef09d208bff208f4/raw/a9ef83add84a70f2202896c2d81117ff7b169be1/poop-badge.svg)](https://gist.github.com/poop-person/991e80f390384bbeef09d208bff208f4)

build.gradle

@@ -1,4 +1,4 @@
-//version: 1641429628falsepattern16
+//version: 1641429628falsepattern18
 /*
 DO NOT CHANGE THIS FILE!
 
@@ -95,6 +95,7 @@ checkPropertyExists("repositoryName")
 checkPropertyExists("mavenGroupId")
 checkPropertyExists("mavenArtifactId")
 checkPropertyExists("hasMixinDeps")
+checkPropertyExists("mixinPreinitConfig")
 
 
 String javaSourceDir = "src/main/java/"
@@ -441,7 +442,7 @@ def getManifestAttributes() {
     if(usesMixins.toBoolean()) {
         manifestAttributes += [
                 "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : "mixins." + modId + ".json",
+                "MixinConfigs" : "mixins." + modId + ".json" + (mixinPreinitConfig ? "," + mixinPreinitConfig : ""),
                 "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
         ]
     }

dependencies.gradle

@@ -5,5 +5,6 @@ dependencies {
     compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
         transitive = false
     }
+    compileOnly("com.falsepattern:json:0.4.1")
     annotationProcessor("org.projectlombok:lombok:1.18.22")
 }

gradle.properties

@@ -68,13 +68,15 @@ hasMixinDeps = false
 mixinPlugin =
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage =
+# Specify a preinit mixin here. Preinit mixins should be used very rarely, if at all, so this mixin config will not be managed by the buildscript, only included.
+mixinPreinitConfig =
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatability only
 # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
 coreModClass = internal.CoreLoadingPlugin
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
-containsMixinsAndOrCoreModOnly = true
+containsMixinsAndOrCoreModOnly = false
 
 # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
 # responsibility check the licence and request permission for distribution, if required.

repositories.gradle

@@ -3,4 +3,8 @@ repositories {
         name = "sponge"
         url = "https://sponge.falsepattern.com/"
     }
+    maven {
+        name = "mavenpattern"
+        url = "https://maven.falsepattern.com/"
+    }
 }

src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java

@@ -1,11 +1,10 @@
 package com.falsepattern.lib.dependencies;
 
 import com.falsepattern.lib.StableAPI;
-import com.falsepattern.lib.internal.CoreLoadingPlugin;
-import com.falsepattern.lib.internal.FalsePatternLib;
+import com.falsepattern.lib.internal.*;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -14,11 +13,8 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import javax.net.ssl.HttpsURLConnection;
-import lombok.Builder;
-import lombok.NonNull;
-import lombok.val;
-import lombok.var;
+
+import lombok.*;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 
 
@@ -34,21 +30,18 @@ public static void addMavenRepo(String url) {
     }
 
     @Builder
-    public static void loadLibrary(String loadingModId,
-                                   String groupId,
-                                   String artifactId,
+    public static void loadLibrary(@NonNull String loadingModId,
+                                   @NonNull String groupId,
+                                   @NonNull String artifactId,
                                    @NonNull Version minVersion,
                                    Version maxVersion,
                                    @NonNull Version preferredVersion,
                                    String regularSuffix,
                                    String devSuffix) {
         val suffix = FalsePatternLib.isDeveloperEnvironment() ? devSuffix : regularSuffix;
+        val artifactLogName = String.format("%s:%s:%s%s", groupId, artifactId, preferredVersion, suffix != null ? "-" + suffix : "");
         FalsePatternLib.getLog()
-                       .info("Adding library {}:{}:{}{}, requested by mod {}",
-                             groupId,
-                             artifactId,
-                             preferredVersion,
-                             suffix != null ? "-" + suffix : "",
+                       .info("Adding library {}, requested by mod {}", artifactLogName,
                              loadingModId);
         var artifact = groupId + ":" + artifactId + ":" + suffix;
         if (loadedLibraries.containsKey(artifact)) {
@@ -108,25 +101,25 @@ public static void loadLibrary(String loadingModId,
                 addToClasspath(file);
                 loadedLibraries.put(artifact, preferredVersion);
                 FalsePatternLib.getLog()
-                               .info("Library {}:{}:{}{} successfully loaded from disk!",
-                                     groupId,
-                                     artifactId,
-                                     preferredVersion,
-                                     (suffix != null) ? ":" + suffix : "");
+                               .info("Library {} successfully loaded from disk!", artifactLogName);
                 return;
             } catch (RuntimeException e) {
                 FalsePatternLib.getLog()
-                               .warn("Failed to load library {}:{}:{}{} from file! Redownloading...",
-                                     groupId,
-                                     artifactId,
-                                     preferredVersion,
-                                     (suffix != null) ? ":" + suffix : "");
+                               .warn("Failed to load library {} from file! Redownloading...", artifactLogName);
                 if (!file.delete()) {
                     FalsePatternLib.getLog().fatal("Failed to delete file {}", file);
                     throw new RuntimeException("Failed to delete file " + file);
                 }
             }
         }
+        if (!LibraryConfig.ENABLE_LIBRARY_DOWNLOADS) {
+            val errorMessage = "Failed to load library " + groupId + ":" + artifactId + ":" + preferredVersion +
+                               ((suffix != null) ? ":" + suffix : "") + ": " + Tags.MODNAME +
+                               " library downloading has been disabled in the config, and the library is not present " +
+                               "on disk! Requested by mod: " + loadingModId;
+            FalsePatternLib.getLog().fatal(errorMessage);
+            throw new IllegalStateException(errorMessage);
+        }
         for (var repo : mavenRepositories) {
             try {
                 if (!repo.endsWith("/")) {
@@ -138,39 +131,24 @@ public static void loadLibrary(String loadingModId,
                                                 artifactId,
                                                 preferredVersion,
                                                 mavenJarName));
-
-                val connection = (HttpsURLConnection) url.openConnection();
-                connection.setConnectTimeout(1500);
-                connection.setReadTimeout(1500);
-                connection.setRequestProperty("User-Agent", "FalsePatternLib Downloader");
-                if (connection.getResponseCode() != 200) {
+                String finalRepo = repo;
+                Internet.connect(url, (ex) -> {
                     FalsePatternLib.getLog()
-                                   .info("Artifact {}:{}:{}{} was not found on repo {}",
-                                         groupId,
-                                         artifactId,
-                                         preferredVersion,
-                                         (suffix != null) ? ":" + suffix : "",
-                                         repo);
-                    connection.disconnect();
-                    continue;
-                }
-                FalsePatternLib.getLog()
-                               .info("Downloading {}:{}:{}{} from {}",
-                                     groupId,
-                                     artifactId,
-                                     preferredVersion,
-                                     (suffix != null) ? ":" + suffix : "",
-                                     repo);
-                download(connection.getInputStream(), file);
-                FalsePatternLib.getLog()
-                               .info("Downloaded {}:{}:{}{}",
-                                     groupId,
-                                     artifactId,
-                                     preferredVersion,
-                                     (suffix != null) ? ":" + suffix : "");
-                loadedLibraries.put(artifact, preferredVersion);
-                loadedLibraryMods.put(artifact, loadingModId);
-                addToClasspath(file);
+                                   .info("Artifact {} could not be downloaded from repo {}: {}",
+                                           artifactLogName,
+                                           finalRepo,
+                                           ex.getMessage());
+                }, (input) -> {
+                    FalsePatternLib.getLog()
+                                   .info("Downloading {} from {}",
+                                           artifactLogName,
+                                           finalRepo);
+                    download(input, file);
+                    FalsePatternLib.getLog().info("Downloaded {}", artifactLogName);
+                    loadedLibraries.put(artifact, preferredVersion);
+                    loadedLibraryMods.put(artifact, loadingModId);
+                    addToClasspath(file);
+                });
                 return;
             } catch (IOException ignored) {
             }
@@ -192,19 +170,11 @@ private static void addToClasspath(File file) {
         }
     }
 
-    private static void download(InputStream is, File target) throws IOException {
+    @SneakyThrows
+    private static void download(InputStream is, File target) {
         if (target.exists()) {
             return;
         }
-
-        var bytesRead = 0;
-
-        val fileOutput = new BufferedOutputStream(Files.newOutputStream(target.toPath()));
-        byte[] smallBuffer = new byte[4096];
-        while ((bytesRead = is.read(smallBuffer)) >= 0) {
-            fileOutput.write(smallBuffer, 0, bytesRead);
-        }
-        fileOutput.close();
-        is.close();
+        Internet.transferAndClose(is, new BufferedOutputStream(Files.newOutputStream(target.toPath())));
     }
 }

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

@@ -20,7 +20,7 @@ public String[] getASMTransformerClass() {
 
     @Override
     public String getModContainerClass() {
-        return Tags.GROUPNAME + ".internal.FalsePatternLib";
+        return null;
     }
 
     @Override

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

@@ -1,44 +1,77 @@
 package com.falsepattern.lib.internal;
 
+import com.falsepattern.lib.config.ConfigException;
 import com.falsepattern.lib.config.ConfigurationManager;
-import com.falsepattern.lib.util.ResourceUtil;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-import cpw.mods.fml.common.DummyModContainer;
-import cpw.mods.fml.common.LoadController;
-import cpw.mods.fml.common.MetadataCollection;
+import com.falsepattern.lib.internal.proxy.CommonProxy;
+import com.falsepattern.lib.text.FormattedText;
+import com.falsepattern.lib.updates.ModUpdateInfo;
+import com.falsepattern.lib.updates.UpdateChecker;
+import cpw.mods.fml.common.*;
 import cpw.mods.fml.common.event.FMLConstructionEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import lombok.Getter;
+import lombok.val;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.event.ClickEvent;
 import net.minecraft.launchwrapper.Launch;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Utility class used by FalsePatternLib's internal code. This can change between versions without notice, so do not use
  * this in your code!
  */
-public class FalsePatternLib extends DummyModContainer {
+@SuppressWarnings("UnstableApiUsage")
+@Mod(modid = Tags.MODID,
+     name = Tags.MODNAME,
+     version = Tags.VERSION,
+     acceptedMinecraftVersions = "[1.7.10]",
+     acceptableRemoteVersions = "*")
+public class FalsePatternLib {
     @Getter private static final Logger log = LogManager.getLogger(Tags.MODNAME);
 
     @Getter private static final boolean developerEnvironment =
             (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
 
+    @SidedProxy(clientSide = Tags.GROUPNAME + ".internal.proxy.ClientProxy", serverSide = Tags.GROUPNAME + ".internal.proxy.CommonProxy")
+    private static CommonProxy proxy;
+
     public FalsePatternLib() {
-        super(MetadataCollection.from(ResourceUtil.getResourceFromJar("/mcmod.info", FalsePatternLib.class), Tags.MODID)
-                                .getMetadataForId(Tags.MODID, null));
         log.info("Version " + Tags.VERSION + " initialized!");
     }
 
-    @SuppressWarnings("UnstableApiUsage")
-    @Subscribe
+    @Mod.EventHandler
     public void construct(FMLConstructionEvent e) {
-        ConfigurationManager.init();
+        proxy.construct(e);
     }
 
-    @SuppressWarnings("UnstableApiUsage")
-    @Override
-    public boolean registerBus(EventBus bus, LoadController controller) {
-        bus.register(this);
-        return true;
+    @Mod.EventHandler
+    public void preInit(FMLPreInitializationEvent e) {
+        proxy.preInit(e);
     }
+
+    @Mod.EventHandler
+    public void postInit(FMLPostInitializationEvent e) {
+        proxy.postInit(e);
+    }
+
 }

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

@@ -0,0 +1,40 @@
+package com.falsepattern.lib.internal;
+
+import lombok.val;
+import lombok.var;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.function.Consumer;
+
+public class Internet {
+    public static void connect(URL URL, Consumer<Exception> onError, Consumer<InputStream> onSuccess) {
+        try {
+            val connection = (HttpURLConnection) URL.openConnection();
+            connection.setConnectTimeout(3500);
+            connection.setReadTimeout(5000);
+            connection.setRequestProperty("User-Agent", "FalsePatternLib Internet Connector");
+            if (connection.getResponseCode() != 200) {
+                onError.accept(new Exception("HTTP response code " + connection.getResponseCode()));
+            } else {
+                onSuccess.accept(connection.getInputStream());
+            }
+            connection.disconnect();
+        } catch (Exception e) {
+            onError.accept(e);
+        }
+    }
+
+
+    public static void transferAndClose(InputStream is, OutputStream target) throws IOException {
+        var bytesRead = 0;
+
+        byte[] smallBuffer = new byte[4096];
+        while ((bytesRead = is.read(smallBuffer)) >= 0) {
+            target.write(smallBuffer, 0, bytesRead);
+        }
+        target.close();
+        is.close();
+    }
+}