Update to 0.2.0

Author: aws404

README.md

@@ -2,30 +2,23 @@
 Automatically build, host and require all your installed polymer mods resources!
 
 ## Config `(config/polypack_host.json)`
-* `hostIp`: The IP address to host the resource pack on. Leave as `null` to use the server's IP
-    * Default: `null`
-* `hostPort`: The port to host the resource pack on. Make sure this port is also forwarded, so it can be accessed externally.
-    * Default: `8001`
-* `threadCount`: The number of threads the HTTP server is allowed to use. If the server cannot keep up with the requests, this may need to be increased.
-    * Default: `3`
-* `randomiseUrl`: If this is set to true, it will make the client download a new version of the resource pack each time. If you have issues with players joining and being told there was a resource pack error, set this to `true`.
+* `external_ip`: The IP address to host the resource pack on. Leave empty to use the IP server's properties file.
+    * Default: ``
+* `host_port`: The port to host the resource pack on. Make sure this port is also forwarded, so it can be accessed externally.
+    * Default: `24464`
+* `thread_count`: The number of threads the HTTP server is allowed to use. If the server cannot keep up with the requests, this may need to be increased.
+    * Default: `1`
+* `randomise_url`: If this is set to true, it will make the client download a new version of the resource pack each time. If you have issues with players joining and being told there was a resource pack error, set this to `true`.
     * Default: `false`
 
 ## Recommended Server Properties `(server.properties)`
 * Set `require-resource-pack` to `true` so the client is mostly forced to use the resource pack.
 * Set `resource-pack-prompt` to something like `"Required Mod Resources""` so the player knows why the pack is required.
 
-
-## Maven
-The mod can be obtained by adding the repository:
-```gradle
-repositories {
-  maven { url 'https://raw.github.com/aws404/maven/main' }
-}
-```
-and added to the runtime environment using:
-```gradle
-dependencies {
-  modRuntime("com.github.aws404:polypack-host:[TAG]")
-}
-```
+## FAQ
+* I get a `No external IP address is defined in the configuration, this may cause errors outside of the local network.` warning everytime I start the server, what's the problem?
+  * If you do not have an external IP defined, the mod cannot tell the client's where to find pack. 
+  * Set the external IP in the configuration or server.properties file to fix.
+* Some/All clients fail to download the resource pack.
+  * The URL that is sent to the client is logged on server start, check this URL to make sure it looks right. Try opening the URL in your browser, it should also download the resource pack file.
+  * Make sure the specified port is forwarded and accessible externally.

build.gradle

