Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-03 22:26:19 +00:00
Code Issues Releases Activity

Updated Upstream (Gale)

Browse Source
This commit is contained in:
Dreeam
2023-08-11 04:57:53 +08:00
parent b180368a3e
commit 0bdf061725
8 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0001-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 6827ccd77dbba737b80bd14456c54fc54f8058f2..43a72d2fb4b6e73fa258c414eaada65ac366d1e3 100644
index 5b0693899daede245b43e9e9039cd1d05b9b5849..9bc4698a3d38ff3b6ae0d37a286ffc053f2d863f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ val alsoShade: Configuration by configurations.creating
@@ -17,7 +17,7 @@ index 6827ccd77dbba737b80bd14456c54fc54f8058f2..43a72d2fb4b6e73fa258c414eaada65a
// Depend on Paper MojangAPI
implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
@@ -88,7 +88,7 @@ tasks.jar {
@@ -89,7 +89,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -53,7 +53,7 @@ index 77dd3605bede2f8d2574961a21560df4631f6277..6246949f1f0eea1b8177ebae61cab11d
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 58642c412f5ca3bcd462017ff83f8ba8397d57a0..03455a6cf97b8bec5c84978fdae2c5cc5d27c7ff 100644
index 094b79e57fe687d5c410477680e822b1cceba0be..a907bfa9347a333282ceb708d720e5b9090a31e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper

15
patches/server/0002-Leaf-Config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaf Config
diff --git a/build.gradle.kts b/build.gradle.kts
index 43a72d2fb4b6e73fa258c414eaada65ac366d1e3..add4506180ce44167584e228142bfc0b0f8d6155 100644
index 9bc4698a3d38ff3b6ae0d37a286ffc053f2d863f..d297578fe5990eb7ff55d995ec30525bf8776a52 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -58,6 +58,13 @@ dependencies {
@@ -38,18 +38,17 @@ index f749516e5d3c22e808638f3a7672aab837571b1a..61fc65624f7d9a3bfa399a58112efb7f
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5390cdf13c462e478c9e61115c0bb3401e0eacfe..4ee7ce28263ed1cca7ee98c81404d62ae1128aeb 100644
index fcf8fe61e1c1cff550f86b83fca095a5513aa093..64bc644029dc9fa3cb802b58ecd8f197c3c4ad5b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -223,6 +223,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
@@ -232,6 +232,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
SIMDDetection.initialize();
} catch (Throwable ignored) {}
// Gale start - Pufferfish - SIMD support
+ org.dreeam.leaf.LeafConfig.load(); // Leaf
+
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..d924db6378b2c60c7b96cf5c45a6d50a091f9790

4
patches/server/0005-Pufferfish-Optimize-mob-spawning.patch
View File

@@ -32,10 +32,10 @@ index 6246949f1f0eea1b8177ebae61cab11d66f642df..3f8f0c991f563a1f4622f4da3e31dc4d
AtomicReference<S> atomicreference = new AtomicReference();
Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 4ee7ce28263ed1cca7ee98c81404d62ae1128aeb..c332d533dfec69cbb9f41b4b235b1b1b0751f99d 100644
index 64bc644029dc9fa3cb802b58ecd8f197c3c4ad5b..06838ae0d1eb0f0976a6290d35a30297c156d6fc 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -342,6 +342,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -351,6 +351,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled");
}

4
patches/server/0009-Purpur-Base.patch
View File

@@ -9,7 +9,7 @@ Original license: MIT
Original project: https://github.com/PurpurMC/Purpur
diff --git a/build.gradle.kts b/build.gradle.kts
index add4506180ce44167584e228142bfc0b0f8d6155..7adfdc672b6a300d67efc5d8825951aab95c693e 100644
index d297578fe5990eb7ff55d995ec30525bf8776a52..1d6f67588aaf8ec22190f344bb9c7dea84b7e9e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -54,6 +54,10 @@ dependencies {
@@ -23,7 +23,7 @@ index add4506180ce44167584e228142bfc0b0f8d6155..7adfdc672b6a300d67efc5d8825951aa
runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
@@ -181,7 +185,7 @@ fun TaskContainer.registerRunTask(
@@ -182,7 +186,7 @@ fun TaskContainer.registerRunTask(
}
}
// Gale end - use default Java installation for development runs

12
patches/server/0010-Purpur-Server-Changes.patch
View File

@@ -766,10 +766,10 @@ index d601d287e94a59ff93b8a83a44dac02544d211df..0ff3b06a98b2f4514b2d861b92dd70fe
itemstack1.setCount(1);
entityitem = entityplayer.drop(itemstack1, false, false, false); // SPIGOT-2942: Add boolean to call event
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3fabf2cae 100644
index 06838ae0d1eb0f0976a6290d35a30297c156d6fc..bd3d04a25c09dcd039d43ec8595362007dc77012 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -95,6 +95,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -98,6 +98,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
return;
}
// Paper start - Use TerminalConsoleAppender
@@ -777,7 +777,7 @@ index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3
new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
/*
jline.console.ConsoleReader bufferedreader = reader;
@@ -219,6 +220,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -222,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.command.PaperCommands.registerCommands(this);
GaleCommands.registerCommands(this); // Gale - Gale commands - register commands
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
@@ -793,7 +793,7 @@ index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
@@ -270,6 +280,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -279,6 +289,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
return false;
}
@@ -824,7 +824,7 @@ index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3
// CraftBukkit start
// this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
@@ -343,6 +377,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -352,6 +386,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
if (org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@@ -17520,7 +17520,7 @@ index c6129dc565b8f874b73e2fefcabd4be1c221fd73..07050f97621c0cb68b48bf39fb9c9067
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 03455a6cf97b8bec5c84978fdae2c5cc5d27c7ff..cc34d64ae522f69d1d4cbd0be75c50e12e9371f1 100644
index a907bfa9347a333282ceb708d720e5b9090a31e0..89bf7a3723b1dc9351beaf59777cc9ce0c42a441 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -401,6 +401,20 @@ public final class CraftServer implements Server {

4
patches/server/0012-Bump-Dependencies.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index 7adfdc672b6a300d67efc5d8825951aab95c693e..8cdacc649a1ae35b147126c0c3ad633784d50aa5 100644
index 1d6f67588aaf8ec22190f344bb9c7dea84b7e9e7..cff8440b5cf27d431e1e20d4bf04d5cc973ab6ab 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
@@ -88,7 +88,7 @@ index 7adfdc672b6a300d67efc5d8825951aab95c693e..8cdacc649a1ae35b147126c0c3ad6337
}
val craftbukkitPackageVersion = "1_20_R1" // Paper
@@ -242,3 +248,6 @@ tasks.registerRunTask("runDev") {
@@ -244,3 +250,6 @@ tasks.registerRunTask("runDev") {
description = "Spin up a non-relocated Mojang-mapped test server"
classpath(sourceSets.main.map { it.runtimeClasspath })
}