diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4692373..cde60a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,13 +7,13 @@ jobs: if: ${{ (github.event_name != 'pull_request' && !contains(github.event.commits[0].message, '[ci-skip]')) || github.repository != github.event.pull_request.head.repo.full_name }} steps: - name: Checkout Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -26,7 +26,7 @@ jobs: - name: Create Paperclip jar run: ./gradlew createReobfPaperclipJar - name: Upload Paperclip jar - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Gale path: build/libs/gale-paperclip-*-reobf.jar diff --git a/build.gradle.kts b/build.gradle.kts index 7116994..3635a43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.patcher") version "1.5.11" + id("io.papermc.paperweight.patcher") version "1.5.13" } allprojects { diff --git a/gradle.properties b/gradle.properties index 673cc44..fef8ad6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=710dced8b70c995656a24479f9453676cf6164fc +paperRef=a2035440cfe3ec829513a74b1309859fc15be972 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/patches/server/0004-Enable-preview-features-for-development-runs.patch b/patches/server/0004-Enable-preview-features-for-development-runs.patch index 8ccd50e..18e9345 100644 --- a/patches/server/0004-Enable-preview-features-for-development-runs.patch +++ b/patches/server/0004-Enable-preview-features-for-development-runs.patch @@ -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 4d5c2cbb26c97ac11d4908a1d734c421a06b1ba8..a5f1f49ed6b92e68e52b8e08b32bd0b4893a6a3c 100644 +index e1fbcd105b8af0744c9524e8ea8440104f5dc6dc..32839f9f0dc6009cf3346724a2ddbf74f56ac94c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -195,6 +195,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" diff --git a/patches/server/0005-Gale-branding-changes.patch b/patches/server/0005-Gale-branding-changes.patch index 5c59de2..ff92f35 100644 --- a/patches/server/0005-Gale-branding-changes.patch +++ b/patches/server/0005-Gale-branding-changes.patch @@ -221,7 +221,7 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898 -. +. diff --git a/build.gradle.kts b/build.gradle.kts -index a5f1f49ed6b92e68e52b8e08b32bd0b4893a6a3c..b0dc9ee8808e0eb84969d0f59f83f3d2ab49d083 100644 +index 32839f9f0dc6009cf3346724a2ddbf74f56ac94c..8b5e71d2847db5e737f5380f41cc4696a038c397 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -87,7 +87,7 @@ tasks.jar { @@ -233,9 +233,9 @@ index a5f1f49ed6b92e68e52b8e08b32bd0b4893a6a3c..b0dc9ee8808e0eb84969d0f59f83f3d2 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -232,3 +232,22 @@ tasks.registerRunTask("runDev") { - classpath(runtimeClasspathForRunDev) - jvmArgs("-DPaper.isRunDev=true") +@@ -221,3 +221,22 @@ tasks.registerRunTask("runDev") { + classpath(sourceSets.main.map { it.runtimeClasspath }) + jvmArgs("-DPaper.pushPaperAssetsRoot=true") } + +// Gale start - package license into jar diff --git a/patches/server/0043-SIMD-support.patch b/patches/server/0043-SIMD-support.patch index 242fa36..2e0336a 100644 --- a/patches/server/0043-SIMD-support.patch +++ b/patches/server/0043-SIMD-support.patch @@ -13,7 +13,7 @@ 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 b0dc9ee8808e0eb84969d0f59f83f3d2ab49d083..c9784da0a87d61e80a41fb0358614053682e942b 100644 +index 8b5e71d2847db5e737f5380f41cc4696a038c397..8ad208f318b8350dda538976ff17cf4a4b009003 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,6 +72,7 @@ tasks.withType { @@ -24,7 +24,7 @@ index b0dc9ee8808e0eb84969d0f59f83f3d2ab49d083..c9784da0a87d61e80a41fb0358614053 } // Gale end - hide irrelevant compilation warnings -@@ -196,6 +197,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 diff --git a/patches/server/0070-Fix-MC-238526.patch b/patches/server/0069-Fix-MC-238526.patch similarity index 86% rename from patches/server/0070-Fix-MC-238526.patch rename to patches/server/0069-Fix-MC-238526.patch index bf81f95..1446ed5 100644 --- a/patches/server/0070-Fix-MC-238526.patch +++ b/patches/server/0069-Fix-MC-238526.patch @@ -49,18 +49,23 @@ index 9b897cf53f4bb5d366e6ac88dbed93c59d8fe541..53e3a40246da0a4d30ad8a7286d1a43d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 867849daa3a3eacaa90caad079234f8aa38d8dcf..1f99a324527d5329a21e795d3b6d95b535f415ef 100644 +index f8a561d91686d6df89a7374ca223972e435978c9..14f4a9fe5e8c185d1d8e6201bff24aabee43a634 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -100,6 +100,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable +@@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public GameplayMechanics gameplayMechanics; + public class GameplayMechanics extends ConfigurationPart { ++ public Fixes fixes; ++ public class Fixes extends ConfigurationPart { ++ + // Gale start - Purpur - fix MC-238526 + @Setting("mc-238526") + public boolean mc238526 = false; + // Gale end - Purpur - fix MC-238526 + - } - ++ } ++ public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration + public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable + diff --git a/patches/server/0069-Make-tripwire-duping-fix-configurable.patch b/patches/server/0069-Make-tripwire-duping-fix-configurable.patch deleted file mode 100644 index b1cc0c4..0000000 --- a/patches/server/0069-Make-tripwire-duping-fix-configurable.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> -Date: Sun, 6 Nov 2022 04:32:27 -0500 -Subject: [PATCH] Make tripwire duping fix configurable - -License: MIT (https://opensource.org/licenses/MIT) -Leaf - https://github.com/Winds-Studio/Leaf - -diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..d0da50473a53ffe37ac4a0e0f3e3d328ce1b6a4c 100644 ---- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -@@ -201,7 +201,7 @@ public class TripWireHookBlock extends Block { - BlockState iblockdata4 = aiblockdata[l]; - - if (iblockdata4 != null) { -- if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended -+ if (!world.galeConfig().gameplayMechanics.fixes.tripwireDuping || world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended // Gale - Leaf - make tripwire duping fix configurable - world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3); - } - } -diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f8a561d91686d6df89a7374ca223972e435978c9..867849daa3a3eacaa90caad079234f8aa38d8dcf 100644 ---- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -96,6 +96,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public GameplayMechanics gameplayMechanics; - public class GameplayMechanics extends ConfigurationPart { - -+ public Fixes fixes; -+ public class Fixes extends ConfigurationPart { -+ public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable -+ -+ } -+ - public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration - public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable - diff --git a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 93% rename from patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch index bf64cb1..7e0904c 100644 --- a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -64,12 +64,12 @@ index 161c128d27f50f145f88142191f1a5c93649ea65..6659abb4ab8a13a48c154d2e3f273eb1 entitycow.setPersistenceRequired(); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 1f99a324527d5329a21e795d3b6d95b535f415ef..410aa2ffd6bd9792e81a3e2933fe923291e1dd99 100644 +index 14f4a9fe5e8c185d1d8e6201bff24aabee43a634..223983565d08c0a803afb27433aee31a4267c364 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -100,6 +100,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public Fixes fixes; public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom + diff --git a/patches/server/0072-Fix-MC-121706.patch b/patches/server/0071-Fix-MC-121706.patch similarity index 96% rename from patches/server/0072-Fix-MC-121706.patch rename to patches/server/0071-Fix-MC-121706.patch index e0b2a51..a33c189 100644 --- a/patches/server/0072-Fix-MC-121706.patch +++ b/patches/server/0071-Fix-MC-121706.patch @@ -65,10 +65,10 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 410aa2ffd6bd9792e81a3e2933fe923291e1dd99..eb84bc4a643cb66258a3263c4798265071978c3f 100644 +index 223983565d08c0a803afb27433aee31a4267c364..bcb7e0feda3aafd9a0c7e4a7ed41c867081df693 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -107,6 +107,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc238526 = false; // Gale end - Purpur - fix MC-238526 diff --git a/patches/server/0073-Fix-MC-110386.patch b/patches/server/0072-Fix-MC-110386.patch similarity index 93% rename from patches/server/0073-Fix-MC-110386.patch rename to patches/server/0072-Fix-MC-110386.patch index e4ba8ac..1cbfc62 100644 --- a/patches/server/0073-Fix-MC-110386.patch +++ b/patches/server/0072-Fix-MC-110386.patch @@ -35,10 +35,10 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index eb84bc4a643cb66258a3263c4798265071978c3f..0ad4a7d73f0c28834a925128a1235d2f279dd067 100644 +index bcb7e0feda3aafd9a0c7e4a7ed41c867081df693..cb1e4ec01764c1be430ae45937706862a74afd26 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -112,6 +112,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc121706 = false; // Gale end - Purpur - fix MC-121706 diff --git a/patches/server/0074-Fix-MC-31819.patch b/patches/server/0073-Fix-MC-31819.patch similarity index 93% rename from patches/server/0074-Fix-MC-31819.patch rename to patches/server/0073-Fix-MC-31819.patch index 47f2b29..71b6d73 100644 --- a/patches/server/0074-Fix-MC-31819.patch +++ b/patches/server/0073-Fix-MC-31819.patch @@ -35,10 +35,10 @@ index 567704f61034363e48ef2a5b5566ebdc91682297..e1b2b6a55d0a837d2a447dcc636a9f29 if (!this.abilities.invulnerable) { if (!this.level().isClientSide) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 0ad4a7d73f0c28834a925128a1235d2f279dd067..b38180cff9f1d24d9d2093add658d14b3196066a 100644 +index cb1e4ec01764c1be430ae45937706862a74afd26..7f9c5012defeac5ae558e46d8fca6889fb1d0872 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -117,6 +117,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc110386 = true; // Gale end - Mirai - fix MC-110386 diff --git a/patches/server/0075-Fix-MC-26304.patch b/patches/server/0074-Fix-MC-26304.patch similarity index 100% rename from patches/server/0075-Fix-MC-26304.patch rename to patches/server/0074-Fix-MC-26304.patch diff --git a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 93% rename from patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch index a7bc513..e867c35 100644 --- a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,11 +49,11 @@ index 098fde8200a11f91f934ddab6b1486dac4014dfe..083130de6f6d5b6daa1564d5d51115f7 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b38180cff9f1d24d9d2093add658d14b3196066a..cd4ddb2d4d66d4ffd7310ef29444d995ec58e427 100644 +index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..56bf02a1f9741fc1c05ede0c0c79fea97d46271b 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -101,6 +101,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable +@@ -100,6 +100,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public class Fixes extends ConfigurationPart { public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom + public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 95% rename from patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch index 3edfe6b..b498275 100644 --- a/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,10 +55,10 @@ index e8faca6e443239968f0111519f9e5cd018ed3297..488a98e20b4f405d1ce4a224d2d2b515 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index cd4ddb2d4d66d4ffd7310ef29444d995ec58e427..e55535f7de93c2b0ac7d84d2dbf16101cb0e61de 100644 +index 56bf02a1f9741fc1c05ede0c0c79fea97d46271b..0f205f02ce0553fb1f8db8aa903861102a570708 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -125,6 +125,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -124,6 +124,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0078-Make-logging-login-locations-configurable.patch b/patches/server/0077-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0078-Make-logging-login-locations-configurable.patch rename to patches/server/0077-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0079-Reduce-array-allocations.patch b/patches/server/0078-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0079-Reduce-array-allocations.patch rename to patches/server/0078-Reduce-array-allocations.patch index 995c1e1..a8e646d 100644 --- a/patches/server/0079-Reduce-array-allocations.patch +++ b/patches/server/0078-Reduce-array-allocations.patch @@ -377,7 +377,7 @@ index 981d34dd4cfbc0932b147688751b98552c8beea8..53d80d46a857297987145fd956c8136b private static final Codec ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, ComponentSerialization.CODEC).xmap((either) -> { return either.map((object) -> { diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 61840cfd64caba6595dfc99c91c76a195638d4ee..96cb26fae947006ae7bceb3187ed2c28c4214f16 100644 +index bc391d27399d8c22e78735ca39aa8ab45efb6413..465a7787f15c934b2cef1a58e4b18f1ae9b4cae7 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -87,7 +87,7 @@ public class Main { @@ -434,7 +434,7 @@ index 86a2f955dc981dd95091b70d6600ff94ce4dc714..8f5b90dc2af62336116fae24ed3248bf return ret; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 572bfe0be19d549e11d9b551794d615c5e194217..e66becca5d422eaf2242c8fcfb87a1ac0a5ae063 100644 +index f5d6bf230ec6ec24ae22669b32ce6e85388475c3..c9f3ac6f18eddb3f45024c562e7d1bfb9730e9d2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -28,6 +28,8 @@ import java.util.function.UnaryOperator; diff --git a/patches/server/0080-Optimize-sun-burn-tick.patch b/patches/server/0079-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0080-Optimize-sun-burn-tick.patch rename to patches/server/0079-Optimize-sun-burn-tick.patch diff --git a/patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0085-Replace-class-map-with-optimized-collection.patch b/patches/server/0084-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0085-Replace-class-map-with-optimized-collection.patch rename to patches/server/0084-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0086-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0086-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0088-Cache-BlockStatePairKey-hash.patch b/patches/server/0087-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0088-Cache-BlockStatePairKey-hash.patch rename to patches/server/0087-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0089-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0088-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0089-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0088-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0089-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0089-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0090-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0090-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0092-Check-frozen-ticks-before-landing-block.patch b/patches/server/0091-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0092-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0091-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0093-Faster-chunk-serialization.patch b/patches/server/0092-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0093-Faster-chunk-serialization.patch rename to patches/server/0092-Faster-chunk-serialization.patch diff --git a/patches/server/0094-Update-boss-bar-within-tick.patch b/patches/server/0093-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0094-Update-boss-bar-within-tick.patch rename to patches/server/0093-Update-boss-bar-within-tick.patch diff --git a/patches/server/0095-Cache-ominous-banner-item.patch b/patches/server/0094-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0095-Cache-ominous-banner-item.patch rename to patches/server/0094-Cache-ominous-banner-item.patch diff --git a/patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0095-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0095-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0097-Cache-world-generator-sea-level.patch b/patches/server/0096-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0097-Cache-world-generator-sea-level.patch rename to patches/server/0096-Cache-world-generator-sea-level.patch diff --git a/patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0097-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0097-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0099-Optimize-villager-data-storage.patch b/patches/server/0098-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0099-Optimize-villager-data-storage.patch rename to patches/server/0098-Optimize-villager-data-storage.patch diff --git a/patches/server/0100-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0099-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0100-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0099-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0101-Store-mob-counts-in-an-array.patch b/patches/server/0100-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0101-Store-mob-counts-in-an-array.patch rename to patches/server/0100-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0102-Use-linked-map-for-entity-trackers.patch b/patches/server/0101-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0102-Use-linked-map-for-entity-trackers.patch rename to patches/server/0101-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0103-Optimize-noise-generation.patch b/patches/server/0102-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0103-Optimize-noise-generation.patch rename to patches/server/0102-Optimize-noise-generation.patch diff --git a/patches/server/0104-Optimize-sheep-offspring-color.patch b/patches/server/0103-Optimize-sheep-offspring-color.patch similarity index 98% rename from patches/server/0104-Optimize-sheep-offspring-color.patch rename to patches/server/0103-Optimize-sheep-offspring-color.patch index f0262a7..8347157 100644 --- a/patches/server/0104-Optimize-sheep-offspring-color.patch +++ b/patches/server/0103-Optimize-sheep-offspring-color.patch @@ -110,7 +110,7 @@ index 1d80678f7e8f658e43616f0baf723f096a99122a..865f244de1605303f22d8944174b0fe0 DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index e55535f7de93c2b0ac7d84d2dbf16101cb0e61de..df8843a80bb0008be1a3a3151360cc92e5676579 100644 +index 0f205f02ce0553fb1f8db8aa903861102a570708..19115238d0fd845a788446d88d9ec9a52762c367 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch similarity index 94% rename from patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch index fb00782..4846443 100644 --- a/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch @@ -31,10 +31,10 @@ index 4f34ca69a0f417028bad01f4a29644a1e08bb9ca..b4d78f2609a58e4aba0340ebfce229bb this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index df8843a80bb0008be1a3a3151360cc92e5676579..7d4e0bf1b128a04118079e0e8e420f3dd3978600 100644 +index 19115238d0fd845a788446d88d9ec9a52762c367..5d499e77800466210473e36b2355873807b9f86a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -128,6 +128,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -127,6 +127,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration diff --git a/patches/server/0106-Skip-cloning-advancement-criteria.patch b/patches/server/0105-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0106-Skip-cloning-advancement-criteria.patch rename to patches/server/0105-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0107-Reduce-block-destruction-packet-allocations.patch b/patches/server/0106-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0107-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0106-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0108-Spread-out-sending-all-player-info.patch b/patches/server/0107-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0108-Spread-out-sending-all-player-info.patch rename to patches/server/0107-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0109-Optimize-player-list-for-sending-player-info.patch b/patches/server/0108-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0109-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0108-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0111-Send-multiple-keep-alive-packets.patch b/patches/server/0110-Send-multiple-keep-alive-packets.patch similarity index 98% rename from patches/server/0111-Send-multiple-keep-alive-packets.patch rename to patches/server/0110-Send-multiple-keep-alive-packets.patch index 565e5bb..d81a9cc 100644 --- a/patches/server/0111-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0110-Send-multiple-keep-alive-packets.patch @@ -129,7 +129,7 @@ index e7583996cc6d750cbd72f749de39ecded56d7f7c..d791c2f2facfc46d8664225c8b28f95f } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e66becca5d422eaf2242c8fcfb87a1ac0a5ae063..3b2075b36093e5b9f507b2e9b0f04f62a6cabf03 100644 +index c9f3ac6f18eddb3f45024c562e7d1bfb9730e9d2..ec0cf74e977d3ba4cbd43572af8f7fd4a496462f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -8,6 +8,8 @@ import com.mojang.brigadier.StringReader; diff --git a/patches/server/0112-Make-slow-login-timeout-configurable.patch b/patches/server/0111-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0112-Make-slow-login-timeout-configurable.patch rename to patches/server/0111-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0113-Make-max-interaction-distance-configurable.patch b/patches/server/0112-Make-max-interaction-distance-configurable.patch similarity index 96% rename from patches/server/0113-Make-max-interaction-distance-configurable.patch rename to patches/server/0112-Make-max-interaction-distance-configurable.patch index 2a5591e..d00e097 100644 --- a/patches/server/0113-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0112-Make-max-interaction-distance-configurable.patch @@ -20,7 +20,7 @@ index a7b217ddbcbf92513bd38101fdfca2075505e267..840dc3c57dd60d5f16155fc0c6f8c9fe this.debugLogging(pos, false, sequence, "too far"); } else if (pos.getY() >= worldHeight) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3b2075b36093e5b9f507b2e9b0f04f62a6cabf03..e71dfe3db4a2cf616d91c987a38da1509f379c88 100644 +index ec0cf74e977d3ba4cbd43572af8f7fd4a496462f..9025505e7c8ac81d97a553e0ebbeb5727bd69bb6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -250,7 +250,7 @@ import org.bukkit.inventory.SmithingInventory; @@ -86,7 +86,7 @@ index f46c16dd6ff9cd09ea579eecf99ce78c7eb39d49..430b8a2bb1639eeb7338e0f7b1030248 private void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 7d4e0bf1b128a04118079e0e8e420f3dd3978600..eb651b6f618cfe4b79a5279396eac6bc99014d02 100644 +index 5d499e77800466210473e36b2355873807b9f86a..c5b23bafb7909130a8a294e3b5bf94daa313ee11 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -9,6 +9,7 @@ import io.papermc.paper.configuration.PaperConfigurations; @@ -97,7 +97,7 @@ index 7d4e0bf1b128a04118079e0e8e420f3dd3978600..eb651b6f618cfe4b79a5279396eac6bc import org.spongepowered.configurate.objectmapping.meta.Setting; @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"}) -@@ -131,6 +132,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -130,6 +131,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable diff --git a/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 94% rename from patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch index d9f8b91..d73a2ec 100644 --- a/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch @@ -31,10 +31,10 @@ index b4d78f2609a58e4aba0340ebfce229bb78135475..c445d59036c9de418997ad3be9bc3912 entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - EntityPortalExitEvent entity.setDeltaMovement(velocity); // Paper - EntityPortalExitEvent diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index eb651b6f618cfe4b79a5279396eac6bc99014d02..2d298c999def8d401f7100b16a49846b2d5ff186 100644 +index c5b23bafb7909130a8a294e3b5bf94daa313ee11..f6e4fada132faeb37c076013ef7c54147de42ba8 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -127,6 +127,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -126,6 +126,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch index c83b265..5498f80 100644 --- a/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index ed80960777b18faca2d6a99783e53daf5fa19e09..3380125f68b865977ac6275796158204 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 2d298c999def8d401f7100b16a49846b2d5ff186..210423422c81c55d82a190584259af562b7e15ad 100644 +index f6e4fada132faeb37c076013ef7c54147de42ba8..bc8af8c6b5f0d4717317e072b3be7348b2eeee76 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -93,6 +93,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 97% rename from patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch index a35f3c0..12a0c94 100644 --- a/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -79,7 +79,7 @@ index 6560fda6525dceddc91b95c8dd82b10debd6b62f..9b33b8b6aa769aceeb8080814b0682cb if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 210423422c81c55d82a190584259af562b7e15ad..da903a8872d15d597b739fcb1bb044882f84c138 100644 +index bc8af8c6b5f0d4717317e072b3be7348b2eeee76..9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 91% rename from patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch index 0cee4c6..6d10a36 100644 --- a/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,12 +38,12 @@ index 06b9fdd33fe888d298dfd24a67702a610233f10d..8d7cda352d1be1bd7638561d4727df9c @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index da903a8872d15d597b739fcb1bb044882f84c138..f4ba8b70038390a026c61b9f2dc9f427103e6edb 100644 +index 9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9..b736cef3509b1f6c7c6135c0f9e5d29f35c82053 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -108,6 +108,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -107,6 +107,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public Fixes fixes; public class Fixes extends ConfigurationPart { - public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom diff --git a/patches/server/0118-Ignore-null-legacy-structure-data.patch b/patches/server/0117-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0118-Ignore-null-legacy-structure-data.patch rename to patches/server/0117-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0118-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0118-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 94% rename from patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch index cad5011..ec45018 100644 --- a/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,10 +36,10 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..9e4d0493aa814a392742c9ddc1815211 } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f4ba8b70038390a026c61b9f2dc9f427103e6edb..f4e4da45b069bdea577027e23eb0dcb9e1a45987 100644 +index b736cef3509b1f6c7c6135c0f9e5d29f35c82053..2b8f53fc53dc69aa9afd516ef4a81ecf7b43e62c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -140,6 +140,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -139,6 +139,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { } public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable diff --git a/patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0120-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0120-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0122-CraftBukkit-UUID-to-world-map.patch b/patches/server/0121-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0122-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0121-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0123-Global-EULA-file.patch b/patches/server/0122-Global-EULA-file.patch similarity index 100% rename from patches/server/0123-Global-EULA-file.patch rename to patches/server/0122-Global-EULA-file.patch diff --git a/patches/server/0124-Specific-interval-TPS-API.patch b/patches/server/0123-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0124-Specific-interval-TPS-API.patch rename to patches/server/0123-Specific-interval-TPS-API.patch diff --git a/patches/server/0125-5-second-TPS-average.patch b/patches/server/0124-5-second-TPS-average.patch similarity index 100% rename from patches/server/0125-5-second-TPS-average.patch rename to patches/server/0124-5-second-TPS-average.patch diff --git a/patches/server/0126-Measure-last-tick-time.patch b/patches/server/0125-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0126-Measure-last-tick-time.patch rename to patches/server/0125-Measure-last-tick-time.patch diff --git a/patches/server/0127-Last-tick-time-API.patch b/patches/server/0126-Last-tick-time-API.patch similarity index 100% rename from patches/server/0127-Last-tick-time-API.patch rename to patches/server/0126-Last-tick-time-API.patch diff --git a/patches/server/0128-Show-last-tick-time-in-tps-command.patch b/patches/server/0127-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0128-Show-last-tick-time-in-tps-command.patch rename to patches/server/0127-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0129-Increase-time-statistics-in-intervals.patch b/patches/server/0128-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0129-Increase-time-statistics-in-intervals.patch rename to patches/server/0128-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0131-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0130-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0131-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0130-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0132-Optimize-matching-item-checks.patch b/patches/server/0131-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0132-Optimize-matching-item-checks.patch rename to patches/server/0131-Optimize-matching-item-checks.patch diff --git a/patches/server/0133-Pre-compute-VarLong-sizes.patch b/patches/server/0132-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0133-Pre-compute-VarLong-sizes.patch rename to patches/server/0132-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0134-Optimize-VarLong-write.patch b/patches/server/0133-Optimize-VarLong-write.patch similarity index 100% rename from patches/server/0134-Optimize-VarLong-write.patch rename to patches/server/0133-Optimize-VarLong-write.patch diff --git a/patches/server/0135-Reduce-RandomSource-instances.patch b/patches/server/0134-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0135-Reduce-RandomSource-instances.patch rename to patches/server/0134-Reduce-RandomSource-instances.patch diff --git a/patches/server/0136-Add-xor-shift-random.patch b/patches/server/0135-Add-xor-shift-random.patch similarity index 100% rename from patches/server/0136-Add-xor-shift-random.patch rename to patches/server/0135-Add-xor-shift-random.patch diff --git a/patches/server/0137-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0136-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 100% rename from patches/server/0137-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0136-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch diff --git a/patches/server/0138-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0137-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0138-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0137-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0139-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0138-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0139-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0138-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/patches/server/0140-Server-thread-priority-environment-variable.patch b/patches/server/0139-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0140-Server-thread-priority-environment-variable.patch rename to patches/server/0139-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0141-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0140-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0141-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0140-Instantly-continue-on-world-upgrade-finish.patch diff --git a/patches/server/0142-Virtual-thread-support.patch b/patches/server/0141-Virtual-thread-support.patch similarity index 100% rename from patches/server/0142-Virtual-thread-support.patch rename to patches/server/0141-Virtual-thread-support.patch diff --git a/settings.gradle.kts b/settings.gradle.kts index 65a247d..e2287b5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } if (!file(".git").exists()) {