From e9127678bd38e9344a0a4944d88757eb5c5c0cb4 Mon Sep 17 00:00:00 2001
From: Joerg Taschek <j.taschek@planradar.com>
Date: Tue, 23 Jan 2024 11:43:03 +0100
Subject: [PATCH] 1.20.4 fabric

---
 .idea/gradle.xml                              |  9 ++++----
 build.gradle.kts                              | 16 +++----------
 gradle.properties                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle.kts                           |  9 +++-----
 .../mixins/ServerNetworkIoMixin.java          |  4 ++--
 .../vg/skye/e4mc_minecraft/CommandsHelper.kt  |  2 +-
 src/main/resources/fabric.mod.json            | 12 +++++-----
 version.gradle.kts                            | 23 ++++++++-----------
 versions/mainProject                          |  2 +-
 10 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e6f4490..e10e09f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,14 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/versions/1.18.2-fabric" />
-            <option value="$PROJECT_DIR$/versions/1.18.2-forge" />
-            <option value="$PROJECT_DIR$/versions/1.19.4-fabric" />
-            <option value="$PROJECT_DIR$/versions/1.19.4-forge" />
+            <option value="$PROJECT_DIR$/versions/1.20.4-fabric" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/build.gradle.kts b/build.gradle.kts
index 9a10e00..96ae746 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,24 +1,14 @@
 plugins {
-    id("xyz.deftu.gradle.multiversion-root")
+    id("dev.deftu.gradle.multiversion-root")
 }
 
 preprocess {
-    val fabric11904 = createNode("1.19.4-fabric", 11903, "yarn")
-    val fabric11802 = createNode("1.18.2-fabric", 11802, "yarn")
-    val forge11904 = createNode("1.19.4-forge", 11903, "srg")
-    val forge11802 = createNode("1.18.2-forge", 11802, "srg")
-
-    fabric11904.link(forge11904)
-    forge11904.link(forge11802)
-    forge11802.link(fabric11802)
+    val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn")
 }
 
 val releaseAllVersions by tasks.registering {
     listOf(
-        "1.18.2-fabric",
-        "1.19.4-fabric",
-        "1.18.2-forge",
-        "1.19.4-forge"
+        "1.20.4-fabric"
     ).forEach { version ->
         dependsOn(":$version:releaseProject")
     }
diff --git a/gradle.properties b/gradle.properties
index a3db6ec..e542dc7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G
 
 mod.name=e4mc
 mod.id=e4mc_minecraft
-mod.version=4.0.1
+mod.version=4.0.2
 mod.group=vg.skye
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef62641..20cd5a1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4a05a6d..a690e72 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,8 +24,8 @@ pluginManagement {
         kotlin("jvm") version(kotlin)
         kotlin("plugin.serialization") version(kotlin)
 
-        val epgt = "1.17.1"
-        id("xyz.deftu.gradle.multiversion-root") version(epgt)
+        val epgt = "1.22.2"
+        id("dev.deftu.gradle.multiversion-root") version(epgt)
     }
 }
 
