Merge branch 'Winds-Studio:ver/1.20.6' into ver/1.20.6

Winds-Studio · May 4, 2024 · a528d83 · a528d83
2 parents e3b8cd3 + 31da3c4
commit a528d83
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,12 +11,13 @@ repositories {
     maven(paperMavenPublicUrl) {
         content { onlyForConfigurations(configurations.paperclip.name) }
     }
+    maven("https://maven.nostal.ink/repository/maven-snapshots/")
 }
 
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
-    paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
+    paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT")
 }
 
 subprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.6-R0.1-SNAPSHOT
 
-galeCommit = 454a795cab19c2690483401c2b461a7bb2bd0cbc
+galeCommit = 6582b9b215859997f52debf81c75dfb7aec3e2ac
 
 org.gradle.caching = true
 org.gradle.parallel = true

diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
@@ -140,15 +140,15 @@ index 0b5979723bb30f9011ac64c36d894aa41713ec9b..17e3ee3a73a2347e9f0baa0ed1640a3b
 
          if (stream != null) {
 diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
-index 3d674eca7d20202d8f811c5c3e3946a12046028a..291f0d7f952f12a6bcdaf6ae5aedaf13d907a7bb 100644
+index 3d674eca7d20202d8f811c5c3e3946a12046028a..1c087ae6daaa0cdf23f3930eca0af390469eab3d 100644
 --- a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
 +++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
 @@ -5,7 +5,7 @@ package org.galemc.gale.version;
  public class GaleVersionFetcher extends AbstractPaperVersionFetcher {
 
      public GaleVersionFetcher() {
 -        super("ver/1.20.2", "https://github.com/GaleMC/Gale", "Gale", "GaleMC", "GaleMC", "Gale");
-+        super("ver/1.20.5", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf
++        super("ver/1.20.6", "https://github.com/Winds-Studio/Leaf", "Leaf", "Winds-Studio", "Winds-Studio", "Leaf"); // Leaf
      }
 
  }

diff --git a/patches/server/0067-Ignore-terminal-provider-warning.patch b/patches/server/0067-Ignore-terminal-provider-warning.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <[email protected]>
+Date: Thu, 2 May 2024 20:21:29 -0400
+Subject: [PATCH] Ignore terminal provider warning
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 05b4d0ae35f203a62079cf19285d09d9d355a033..b6c68c250826698c058b95642850ec42645de2f7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -353,6 +353,9 @@ public class Main {
+                 // Paper end - Log Java and OS versioning to help with debugging plugin issues
+
+                 printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
++
++                System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
++
+                 net.minecraft.server.Main.main(options);
+             } catch (Throwable t) {
+                 t.printStackTrace();
diff --git a/patches/server/0068-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0068-Fix-console-freeze-above-JAVA-22.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <[email protected]>
+Date: Sat, 4 May 2024 02:46:17 -0400
+Subject: [PATCH] Fix console freeze above JAVA 22
+
+Revert to old console provider, Fix https://github.com/PaperMC/Paper/issues/10405
+Solution refers to https://inside.java/2023/07/31/quality-heads-up
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index b6c68c250826698c058b95642850ec42645de2f7..b4599dae7bc59e67eee22a7b70d148d4f63669b5 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -355,6 +355,7 @@ public class Main {
+                 printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
+
+                 System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
++                if (org.galemc.gale.virtualthread.VirtualThreadService.getJavaMajorVersion() >= 22) System.setProperty("jdk.console", "java.base"); // Leaf - Fix console freeze above JAVA 22
+
+                 net.minecraft.server.Main.main(options);
+             } catch (Throwable t) {