From c7ccc054add91dce2fad0c9618b9171fb1d8eff8 Mon Sep 17 00:00:00 2001
From: Daniel Orr <orrdaniel73@gmail.com>
Date: Sat, 20 Apr 2024 22:46:02 +0100
Subject: [PATCH] Update to 1.20.5-rc2

---
 build.gradle                                       |  3 +--
 gradle.properties                                  | 14 +++++++-------
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 .../packmanager/ResourcePackEnvironment.java       |  2 +-
 .../kotlin/net/mcbrawls/packmanager/PackManager.kt |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index f8c7f56..f34da03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 //file:noinspection All
 
 plugins {
-    id "fabric-loom" version "1.5-SNAPSHOT"
+    id "fabric-loom" version "1.6-SNAPSHOT"
     id "org.jetbrains.kotlin.jvm"
     id "maven-publish"
 }
@@ -44,7 +44,6 @@ dependencies {
 
     // test
     testImplementation sourceSets.main.output
-    testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:2.21.1"
 }
 
 loom {
diff --git a/gradle.properties b/gradle.properties
index ef09f4c..ab3e6a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,17 +4,17 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=23w51b
-yarn_build=4
-loader_version=0.15.6
+minecraft_version=1.20.5-rc2
+yarn_build=1
+loader_version=0.15.10
 
 # Dependencies
-fabric_version=0.94.0+1.20.5
+fabric_version=0.97.4+1.20.5
 
-kotlin_version=1.9.22
-fabric_kotlin_version=1.10.17+kotlin.1.9.22
+kotlin_version=1.9.23
+fabric_kotlin_version=1.10.19+kotlin.1.9.23
 
 # Mod Properties
-mod_version=1.1.1
+mod_version=1.2.0
 maven_group=net.mcbrawls
 mod_id=packmanager
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a80b22c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/mcbrawls/packmanager/ResourcePackEnvironment.java b/src/main/java/net/mcbrawls/packmanager/ResourcePackEnvironment.java
index ef51a1f..de3a31f 100644
--- a/src/main/java/net/mcbrawls/packmanager/ResourcePackEnvironment.java
+++ b/src/main/java/net/mcbrawls/packmanager/ResourcePackEnvironment.java
@@ -46,7 +46,7 @@ static ResourcePackSendS2CPacket createSendPacket(ServerResourcePackProperties p
                 properties.url(),
                 properties.hash(),
                 properties.isRequired(),
-                properties.prompt()
+                Optional.ofNullable(properties.prompt())
         );
     }
 
diff --git a/src/main/kotlin/net/mcbrawls/packmanager/PackManager.kt b/src/main/kotlin/net/mcbrawls/packmanager/PackManager.kt
index 34a4a7f..e56ad69 100644
--- a/src/main/kotlin/net/mcbrawls/packmanager/PackManager.kt
+++ b/src/main/kotlin/net/mcbrawls/packmanager/PackManager.kt
@@ -36,7 +36,7 @@ object PackManager : DedicatedServerModInitializer {
         }
 
         // register join event
-        ServerPlayConnectionEvents.JOIN.register { handler, sender, server ->
+        ServerPlayConnectionEvents.JOIN.register { handler, _, server ->
             val player = handler.player
 
             // compile pack set