@@ -35,10 +35,7 @@ rootProject.name = projectName
 rootProject.buildFileName = "build.gradle.kts"
 
 listOf(
-    "1.18.2-fabric",
-    "1.19.4-fabric",
-    "1.18.2-forge",
-    "1.19.4-forge"
+    "1.20.4-fabric"
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {
diff --git a/src/main/java/vg/skye/e4mc_minecraft/mixins/ServerNetworkIoMixin.java b/src/main/java/vg/skye/e4mc_minecraft/mixins/ServerNetworkIoMixin.java
index bc5e683..497d0c0 100644
--- a/src/main/java/vg/skye/e4mc_minecraft/mixins/ServerNetworkIoMixin.java
+++ b/src/main/java/vg/skye/e4mc_minecraft/mixins/ServerNetworkIoMixin.java
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import vg.skye.e4mc_minecraft.E4mcClient;
 import vg.skye.e4mc_minecraft.QuiclimeHandler;
 
-import javax.annotation.Nullable;
+
 import java.io.IOException;
 import java.net.InetAddress;
 
@@ -25,7 +25,7 @@ public abstract class ServerNetworkIoMixin {
 	private static final ThreadLocal<Boolean> initializingE4mc = ThreadLocal.withInitial(() -> false);
 
 	@Shadow
-	public abstract void bind(@Nullable InetAddress address, int port) throws IOException;
+	public abstract void bind(InetAddress address, int port) throws IOException;
 
 	@Inject(method = "bind", at = @At("HEAD"))
 	private void bind(InetAddress address, int port, CallbackInfo ci) {
diff --git a/src/main/kotlin/vg/skye/e4mc_minecraft/CommandsHelper.kt b/src/main/kotlin/vg/skye/e4mc_minecraft/CommandsHelper.kt
index b75f91c..b31a6bd 100644
--- a/src/main/kotlin/vg/skye/e4mc_minecraft/CommandsHelper.kt
+++ b/src/main/kotlin/vg/skye/e4mc_minecraft/CommandsHelper.kt
@@ -52,7 +52,7 @@ object CommandsHelper {
     }
 
     private fun sendMessageToSource(text: Text, source: ServerCommandSource) {
-        source.sendFeedback(text, true)
+        source.sendFeedback({text}, true)
     }
 
     private fun sendErrorToSource(text: Text, source: ServerCommandSource) {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index d317911..8b7e6a3 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,8 +1,8 @@
 {
     "schemaVersion": 1,
-    "id": "${mod_id}",
-    "version": "${mod_version}",
-    "name": "${mod_name}",
+    "id": "e4mc_minecraft",
+    "version": "4.0.2",
+    "name": "e4mc",
     "description": "Open a LAN server to anyone, anywhere, anytime.",
     "authors": [
         "skyevg"
@@ -25,13 +25,13 @@
         ]
     },
     "mixins": [
-        "${mod_id}.mixins.json"
+        "e4mc_minecraft.mixins.json"
     ],
     "depends": {
         "fabric": "*",
-        "fabricloader": ">=0.14.9",
+        "fabricloader": ">=0.15.6",
         "fabric-language-kotlin": "*",
-        "minecraft": "${mc_version == "1.19.4" ? ">=1.19" : ">=1.18 <1.19"}",
+        "minecraft": "1.20.4",
         "java": ">=16"
     }
 }
\ No newline at end of file
diff --git a/version.gradle.kts b/version.gradle.kts
index 3463f77..21e9efd 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -1,17 +1,17 @@
 import com.modrinth.minotaur.dependencies.DependencyType
 import com.modrinth.minotaur.dependencies.ModDependency
 import org.gradle.configurationcache.extensions.capitalized
-import xyz.deftu.gradle.tools.minecraft.CurseRelation
-import xyz.deftu.gradle.tools.minecraft.CurseRelationType
+import dev.deftu.gradle.tools.minecraft.CurseRelation
+import dev.deftu.gradle.tools.minecraft.CurseRelationType
 
 plugins {
     java
     kotlin("jvm")
-    id("xyz.deftu.gradle.multiversion")
-    id("xyz.deftu.gradle.tools")
-    id("xyz.deftu.gradle.tools.minecraft.loom")
-    id("xyz.deftu.gradle.tools.shadow")
-    id("xyz.deftu.gradle.tools.minecraft.releases")
+    id("dev.deftu.gradle.multiversion")
+    id("dev.deftu.gradle.tools")
+    id("dev.deftu.gradle.tools.minecraft.loom")
+    id("dev.deftu.gradle.tools.shadow")
+    id("dev.deftu.gradle.tools.minecraft.releases")
 }
 
 val bundle by configurations.creating {
@@ -35,13 +35,11 @@ java {
 
 toolkitReleases {
     gameVersions.set(when (mcData.version) {
-        11904 -> listOf("1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1")
-        11802 -> listOf("1.18", "1.18.1", "1.18.2")
+        12004 -> listOf("1.20.4")
         else -> listOf()
     })
     releaseName.set("[${when (mcData.version) {
-        11904 -> "1.19-"
-        11802 -> "1.18.x"
+        12004 -> "1.20.4"
         else -> mcData.versionStr
     }}] [${mcData.loader.name.capitalized()}] ${modData.version}")
     if (mcData.isFabric) {
@@ -97,8 +95,7 @@ dependencies {
         modImplementation(
             "net.fabricmc.fabric-api:fabric-api:${
                 when (mcData.version) {
-                    11904 -> "0.78.0+1.19.4"
-                    11802 -> "0.76.0+1.18.2"
+                    12004 -> "0.94.0+1.20.4"
                     else -> throw IllegalStateException("Invalid MC version: ${mcData.version}")
                 }
             }"
diff --git a/versions/mainProject b/versions/mainProject
index 6d331b5..dc8b25b 100644
--- a/versions/mainProject
+++ b/versions/mainProject
@@ -1 +1 @@
-1.19.4-fabric
+1.20.4-fabric