Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-22 16:29:26 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3b9db2b Updated Upstream (Bukkit/CraftBukkit) (#11501)
PaperMC/Paper@c13f9fd Fix potential annotation testing interruption (#11460)
PaperMC/Paper@260c3bb Always send Banner patterns to the client (#11506)
PaperMC/Paper@14a48cd Some small touchups to the GUI (#11505)
PaperMC/Paper@d348cb8 Restrict BlockProjectileSource#launchProjectile
This commit is contained in:
Dreeam
2024-10-22 09:19:04 -04:00
parent 5fffc5ef30
commit e893e3d762
11 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.21.1-R0.1-SNAPSHOT
mcVersion=1.21.1
paperRef=755a7753af6ad46756bd04b5b3bcfac46a3ec072
paperRef=d348cb88a9fe8d19e46102c8b9febe18f746d46b
org.gradle.caching=false
org.gradle.parallel=true

4
patches/server/0003-Hide-irrelevant-compilation-warnings.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/build.gradle.kts b/build.gradle.kts
index 22e840a7ec04b7ec5d3886dda023c05b6f0b55c7..6129fd5f7615ae0c9b98f86441ce76d9807bffb0 100644
index ee1b8fbab56ff0a85a4f2bd071a0de5111aa1d4f..381b4b5d2cc54497c7db46218acc58313552ad78 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -71,6 +71,15 @@ paperweight {
@@ -72,6 +72,15 @@ paperweight {
craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment
}

4
patches/server/0004-Enable-preview-features-for-development-runs.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/build.gradle.kts b/build.gradle.kts
index 6129fd5f7615ae0c9b98f86441ce76d9807bffb0..4175bee3238ba53d85cab942d31d38e90599330d 100644
index 381b4b5d2cc54497c7db46218acc58313552ad78..adb8c4f3ed3cb22b62a4b4eb867b197b10cfac54 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -185,6 +185,7 @@ fun TaskContainer.registerRunTask(
@@ -190,6 +190,7 @@ fun TaskContainer.registerRunTask(
val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
minHeapSize = "${memoryGb}G"
maxHeapSize = "${memoryGb}G"

10
patches/server/0005-Gale-branding-changes.patch
View File

@@ -221,10 +221,10 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 4aa427c7a6957f13d6a8823c90c1092aaa0ee2b4..99fa23c42005881459d6f74c98bf9dbdf233a9ef 100644
index adb8c4f3ed3cb22b62a4b4eb867b197b10cfac54..badd1433e27e2e95b165618de280cba1ff10a69d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -93,14 +93,14 @@ tasks.jar {
@@ -94,14 +94,14 @@ tasks.jar {
val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -244,7 +244,7 @@ index 4aa427c7a6957f13d6a8823c90c1092aaa0ee2b4..99fa23c42005881459d6f74c98bf9dbd
"Build-Number" to (build ?: ""),
"Build-Time" to Instant.now().toString(),
"Git-Branch" to gitBranch, // Paper
@@ -237,3 +237,22 @@ tasks.registerRunTask("runReobfPaperclip") {
@@ -242,3 +242,22 @@ tasks.registerRunTask("runReobfPaperclip") {
classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
mainClass.set(null as String?)
}
@@ -509,10 +509,10 @@ index 2f4d6b56301195f8d39ed50dffe842464065bfe1..bdfb969f88e68d89a5cad4b145bbc144
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 7d32c032b63b9c4674489b30c845fe2de8275808..138e062d18d85702f4af8ac896ec26b10951fa5d 100644
index d06aab9bd5cd901c8367f9680f5d27ddb17b3dc4..4d0de69b730599d7a89903dd862b89d51ba79e1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -483,7 +483,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -489,7 +489,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

10
patches/server/0008-Gale-configuration.patch
View File

@@ -289,7 +289,7 @@ index dd56c8e041116ef3602a9f89c998c8208ab89b51..86c615518e315dd4425d17df163e88a1
// Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
if (this.convertOldUsers()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..a74d64c33182cc1f2ea78b6ddb6b358ec2c8a91c 100644
index f9abf63e12ea930275121b470e4e4906cff0fc12..e20b7a1ad141834a10c5f23f9b27cc41fa25ac0d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -503,7 +503,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -302,7 +302,7 @@ index c96f3dcd365bc140b1f4680ef6bd770c80f8eda1..a74d64c33182cc1f2ea78b6ddb6b358e
this.convertable = convertable_conversionsession;
this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..90fc52bb3c8c48e055965f2f822c6199182f373b 100644
index 507671476c3d2d92a2fdb05be24443af27d26dcf..32cd737206dd9f2bcfdacfe17dc0621ee34b589a 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -12,7 +12,6 @@ import java.util.function.Supplier;
@@ -356,10 +356,10 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..90fc52bb3c8c48e055965f2f822c6199
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b7af2d4300facf41a025c8ca322bf6541949b3ab..49c1a96f35ac80b6de3f213d809d856bc21af5af 100644
index c7df339aeb62ee627edaf1bb4c8474b61e357ba6..b1c1e600100ac31ecb20473b8ad2853676dff84a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1070,6 +1070,7 @@ public final class CraftServer implements Server {
@@ -1072,6 +1072,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -367,7 +367,7 @@ index b7af2d4300facf41a025c8ca322bf6541949b3ab..49c1a96f35ac80b6de3f213d809d856b
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -2988,6 +2989,14 @@ public final class CraftServer implements Server {
@@ -2990,6 +2991,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
patches/server/0022-Print-stack-trace-for-plugins-not-shutting-down-task.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a01e30045b02526db835f2e763d987146eec4c35..eb1604ce8845c14eeb90641a074381b277ef918f 100644
index b1c1e600100ac31ecb20473b8ad2853676dff84a..84b8de571361f2087ac5106726c9e69377183089 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1164,6 +1164,13 @@ public final class CraftServer implements Server {
@@ -1166,6 +1166,13 @@ public final class CraftServer implements Server {
plugin.getPluginMeta().getDisplayName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));

6
patches/server/0033-SIMD-support.patch
View File

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/build.gradle.kts b/build.gradle.kts
index ea1787aee4907a2d708ebb1fe38362ab37a80a57..980cb87b8654f2c64cf2b3cecf5c195392631b66 100644
index badd1433e27e2e95b165618de280cba1ff10a69d..5ebc35cadc960d428e8a91642ddce0875078d790 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,6 +77,7 @@ tasks.withType<JavaCompile> {
@@ -78,6 +78,7 @@ tasks.withType<JavaCompile> {
compilerArgs.add("-Xlint:-module")
compilerArgs.add("-Xlint:-removal")
compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index ea1787aee4907a2d708ebb1fe38362ab37a80a57..980cb87b8654f2c64cf2b3cecf5c1953
}
// Gale end - hide irrelevant compilation warnings
@@ -186,6 +187,7 @@ fun TaskContainer.registerRunTask(
@@ -191,6 +192,7 @@ fun TaskContainer.registerRunTask(
minHeapSize = "${memoryGb}G"
maxHeapSize = "${memoryGb}G"
jvmArgs("--enable-preview") // Gale - enable preview features for development runs

8
patches/server/0105-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e68014ac3ccd3 100644
index 84b8de571361f2087ac5106726c9e69377183089..9261f0ff637213a385fd518524702e777a4bb692 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -41,6 +41,9 @@ import java.util.logging.Logger;
@@ -34,7 +34,7 @@ index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e6801
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1491,6 +1495,7 @@ public final class CraftServer implements Server {
@@ -1493,6 +1497,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e6801
this.worlds.remove(world.getName().toLowerCase(Locale.ROOT));
this.console.removeLevel(handle);
return true;
@@ -1509,12 +1514,7 @@ public final class CraftServer implements Server {
@@ -1511,12 +1516,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 9a02f184407389418b81c581b7a7bc01cf8c24f0..21bf160591b9fc26339ff639824e6801
}
// Paper start
@@ -1532,6 +1532,7 @@ public final class CraftServer implements Server {
@@ -1534,6 +1534,7 @@ public final class CraftServer implements Server {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}

4
patches/server/0107-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 21bf160591b9fc26339ff639824e68014ac3ccd3..34d1e6c69edfed04cef41a909e844f21efa0d07b 100644
index 9261f0ff637213a385fd518524702e777a4bb692..7f30dc8d7a256930a85415d26c4d651918150c13 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3040,6 +3040,24 @@ public final class CraftServer implements Server {
@@ -3042,6 +3042,24 @@ public final class CraftServer implements Server {
};
}

23
patches/server/0108-5-second-TPS-average.patch
View File

@@ -37,19 +37,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7c32c60100cf2bd109eb8762efa856c10b704fdd 100644
index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca793a61951b 100644
--- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
@@ -59,7 +59,7 @@ public class RAMDetails extends JList<String> {
GraphData data = RAMGraph.DATA.peekLast();
Vector<String> vector = new Vector<>();
@@ -61,6 +61,7 @@ public class RAMDetails extends JList<String> {
- double[] tps = org.bukkit.Bukkit.getTPS();
+ double[] tps = org.bukkit.Bukkit.getTPSIncluding5SecondAverage(); // Gale - Purpur - 5 second TPS average
String[] tpsAvg = new String[tps.length];
for ( int g = 0; g < tps.length; g++) {
@@ -68,7 +68,7 @@ public class RAMDetails extends JList<String> {
// Follows CraftServer#getTPS
double[] tps = new double[] {
+ server.tps5s.getAverage(), // Gale - Purpur - 5 second TPS average
server.tps1.getAverage(),
server.tps5.getAverage(),
server.tps15.getAverage()
@@ -73,7 +74,7 @@ public class RAMDetails extends JList<String> {
vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");
@@ -79,10 +78,10 @@ index 161904cc1d802d9b113f68c2eb46a1c7a7c1b425..c64874029dae951abf5d57b8dd7875d2
tps5.add(currentTps, diff);
tps15.add(currentTps, diff);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 34d1e6c69edfed04cef41a909e844f21efa0d07b..6bd5dc6de7f56cefb7f8cc7a72553bd8ac81d68f 100644
index 7f30dc8d7a256930a85415d26c4d651918150c13..c0e1ba2815867b0cf08a770de706c3a210c4ffad 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3040,8 +3040,27 @@ public final class CraftServer implements Server {
@@ -3042,8 +3042,27 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0110-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6bd5dc6de7f56cefb7f8cc7a72553bd8ac81d68f..5dbaaa949976051d7926fe24203777bd66f9189c 100644
index c0e1ba2815867b0cf08a770de706c3a210c4ffad..d2cc2d8ce298621c1e2f197ce260ab0174d0948f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3269,4 +3269,22 @@ public final class CraftServer implements Server {
@@ -3271,4 +3271,22 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end