+ fix #109

Nova-Committee · Jul 4, 2023 · 314d2e3 · 314d2e3
1 parent 545295a
commit 314d2e3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -12,6 +12,7 @@ preprocess {
     def mc1192 = createNode("1.19.2", 1_19_02, "yarn")
     def mc1193 = createNode("1.19.3", 1_19_03, "yarn")
     def mc1194 = createNode("1.19.4", 1_19_04, "yarn")
+    def mc1200 = createNode("1.20", 1_20_00, "yarn")
     def mc1201 = createNode("1.20.1", 1_20_01, "yarn")
 
     mc1144.link(mc1152, null)
@@ -21,5 +22,6 @@ preprocess {
     mc1182.link(mc1192, null)
     mc1192.link(mc1193, null)
     mc1193.link(mc1194, null)
-    mc1194.link(mc1201, null)
+    mc1194.link(mc1200, null)
+    mc1200.link(mc1201, null)
 }
diff --git a/fabric/settings.gradle b/fabric/settings.gradle
@@ -29,6 +29,7 @@ def versions = Arrays.asList(
         "1.19.2",
         "1.19.3",
         "1.19.4",
+        "1.20",
         "1.20.1"
 )
 for (String version : versions) {

diff --git a/fabric/src/main/java/cn/evole/mods/mcbot/init/event/ITickEvent.java b/fabric/src/main/java/cn/evole/mods/mcbot/init/event/ITickEvent.java
@@ -33,7 +33,7 @@ public static Queue<String> getSendQueue() {
 
 
     public static void register(MinecraftServer server) {
-            String toSend = SEND_QUEUE.poll();
+            String toSend = SEND_QUEUE.poll() == null ? "" : SEND_QUEUE.poll();
             if (ConfigHandler.cached() != null
                     && server.isDedicatedServer()
                     && toSend != null

diff --git a/fabric/versions/1.20.1/gradle.properties b/fabric/versions/1.20.1/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.1
 loader_version=0.14.17
 
 # Fabric Mod Metadata
-minecraft_dependency=1.20.x
+minecraft_dependency=1.20.1
 
 # Dependencies
 fabric_version=0.83.1+1.20.1
diff --git a/fabric/versions/1.20/gradle.properties b/fabric/versions/1.20/gradle.properties
@@ -0,0 +1,10 @@
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.20
+loader_version=0.14.17
+
+# Fabric Mod Metadata
+minecraft_dependency=1.20
+
+# Dependencies
+fabric_version=0.83.0+1.20
diff --git a/fabric/wrapper/build.gradle b/fabric/wrapper/build.gradle
@@ -64,7 +64,7 @@ processResources {
 }
 
 loom {
-    runConfigs.all {
+    runConfigs.configureEach {
         runDir "../run"
     }
 }
diff --git a/fabric/wrapper/src/main/resources/fabric.mod.json b/fabric/wrapper/src/main/resources/fabric.mod.json
@@ -40,7 +40,10 @@
       "file": "META-INF/jars/McBot-fabric-1.19.4-${version}.jar"
     },
     {
-      "file": "META-INF/jars/McBot-fabric-1.20.x-${version}.jar"
+      "file": "META-INF/jars/McBot-fabric-1.20-${version}.jar"
+    },
+    {
+      "file": "META-INF/jars/McBot-fabric-1.20.1-${version}.jar"
     }
   ]
 }