From cecf23d191952f61634f4a641bed47bf81e4d541 Mon Sep 17 00:00:00 2001
From: techno_sam <linux.techno.sam@gmail.com>
Date: Fri, 12 Aug 2022 15:09:32 -0700
Subject: [PATCH] 1.19 port

---
 build.gradle                                        |  2 +-
 gradle.properties                                   | 12 ++++++------
 .../aws404/polypackhost/PolypackHttpHandler.java    | 13 ++++++++++++-
 src/main/resources/fabric.mod.json                  |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index ab53e7c..94b84b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.10-SNAPSHOT'
+	id 'fabric-loom' version '0.12-SNAPSHOT'
 	id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
index d13570e..85f24f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	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
+	minecraft_version=1.19.2
+	yarn_mappings=1.19.2+build.3
+	loader_version=0.14.9
+	polymer_version=0.2.12+1.19.2
+	fabric_version=0.59.0+1.19.2
 
 # Mod Properties
-	mod_version = 0.2.0
+	mod_version = 0.2.1
 	maven_group = com.github.aws404
 	archives_base_name = polypack-host
diff --git a/src/main/java/com/github/aws404/polypackhost/PolypackHttpHandler.java b/src/main/java/com/github/aws404/polypackhost/PolypackHttpHandler.java
index 348014e..ed47ff2 100644
--- a/src/main/java/com/github/aws404/polypackhost/PolypackHttpHandler.java
+++ b/src/main/java/com/github/aws404/polypackhost/PolypackHttpHandler.java
@@ -7,6 +7,8 @@
 import eu.pb4.polymer.api.resourcepack.PolymerRPUtils;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.dedicated.MinecraftDedicatedServer;
+import net.minecraft.text.Text;
 
 import java.io.*;
 import java.math.BigInteger;
@@ -15,6 +17,7 @@
 import java.nio.file.Path;
 import java.security.MessageDigest;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -64,7 +67,15 @@ public static void start(MinecraftServer minecraftServer) {
                         .digest(new FileInputStream(POLYMER_PACK_FILE.toString()).readAllBytes()))
                 );
 
-                minecraftServer.setResourcePack(packIp, hash);
+                if (minecraftServer instanceof MinecraftDedicatedServer dedicatedServer) {
+                    boolean required = false;
+                    Text prompt = Text.empty();
+                    if (dedicatedServer.getProperties().serverResourcePackProperties.isPresent()) {
+                        required = dedicatedServer.getProperties().serverResourcePackProperties.get().isRequired();
+                        prompt = dedicatedServer.getProperties().serverResourcePackProperties.get().prompt();
+                    }
+                    dedicatedServer.getProperties().serverResourcePackProperties = Optional.of(new MinecraftServer.ServerResourcePackProperties(packIp, hash, required, prompt));
+                }
 
                 PolypackHostMod.LOGGER.info("Polymer resource pack host started at {} (Hash: {})", packIp, hash);
             } catch (Exception e) {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 639f892..d2aaa25 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,7 +23,7 @@
 
   "depends": {
     "fabricloader": ">=0.11.3",
-    "minecraft": "1.18.x",
+    "minecraft": "1.19.x",
     "polymer": "*",
     "fabric-lifecycle-events-v1": "*",
     "java": ">=17"