@@ -20,7 +20,8 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modImplementation("eu.pb4:polymer:${project.polymer_version}")
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
+	modImplementation "eu.pb4:polymer:${project.polymer_version}"
 }
 
 processResources {

gradle.properties

@@ -3,12 +3,13 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.18
-	yarn_mappings=1.18+build.1
-	loader_version=0.12.6
-	polymer_version=0.2.0-beta.4+1.18-rc3
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.3
+	loader_version=0.14.4
+	polymer_version=0.2.0-beta.40+1.18.2
+	fabric_version=0.51.1+1.18.2
 
 # Mod Properties
-	mod_version = 0.0.1
+	mod_version = 0.2.0
 	maven_group = com.github.aws404
 	archives_base_name = polypack-host

src/main/java/com/github/aws404/polypackhost/PolypackHostConfig.java

@@ -2,44 +2,58 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.JsonOps;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 
-public class PolypackHostConfig {
-    public static final File CONFIG_FILE = new File(FabricLoader.getInstance().getConfigDir().toFile(), "polypack_host.json");
-    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().serializeNulls().disableHtmlEscaping().create();
-
-    public String hostIp = null;
-    public int hostPort = 8001;
-    public int threadCount = 3;
-    public boolean randomiseUrl = false;
+public record PolypackHostConfig(String ip, int hostPort, int threadCount, boolean randomiseUrl) {
 
-    public static PolypackHostConfig loadConfigFile(File file) {
-        PolypackHostConfig config = null;
-
-        if (file.exists()) {
+    private static final File CONFIG_FILE = new File(FabricLoader.getInstance().getConfigDir().toFile(), "polypack_host.json");
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().serializeNulls().disableHtmlEscaping().create();
+    private static final Codec<PolypackHostConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            Codec.STRING.fieldOf("external_ip").orElse("").forGetter(PolypackHostConfig::ip),
+            Codec.INT.fieldOf("host_port").orElse(24464).forGetter(PolypackHostConfig::hostPort),
+            Codec.INT.fieldOf("thread_count").orElse(1).forGetter(PolypackHostConfig::threadCount),
+            Codec.BOOL.fieldOf("randomise_url").orElse(false).forGetter(PolypackHostConfig::randomiseUrl)
+    ).apply(instance, PolypackHostConfig::new));
+
+    public static PolypackHostConfig loadConfigFile() {
+        JsonObject parsedFile = null;
+        if (CONFIG_FILE.exists()) {
             try {
-                BufferedReader fileReader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
-                config = GSON.fromJson(fileReader, PolypackHostConfig.class);
+                FileReader reader = new FileReader(CONFIG_FILE);
+                parsedFile = GSON.fromJson(reader, JsonObject.class);
+                reader.close();
             } catch (IOException e) {
-                PolypackHostMod.LOGGER.error("Failed to load config file. Ignoring and loading defaults.", e);
+                PolypackHostMod.LOGGER.error("Failed to read configuration file! Resetting config to defaults.", e);
             }
+        } else {
+            PolypackHostMod.LOGGER.info("Configuration file not found! Creating new one...");
         }
-        if (config == null) {
-            config = new PolypackHostConfig();
+        if (parsedFile == null) {
+            parsedFile = new JsonObject();
         }
 
-        config.saveConfigFile(file);
+        PolypackHostConfig config = CODEC.decode(JsonOps.INSTANCE, parsedFile).getOrThrow(false, s -> PolypackHostMod.LOGGER.error("Error deserializing configuration file. Error: {}", s)).getFirst();
+        config.saveConfigFile();
         return config;
     }
 
-    public void saveConfigFile(File file) {
-        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
-            GSON.toJson(this, writer);
+    public void saveConfigFile() {
+        JsonElement jsonObject = CODEC.encodeStart(JsonOps.INSTANCE, this).getOrThrow(false, s -> PolypackHostMod.LOGGER.error("Error serializing configuration file. Error: {}", s));
+        try {
+            FileOutputStream stream = new FileOutputStream(CONFIG_FILE);
+            Writer writer = new OutputStreamWriter(stream);
+            GSON.toJson(jsonObject, writer);
+            writer.close();
+            stream.close();
         } catch (IOException e) {
-            PolypackHostMod.LOGGER.error("Failed to save config file.", e);
+            PolypackHostMod.LOGGER.error("Failed to save configuration file. Changes were not saved.", e);
         }
     }
 }

src/main/java/com/github/aws404/polypackhost/PolypackHostMod.java

@@ -1,15 +1,18 @@
 package com.github.aws404.polypackhost;
 
 import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class PolypackHostMod implements DedicatedServerModInitializer {
 	public static final Logger LOGGER = LogManager.getLogger("Polypack Host");
-	public static final PolypackHostConfig CONFIG = PolypackHostConfig.loadConfigFile(PolypackHostConfig.CONFIG_FILE);
+	public static final PolypackHostConfig CONFIG = PolypackHostConfig.loadConfigFile();
 
 	@Override
 	public void onInitializeServer() {
-		LOGGER.info("Starting Polypack Host Mod");
+		ServerLifecycleEvents.SERVER_STARTED.register(PolypackHttpHandler::start);
+		ServerLifecycleEvents.SERVER_STOPPING.register(server -> PolypackHttpHandler.stop());
+		LOGGER.info("Polypack Host Mod Started!");
 	}
 }

src/main/java/com/github/aws404/polypackhost/PolypackHttpHandler.java

@@ -1,54 +1,77 @@
 package com.github.aws404.polypackhost;
 
-import com.google.common.hash.Hashing;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import eu.pb4.polymer.api.resourcepack.PolymerRPUtils;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.MinecraftServer;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
+import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
+import java.security.MessageDigest;
 import java.util.Objects;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class PolypackHttpHandler implements HttpHandler {
 
     private static final Path POLYMER_PACK_FILE = Path.of(FabricLoader.getInstance().getGameDir().toFile() + "/polymer-resourcepack.zip");
 
+    private static HttpServer server = null;
+    private static ExecutorService threadPool = null;
+
+    public static void stop() {
+        if (PolypackHttpHandler.server != null) {
+            PolypackHttpHandler.server.stop(0);
+        }
+        if (PolypackHttpHandler.threadPool != null) {
+            PolypackHttpHandler.threadPool.shutdownNow();
+        }
+    }
+
     public static void start(MinecraftServer minecraftServer) {
-        try {
-            String serverIp = PolypackHostMod.CONFIG.hostIp == null || PolypackHostMod.CONFIG.hostIp.isEmpty() ? minecraftServer.getServerIp() : PolypackHostMod.CONFIG.hostIp;
-            if (serverIp.isEmpty()) {
-                serverIp = InetAddress.getLocalHost().getHostAddress();
-            }
-            PolypackHostMod.LOGGER.info("Building polymer resource pack...");
-            PolymerRPUtils.build(POLYMER_PACK_FILE);
+        PolypackHttpHandler.threadPool = Executors.newFixedThreadPool(PolypackHostMod.CONFIG.threadCount(), new ThreadFactoryBuilder().setNameFormat("Polypack-Host-%d").build());
 
-            String subUrl = PolypackHostMod.CONFIG.randomiseUrl ? Integer.toString(new Random().nextInt(Integer.MAX_VALUE)) : "pack";
+        CompletableFuture.runAsync(() -> {
+            try {
+                PolypackHostMod.LOGGER.info("Starting Polymer resource pack server...");
+                PolymerRPUtils.build(POLYMER_PACK_FILE);
 
-            HttpServer server = HttpServer.create(new InetSocketAddress(serverIp, PolypackHostMod.CONFIG.hostPort), 0);
-            server.createContext("/" + subUrl, new PolypackHttpHandler());
-            server.setExecutor(Executors.newFixedThreadPool(PolypackHostMod.CONFIG.threadCount));
-            server.start();
+                String serverIp = PolypackHostMod.CONFIG.ip().isEmpty() ? minecraftServer.getServerIp() : PolypackHostMod.CONFIG.ip();
+                if (serverIp.isEmpty()) {
+                    PolypackHostMod.LOGGER.warn("No external IP address is defined in the configuration, this may cause issues outside of the local network.");
+                    serverIp = InetAddress.getLocalHost().getHostAddress();
+                }
 
-            String packIp = String.format("http://%s:%s/%s", serverIp, PolypackHostMod.CONFIG.hostPort, subUrl);
+                String subUrl = PolypackHostMod.CONFIG.randomiseUrl() ? Integer.toString(new Random().nextInt(Integer.MAX_VALUE)) : "pack";
 
-            PolypackHostMod.LOGGER.info("Polymer resource pack host started at {}", packIp);
+                PolypackHttpHandler.server = HttpServer.create(new InetSocketAddress("0.0.0.0", PolypackHostMod.CONFIG.hostPort()), 0);
+                PolypackHttpHandler.server.createContext("/" + subUrl, new PolypackHttpHandler());
+                PolypackHttpHandler.server.setExecutor(PolypackHttpHandler.threadPool);
+                PolypackHttpHandler.server.start();
+
+                String packIp = String.format("http://%s:%s/%s", serverIp, PolypackHostMod.CONFIG.hostPort(), subUrl);
+
+                String hash = String.format("%040x", new BigInteger(1, MessageDigest
+                        .getInstance("SHA-1")
+                        .digest(new FileInputStream(POLYMER_PACK_FILE.toString()).readAllBytes()))
+                );
+
+                minecraftServer.setResourcePack(packIp, hash);
+
+                PolypackHostMod.LOGGER.info("Polymer resource pack host started at {} (Hash: {})", packIp, hash);
+            } catch (Exception e) {
+                PolypackHostMod.LOGGER.error("Failed to start the resource pack server!", e);
+            }
+        }, PolypackHttpHandler.threadPool);
 
-            String hash = com.google.common.io.Files.asByteSource(PolypackHttpHandler.POLYMER_PACK_FILE.toFile()).hash(Hashing.sha1()).toString();
-            minecraftServer.setResourcePack(packIp, hash);
-        } catch (IOException e) {
-            PolypackHostMod.LOGGER.error("Failed to start the resource pack server!", e);
-            e.printStackTrace();
-        }
     }
 
     @Override
@@ -67,10 +90,9 @@ public void handle(HttpExchange exchange) throws IOException {
             exchange.sendResponseHeaders(200, pack.length());
 
             FileInputStream fis = new FileInputStream(pack);
-            int b;
-            while ((b = fis.read()) != -1) {
-                outputStream.write(b);
-            }
+            BufferedInputStream bis = new BufferedInputStream(fis);
+            bis.transferTo(outputStream);
+            bis.close();
             fis.close();
 
             outputStream.flush();

src/main/java/com/github/aws404/polypackhost/mixin/MinecraftServerMixin.java

@@ -20,14 +20,12 @@
       "com.github.aws404.polypackhost.PolypackHostMod"
     ]
   },
-  "mixins": [
-    "polypack_host.mixins.json"
-  ],
 
   "depends": {
     "fabricloader": ">=0.11.3",
     "minecraft": "1.18.x",
     "polymer": "*",
+    "fabric-lifecycle-events-v1": "*",
     "java": ">=17"
   }
 }