diff --git a/patches/api/0001-Hide-irrelevant-compilation-warnings.patch b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch new file mode 100644 index 0000000..48e9628 --- /dev/null +++ b/patches/api/0001-Hide-irrelevant-compilation-warnings.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Tue, 29 Nov 2022 01:15:55 +0100 +Subject: [PATCH] Hide irrelevant compilation warnings + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +diff --git a/build.gradle.kts b/build.gradle.kts +index 9f5694204091e23c4771657127a06f98e27ad8f1..fdb495c0e0f1ce702a590e6a7bcdcf40fd418d1c 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -83,6 +83,15 @@ val generateApiVersioningFile by tasks.registering { + } + } + ++// Gale start - hide irrelevant compilation warnings ++tasks.withType { ++ val compilerArgs = options.compilerArgs ++ compilerArgs.add("-Xlint:-module") ++ compilerArgs.add("-Xlint:-removal") ++ compilerArgs.add("-Xlint:-dep-ann") ++} ++// Gale end - hide irrelevant compilation warnings ++ + tasks.jar { + from(generateApiVersioningFile.map { it.outputs.files.singleFile }) { + into("META-INF/maven/${project.group}/${project.name}") diff --git a/patches/api/0001-Gale-configuration.patch b/patches/api/0002-Gale-configuration.patch similarity index 90% rename from patches/api/0001-Gale-configuration.patch rename to patches/api/0002-Gale-configuration.patch index cfb5426..54ad5b3 100644 --- a/patches/api/0001-Gale-configuration.patch +++ b/patches/api/0002-Gale-configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale configuration diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e43fef0152468944d8a33036344a43e95fe58476..5d03be9b9ff305aa46f9e2443750387dbc2e1623 100644 +index e43fef0152468944d8a33036344a43e95fe58476..fc0f70f7af8e12347ea67d9985d06c8323b2a3c0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1967,6 +1967,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0002-SIMD-support.patch b/patches/api/0003-SIMD-support.patch similarity index 83% rename from patches/api/0002-SIMD-support.patch rename to patches/api/0003-SIMD-support.patch index 8f209ff..7976ff1 100644 --- a/patches/api/0002-SIMD-support.patch +++ b/patches/api/0003-SIMD-support.patch @@ -12,26 +12,20 @@ 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 9f5694204091e23c4771657127a06f98e27ad8f1..27aa04782d9c5aecdcbbe0314dd5be1a076b4f50 100644 +index fdb495c0e0f1ce702a590e6a7bcdcf40fd418d1c..2c3c8fbba6247a44b1782dbed45a00fdaa051473 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -83,6 +83,13 @@ val generateApiVersioningFile by tasks.registering { - } +@@ -89,6 +89,7 @@ tasks.withType { + compilerArgs.add("-Xlint:-module") + compilerArgs.add("-Xlint:-removal") + compilerArgs.add("-Xlint:-dep-ann") ++ compilerArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support } + // Gale end - hide irrelevant compilation warnings -+// Gale start - Pufferfish - SIMD support -+tasks.withType { -+ val compilerArgs = options.compilerArgs -+ compilerArgs.add("--add-modules=jdk.incubator.vector") -+} -+// Gale end - Pufferfish - SIMD support -+ - tasks.jar { - from(generateApiVersioningFile.map { it.outputs.files.singleFile }) { - into("META-INF/maven/${project.group}/${project.name}") diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java new file mode 100644 -index 0000000000000000000000000000000000000000..22f20b934c0481c27248a808535987176216f400 +index 0000000000000000000000000000000000000000..d51f9de6ac01f518ca9577827dc719daad78df4c --- /dev/null +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java @@ -0,0 +1,44 @@ @@ -81,7 +75,7 @@ index 0000000000000000000000000000000000000000..22f20b934c0481c27248a80853598717 +} diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java new file mode 100644 -index 0000000000000000000000000000000000000000..5eca1f3099401bebab322953771a232e532bee11 +index 0000000000000000000000000000000000000000..ad304cfa228060adc12902da4604ccef31f27445 --- /dev/null +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java @@ -0,0 +1,37 @@ diff --git a/patches/api/0003-Vectorized-map-color-conversion.patch b/patches/api/0004-Vectorized-map-color-conversion.patch similarity index 97% rename from patches/api/0003-Vectorized-map-color-conversion.patch rename to patches/api/0004-Vectorized-map-color-conversion.patch index 012109d..a2aaa7a 100644 --- a/patches/api/0003-Vectorized-map-color-conversion.patch +++ b/patches/api/0004-Vectorized-map-color-conversion.patch @@ -18,7 +18,7 @@ classes and methods added by this patch should NOT be used in plugins. diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java new file mode 100644 -index 0000000000000000000000000000000000000000..ed7671eae309a0c72957bd8c9dc8a0de480e2bf6 +index 0000000000000000000000000000000000000000..88b98e6bd23a2ab4aeb9e09977ff1d1bd959ad66 --- /dev/null +++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java @@ -0,0 +1,86 @@ @@ -109,7 +109,7 @@ index 0000000000000000000000000000000000000000..ed7671eae309a0c72957bd8c9dc8a0de + +} diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java -index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..b21c4b9c379951f749b5b1db81f94d2c504d31d2 100644 +index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..f2061156b9a0ce79d10935b443d641bb8b3a837a 100644 --- a/src/main/java/org/bukkit/map/MapPalette.java +++ b/src/main/java/org/bukkit/map/MapPalette.java @@ -5,6 +5,8 @@ import java.awt.Color; diff --git a/patches/api/0004-Last-tick-time-API.patch b/patches/api/0005-Last-tick-time-API.patch similarity index 100% rename from patches/api/0004-Last-tick-time-API.patch rename to patches/api/0005-Last-tick-time-API.patch diff --git a/patches/server/0002-Hide-irrelevant-compilation-warnings.patch b/patches/server/0002-Hide-irrelevant-compilation-warnings.patch new file mode 100644 index 0000000..767316e --- /dev/null +++ b/patches/server/0002-Hide-irrelevant-compilation-warnings.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Tue, 29 Nov 2022 01:17:03 +0100 +Subject: [PATCH] Hide irrelevant compilation warnings + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +diff --git a/build.gradle.kts b/build.gradle.kts +index 3103e811e1f41b782a5b95537b921c59cac2054f..c2f60f3f638d8a94046d20ff1dfca316a3395861 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -56,6 +56,16 @@ dependencies { + } + + val craftbukkitPackageVersion = "1_19_R1" // Paper ++ ++// Gale start - hide irrelevant compilation warnings ++tasks.withType { ++ val compilerArgs = options.compilerArgs ++ compilerArgs.add("-Xlint:-module") ++ compilerArgs.add("-Xlint:-removal") ++ compilerArgs.add("-Xlint:-dep-ann") ++} ++// Gale end - hide irrelevant compilation warnings ++ + tasks.jar { + archiveClassifier.set("dev") + diff --git a/patches/server/0002-Gale-branding-changes.patch b/patches/server/0003-Gale-branding-changes.patch similarity index 96% rename from patches/server/0002-Gale-branding-changes.patch rename to patches/server/0003-Gale-branding-changes.patch index f192cea..2d6e372 100644 --- a/patches/server/0002-Gale-branding-changes.patch +++ b/patches/server/0003-Gale-branding-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale branding changes diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 7b1843e16745ca8db2244e17490d291401f22679..20fa3302f9b3153e24033feb2d05f0b22b0efeb3 100644 +index 7b1843e16745ca8db2244e17490d291401f22679..9c883616224f368beac5bedb68f8ec9cf6dfbfb9 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { @@ -18,7 +18,7 @@ index 7b1843e16745ca8db2244e17490d291401f22679..20fa3302f9b3153e24033feb2d05f0b2 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index bf42969859545a8a520923ef1836ffa4a5cc24a0..91e97c57c3202f84986ec4d9cb1a374fd5256eac 100644 +index bf42969859545a8a520923ef1836ffa4a5cc24a0..f6183c39b3e6895953047ee1e2d967b3ab43eb4a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -1,85 +1,40 @@ @@ -175,7 +175,7 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..91e97c57c3202f84986ec4d9cb1a374f - } } diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..dc5557fb3682934fee31ac2b7d6a3f244049e62d 100644 +index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b92126aa17ca 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -188,7 +188,7 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..dc5557fb3682934fee31ac2b7d6a3f24 .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..5bfeb649336f023d05392c07d040299c605133c8 100644 +index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..18df8eab2e33a7cde7d12f111d3dbfcaeab3abd5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -921,7 +921,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { + compilerArgs.add("-Xlint:-module") + compilerArgs.add("-Xlint:-removal") + compilerArgs.add("-Xlint:-dep-ann") ++ compilerArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support } - --val craftbukkitPackageVersion = "1_19_R1" // Paper -+val craftbukkitPackageVersion = "1_19_R1" // Paper// Pufferfish Start -+ -+// Gale start - Pufferfish - SIMD support -+tasks.withType { -+ val compilerArgs = options.compilerArgs -+ compilerArgs.add("--add-modules=jdk.incubator.vector") -+} -+// Gale end - Pufferfish - SIMD support - tasks.jar { - archiveClassifier.set("dev") + // Gale end - hide irrelevant compilation warnings diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index d2b14c65e6a925ba4a29d48bcedc0d9504092052..007fe6820e208c04e81acbd7bb7eaf0a22f6f64f 100644 diff --git a/patches/server/0037-Optimize-entity-coordinate-key.patch b/patches/server/0038-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0037-Optimize-entity-coordinate-key.patch rename to patches/server/0038-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0038-Reduce-in-wall-checks.patch b/patches/server/0039-Reduce-in-wall-checks.patch similarity index 97% rename from patches/server/0038-Reduce-in-wall-checks.patch rename to patches/server/0039-Reduce-in-wall-checks.patch index b772893..b1225fe 100644 --- a/patches/server/0038-Reduce-in-wall-checks.patch +++ b/patches/server/0039-Reduce-in-wall-checks.patch @@ -59,7 +59,7 @@ index e1614462ba2f186db2b9febcc86afc270754199c..d8ee1536244ab780bc0c5d4e1a72dad4 public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index a80748f108c4973e1a3df7e0ff0e11160c91adb9..e6df3b765627d5aa800b1b697d1cfa96a676fe8e 100644 +index b993c2276d14c0a384898e9705a1af6fa6d585cf..d34ee90eaf160a72d4898feed13d94b0b61eded3 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -101,6 +101,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0039-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0040-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0039-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0040-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0040-Reduce-hopper-item-checks.patch b/patches/server/0041-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0040-Reduce-hopper-item-checks.patch rename to patches/server/0041-Reduce-hopper-item-checks.patch diff --git a/patches/server/0041-Reduce-villager-item-re-pickup.patch b/patches/server/0042-Reduce-villager-item-re-pickup.patch similarity index 97% rename from patches/server/0041-Reduce-villager-item-re-pickup.patch rename to patches/server/0042-Reduce-villager-item-re-pickup.patch index ef0143d..ab0241a 100644 --- a/patches/server/0041-Reduce-villager-item-re-pickup.patch +++ b/patches/server/0042-Reduce-villager-item-re-pickup.patch @@ -39,7 +39,7 @@ index 098253e92bd95159de93fbbdf95daee341fc5752..edac2bbc9c1f7a7e2bdde012eb15e454 org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity()); entityitem.level.getCraftServer().getPluginManager().callEvent(event); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index d054da6cc24fb0f4636ed6a017ecf8e151fa1731..3b8f9fe3064c4700c0c381bbd47aac07948e64cf 100644 +index 729600e22e1fee8ae33e51ed2da66a489cec2659..9ac9873c4ffcbc88daf5ca3947cd60177cb0fe5d 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -222,6 +222,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0042-Do-not-log-invalid-statistics.patch b/patches/server/0043-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0042-Do-not-log-invalid-statistics.patch rename to patches/server/0043-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0043-Do-not-log-empty-message-warnings.patch b/patches/server/0044-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0043-Do-not-log-empty-message-warnings.patch rename to patches/server/0044-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0044-Do-not-log-ignored-advancements.patch b/patches/server/0045-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0044-Do-not-log-ignored-advancements.patch rename to patches/server/0045-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0045-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0046-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0045-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0046-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0046-Do-not-log-unrecognized-recipes.patch b/patches/server/0047-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0046-Do-not-log-unrecognized-recipes.patch rename to patches/server/0047-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0047-Do-not-log-legacy-Material-initialization.patch b/patches/server/0048-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0047-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0048-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0048-Do-not-log-expired-message-warnings.patch b/patches/server/0049-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0048-Do-not-log-expired-message-warnings.patch rename to patches/server/0049-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0049-Do-not-log-Not-Secure-marker.patch b/patches/server/0050-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0049-Do-not-log-Not-Secure-marker.patch rename to patches/server/0050-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0050-Softly-log-invalid-pool-element-errors.patch b/patches/server/0051-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0050-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0051-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0051-Reduce-array-allocations.patch b/patches/server/0052-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0051-Reduce-array-allocations.patch rename to patches/server/0052-Reduce-array-allocations.patch diff --git a/patches/server/0052-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0053-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0052-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0053-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0053-Measure-last-tick-time.patch b/patches/server/0054-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0053-Measure-last-tick-time.patch rename to patches/server/0054-Measure-last-tick-time.patch diff --git a/patches/server/0054-Last-tick-time-API.patch b/patches/server/0055-Last-tick-time-API.patch similarity index 100% rename from patches/server/0054-Last-tick-time-API.patch rename to patches/server/0055-Last-tick-time-API.patch diff --git a/patches/server/0055-Show-last-tick-time-in-tps-command.patch b/patches/server/0056-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0055-Show-last-tick-time-in-tps-command.patch rename to patches/server/0056-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0056-Variable-main-thread-task-delay.patch b/patches/server/0057-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0056-Variable-main-thread-task-delay.patch rename to patches/server/0057-Variable-main-thread-task-delay.patch diff --git a/patches/server/0057-Collision-physics-check-before-vehicle-check.patch b/patches/server/0058-Collision-physics-check-before-vehicle-check.patch similarity index 100% rename from patches/server/0057-Collision-physics-check-before-vehicle-check.patch rename to patches/server/0058-Collision-physics-check-before-vehicle-check.patch diff --git a/patches/server/0058-Reduce-RandomSource-instances.patch b/patches/server/0059-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0058-Reduce-RandomSource-instances.patch rename to patches/server/0059-Reduce-RandomSource-instances.patch