From ff8529e7847f3d087bf8768c5f46bdf15327fd3f Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 6 Apr 2024 23:05:48 -0400 Subject: [PATCH] Updated Upstream (Gale) --- build.gradle.kts | 4 ++-- gradle.properties | 2 +- patches/server/0002-Leaf-Config.patch | 6 +++--- patches/server/0010-Purpur-Server-Changes.patch | 10 +++++----- patches/server/0014-Bump-Dependencies.patch | 4 ++-- ...KeYi-Disable-arrow-despawn-counter-by-default.patch | 4 ++-- patches/server/0044-Reduce-canSee-work.patch | 4 ++-- patches/server/0045-Faster-Natural-Spawning.patch | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 69e1429b..01a42841 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false // paperweight required this original shadow id("io.github.goooler.shadow") version "8.1.7" apply false - id("io.papermc.paperweight.patcher") version "1.5.13-SNAPSHOT" + id("io.papermc.paperweight.patcher") version "1.5.14-SNAPSHOT" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" @@ -17,7 +17,7 @@ repositories { dependencies { remapper("net.fabricmc:tiny-remapper:0.10.1:fat") - decompiler("org.vineflower:vineflower:1.9.3") + decompiler("org.vineflower:vineflower:1.10.0") paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT") } diff --git a/gradle.properties b/gradle.properties index 8607bd5e..0f862338 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.dreeam.leaf version = 1.20.4-R0.1-SNAPSHOT -galeCommit = 78417924c64afa29cc5dccddda3e42fe463a9308 +galeCommit = 634079471c530a62f3280dfeddc00f8f1d25532e org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0002-Leaf-Config.patch b/patches/server/0002-Leaf-Config.patch index 10fb1f21..b0626be3 100644 --- a/patches/server/0002-Leaf-Config.patch +++ b/patches/server/0002-Leaf-Config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaf Config diff --git a/build.gradle.kts b/build.gradle.kts -index 960fe37a4cf0100b552401f835900c6d8b6af523..722e9b39f03b1f41dcf9cd791324e5b6be6d45e8 100644 +index 91a7a0b81bf2b800847b27de890855c312aecfcb..a3e03a735131513324babe930dbf642acbcb5365 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,9 @@ dependencies { @@ -19,10 +19,10 @@ index 960fe37a4cf0100b552401f835900c6d8b6af523..722e9b39f03b1f41dcf9cd791324e5b6 implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 96cb26fae947006ae7bceb3187ed2c28c4214f16..0e2fedea28734dfb9b748c59c54925e5ebef797f 100644 +index 465a7787f15c934b2cef1a58e4b18f1ae9b4cae7..0b090797eb873b703730559049937163f2db8ecb 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -132,6 +132,7 @@ public class Main { +@@ -121,6 +121,7 @@ public class Main { Bootstrap.bootStrap(); Bootstrap.validate(); Util.startTimerHackThread(); diff --git a/patches/server/0010-Purpur-Server-Changes.patch b/patches/server/0010-Purpur-Server-Changes.patch index 34d00ed7..d930156f 100644 --- a/patches/server/0010-Purpur-Server-Changes.patch +++ b/patches/server/0010-Purpur-Server-Changes.patch @@ -30,7 +30,7 @@ MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch Fire-Immunity-API.patch diff --git a/build.gradle.kts b/build.gradle.kts -index 6fbaa00e7bf665bab2c54e7b4c3e68a5cf14533d..54372661e263807e717e5cfdc395311486bbeaa5 100644 +index a2d13cbc7bdb6edaacb9cdeadc23ea69de20d571..140638a117d9306bd08ed4fbcc4ea123adac4901 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,6 +66,12 @@ dependencies { @@ -46,7 +46,7 @@ index 6fbaa00e7bf665bab2c54e7b4c3e68a5cf14533d..54372661e263807e717e5cfdc3953114 testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") testImplementation("org.hamcrest:hamcrest:2.2") -@@ -182,7 +188,7 @@ fun TaskContainer.registerRunTask( +@@ -177,7 +183,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -730,10 +730,10 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time; diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 0e2fedea28734dfb9b748c59c54925e5ebef797f..33d145e1a8841f088e10332d2898931d8191b83b 100644 +index 0b090797eb873b703730559049937163f2db8ecb..081bdffb914acb275f47dc47ce54eb84d69f912d 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -143,6 +143,10 @@ public class Main { +@@ -132,6 +132,10 @@ public class Main { org.bukkit.configuration.file.YamlConfiguration bukkitConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("bukkit-settings")); org.bukkit.configuration.file.YamlConfiguration spigotConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("spigot-settings")); // Paper end - load config files early for access below if needed @@ -17649,7 +17649,7 @@ index c9d276124bd14aafcd1a29991081b7668fe636b6..593119cefb6664f2b0b03b684103440b public Collection getStructures(int x, int z) { return this.getStructures(x, z, struct -> true); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c35903f48e8201f5f37a2801345a2bc67b6d3d8a..419618b06f2e8b03bea0ee772b4f96cde543a1c6 100644 +index 8d3959614ce42c996d93ffe00e7900d60c9b8184..bac135289e34c69ff0d02ff23b8a95d72505e1bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -195,6 +195,14 @@ public class Main { diff --git a/patches/server/0014-Bump-Dependencies.patch b/patches/server/0014-Bump-Dependencies.patch index a762d585..6fb4e3ac 100644 --- a/patches/server/0014-Bump-Dependencies.patch +++ b/patches/server/0014-Bump-Dependencies.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies diff --git a/build.gradle.kts b/build.gradle.kts -index 54372661e263807e717e5cfdc395311486bbeaa5..dfba321b718e2c7362ac317f29a2428ad7396f6b 100644 +index 140638a117d9306bd08ed4fbcc4ea123adac4901..2e02cf5a4706721f0d00da7f7fa189e671acc769 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,9 +32,9 @@ dependencies { @@ -78,7 +78,7 @@ index 54372661e263807e717e5cfdc395311486bbeaa5..dfba321b718e2c7362ac317f29a2428a } val craftbukkitPackageVersion = "1_20_R3" // Paper -@@ -269,3 +275,7 @@ sourceSets { +@@ -258,3 +264,7 @@ sourceSets { } } // Gale end - package license into jar diff --git a/patches/server/0020-KeYi-Disable-arrow-despawn-counter-by-default.patch b/patches/server/0020-KeYi-Disable-arrow-despawn-counter-by-default.patch index e0943391..ebdab276 100644 --- a/patches/server/0020-KeYi-Disable-arrow-despawn-counter-by-default.patch +++ b/patches/server/0020-KeYi-Disable-arrow-despawn-counter-by-default.patch @@ -7,10 +7,10 @@ Original license: MIT Original project: https://github.com/KeYiMC/KeYi diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f4e4da45b069bdea577027e23eb0dcb9e1a45987..5c047e57628626d4bccf98cfa34676b7b6657cd5 100644 +index 2b8f53fc53dc69aa9afd516ef4a81ecf7b43e62c..356ec77bf63da9a218036c92bde9bf5fa006c1ac 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -139,7 +139,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -138,7 +138,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean loadPortalDestinationChunkBeforeEntityTeleport = false; // Gale - MultiPaper - load portal destination chunk before entity teleport } diff --git a/patches/server/0044-Reduce-canSee-work.patch b/patches/server/0044-Reduce-canSee-work.patch index 7832a46f..c9b949a1 100644 --- a/patches/server/0044-Reduce-canSee-work.patch +++ b/patches/server/0044-Reduce-canSee-work.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Reduce canSee work Credit by: Martijn Muijsers , MachineBreaker diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index ff05efe0b78defe3d25905b6a2984bdb646fcff3..4c40245756cfbe4ba14069c58d615cea7e2fbf38 100644 +index 7ce1f694d84f395406b1e06217f549f5f3e6e294..5f1043e84ba315b420c0bf60dfd3c2248bd03cc3 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -392,17 +392,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -394,17 +394,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable { for (int i = 0, len = entities.size(); i < len; ++i) { Entity entity = entities.get(i); diff --git a/patches/server/0045-Faster-Natural-Spawning.patch b/patches/server/0045-Faster-Natural-Spawning.patch index d3f47ab1..c00bc475 100644 --- a/patches/server/0045-Faster-Natural-Spawning.patch +++ b/patches/server/0045-Faster-Natural-Spawning.patch @@ -22,10 +22,10 @@ index ff1ad1024419182f7f3de578442c1c033d4c9ebb..5e51a1c79811291a740ad4d5e79a7d67 @Deprecated static RandomSource createThreadSafe() { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4c40245756cfbe4ba14069c58d615cea7e2fbf38..720cea58d673a08a161415a2301c0e472eb8792e 100644 +index 5f1043e84ba315b420c0bf60dfd3c2248bd03cc3..309b5a053d1115c149d2a72fdb71747dea8fc936 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -126,6 +126,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -128,6 +128,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { protected float oThunderLevel; public float thunderLevel; public final RandomSource random = RandomSource.create();