Paper: Fix: move to jline-terminal-ffm on java 22+ and fall back to j…

…ni on 21
Winds-Studio · Nov 28, 2024 · a3f3dba · a3f3dba
1 parent b361294
commit a3f3dba
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 2 deletions.
diff --git a/patches/server/0124-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch b/patches/server/0124-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MiniDigger | Martin <admin@minidigger.dev>
+Date: Sun, 17 Nov 2024 20:31:50 +0100
+Subject: [PATCH] Paper: Fix: move to jline-terminal-ffm on java 22+ and fall
+ back to jni on 21
+
+Original license: GPLv3
+Original project: https://github.com/PaperMC/Paper
+Paper pull request: https://github.com/PaperMC/Paper/pull/11631
+
+Ported from Paper 1.21.3
+Also see Leaf's Fix-console-freeze-above-JAVA-22.patch
+
+ffm requires 1) native access allowed (the jdk cracks down on undocumented native access in 22) and 2) reverting the default console back to java.base, so the internal jline doesnt take over
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 068ec805a51764fbe22b91578797e553a7bca1f8..572af93c43a66e6ae17b4aee219a87c5168e3dfa 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -31,7 +31,8 @@ dependencies {
+     // Leaf end - Libraries
+
+     // Paper start
+-    implementation("org.jline:jline-terminal-jansi:3.27.1") // Leaf - Bump Dependencies
++    implementation("org.jline:jline-terminal-ffm:3.27.1") // Paper - use ffm on java 22+
++    implementation("org.jline:jline-terminal-jni:3.27.1") // Paper - fall back to jni on java 21
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+     implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
+     /*
diff --git a/...24-Dont-send-useless-entity-packets.patch → ...25-Dont-send-useless-entity-packets.patch b/...24-Dont-send-useless-entity-packets.patch → ...25-Dont-send-useless-entity-packets.patch
diff --git a/...n-t-spawn-if-lastSpawnState-is-null.patch → ...n-t-spawn-if-lastSpawnState-is-null.patch b/...n-t-spawn-if-lastSpawnState-is-null.patch → ...n-t-spawn-if-lastSpawnState-is-null.patch
diff --git a/...s/server/0126-Multithreaded-Tracker.patch → ...s/server/0127-Multithreaded-Tracker.patch b/...s/server/0126-Multithreaded-Tracker.patch → ...s/server/0127-Multithreaded-Tracker.patch
diff --git a/...r/0127-Nitori-Async-playerdata-Save.patch → ...r/0128-Nitori-Async-playerdata-Save.patch b/...r/0127-Nitori-Async-playerdata-Save.patch → ...r/0128-Nitori-Async-playerdata-Save.patch
diff --git a/.../server/0128-Change-max-stack-count.patch → .../server/0129-Change-max-stack-count.patch b/.../server/0128-Change-max-stack-count.patch → .../server/0129-Change-max-stack-count.patch
diff --git a/...plexity-to-make-block-isValid-calls.patch → ...plexity-to-make-block-isValid-calls.patch b/...plexity-to-make-block-isValid-calls.patch → ...plexity-to-make-block-isValid-calls.patch
diff --git a/...e-nearby-alive-players-for-spawning.patch → ...e-nearby-alive-players-for-spawning.patch b/...e-nearby-alive-players-for-spawning.patch → ...e-nearby-alive-players-for-spawning.patch
diff --git a/.../server/0131-Cache-blockstate-cache.patch → .../server/0132-Cache-blockstate-cache.patch b/.../server/0131-Cache-blockstate-cache.patch → .../server/0132-Cache-blockstate-cache.patch
diff --git a/...es/server/0132-Asynchronous-locator.patch → ...es/server/0133-Asynchronous-locator.patch b/...es/server/0132-Asynchronous-locator.patch → ...es/server/0133-Asynchronous-locator.patch
diff --git a/...tities-in-NearestLivingEntitySensor.patch → ...tities-in-NearestLivingEntitySensor.patch b/...tities-in-NearestLivingEntitySensor.patch → ...tities-in-NearestLivingEntitySensor.patch
diff --git a/...uce-memory-footprint-of-CompoundTag.patch → ...uce-memory-footprint-of-CompoundTag.patch b/...uce-memory-footprint-of-CompoundTag.patch → ...uce-memory-footprint-of-CompoundTag.patch
diff --git a/.../0135-Optimize-Entity-distanceToSqr.patch → .../0136-Optimize-Entity-distanceToSqr.patch b/.../0135-Optimize-Entity-distanceToSqr.patch → .../0136-Optimize-Entity-distanceToSqr.patch
diff --git a/...e-snapshots-for-TileEntity-getOwner.patch → ...e-snapshots-for-TileEntity-getOwner.patch b/...e-snapshots-for-TileEntity-getOwner.patch → ...e-snapshots-for-TileEntity-getOwner.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EMC: Don't use snapshots for TileEntity::getOwner
 Original license: MIT
 Original project: https://github.com/starlis/empirecraft
 
-Also see EMC-Default-don-t-use-blockstate-snapshots.patch
+Also see Leaf's EMC-Default-don-t-use-blockstate-snapshots.patch
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 index 73c9f91457683e8e6bd8293b4393ccbd984eddb7..7b38835bdac33dce9ed7ca1c0b3d43fdc2224d0c 100644

diff --git a/...ault-don-t-use-blockstate-snapshots.patch → ...ault-don-t-use-blockstate-snapshots.patch b/...ault-don-t-use-blockstate-snapshots.patch → ...ault-don-t-use-blockstate-snapshots.patch
diff --git a/...ver/0138-Cache-tile-entity-position.patch → ...ver/0139-Cache-tile-entity-position.patch b/...ver/0138-Cache-tile-entity-position.patch → ...ver/0139-Cache-tile-entity-position.patch
diff --git a/...s/server/0139-TT20-Lag-compensation.patch → ...s/server/0140-TT20-Lag-compensation.patch b/...s/server/0139-TT20-Lag-compensation.patch → ...s/server/0140-TT20-Lag-compensation.patch
diff --git a/...behavior-in-fluid-caused-by-inconsi.patch → ...behavior-in-fluid-caused-by-inconsi.patch b/...behavior-in-fluid-caused-by-inconsi.patch → ...behavior-in-fluid-caused-by-inconsi.patch
@@ -10,7 +10,7 @@ This issue caused by inconsistent fluid count, because of a condition change
 in LevelChunkSection#setBlockState, introduced by Moonrise's block count optimisation
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 976d72b611011cccf4b4efadc9772ce1c68ef5ee..1309fa679b4e73645fac6ae04044709915092574 100644
+index 6a19390aff7c8f7170467d2c6306b00779f23082..d0bbbd2044809bdb1273248297f5d9fb87011189 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4797,7 +4797,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...server/0141-C2ME-Reduce-Allocations.patch → ...server/0142-C2ME-Reduce-Allocations.patch b/...server/0141-C2ME-Reduce-Allocations.patch → ...server/0142-C2ME-Reduce-Allocations.patch
diff --git a/...cessary-calculations-if-player-is-n.patch → ...cessary-calculations-if-player-is-n.patch b/...cessary-calculations-if-player-is-n.patch → ...cessary-calculations-if-player-is-n.patch
diff --git a/patches/server/0143-Lithium-fast-util.patch → patches/server/0144-Lithium-fast-util.patch b/patches/server/0143-Lithium-fast-util.patch → patches/server/0144-Lithium-fast-util.patch
diff --git a/.../server/0144-Lithium-CompactSineLUT.patch → .../server/0145-Lithium-CompactSineLUT.patch b/.../server/0144-Lithium-CompactSineLUT.patch → .../server/0145-Lithium-CompactSineLUT.patch
diff --git a/...r/0145-Lithium-IterateOutwardsCache.patch → ...r/0146-Lithium-IterateOutwardsCache.patch b/...r/0145-Lithium-IterateOutwardsCache.patch → ...r/0146-Lithium-IterateOutwardsCache.patch
diff --git a/patches/server/0146-Lithium-HashedList.patch → patches/server/0147-Lithium-HashedList.patch b/patches/server/0146-Lithium-HashedList.patch → patches/server/0147-Lithium-HashedList.patch
diff --git a/...ncExecutor-for-MAIN_WORKER_EXECUTOR.patch → ...ncExecutor-for-MAIN_WORKER_EXECUTOR.patch b/...ncExecutor-for-MAIN_WORKER_EXECUTOR.patch → ...ncExecutor-for-MAIN_WORKER_EXECUTOR.patch
diff --git a/...ver/0148-Better-inline-world-height.patch → ...ver/0149-Better-inline-world-height.patch b/...ver/0148-Better-inline-world-height.patch → ...ver/0149-Better-inline-world-height.patch
diff --git a/...read-safe-ban-list-date-format-pars.patch → ...read-safe-ban-list-date-format-pars.patch b/...read-safe-ban-list-date-format-pars.patch → ...read-safe-ban-list-date-format-pars.patch
diff --git a/...tartEachNonRunningBehavior-in-Brain.patch → ...tartEachNonRunningBehavior-in-Brain.patch b/...tartEachNonRunningBehavior-in-Brain.patch → ...tartEachNonRunningBehavior-in-Brain.patch
diff --git a/...ver/0151-Lithium-equipment-tracking.patch → ...ver/0152-Lithium-equipment-tracking.patch b/...ver/0151-Lithium-equipment-tracking.patch → ...ver/0152-Lithium-equipment-tracking.patch
diff --git a/...CraftServer-getworlds-list-creation.patch → ...CraftServer-getworlds-list-creation.patch b/...CraftServer-getworlds-list-creation.patch → ...CraftServer-getworlds-list-creation.patch
diff --git a/...r/0153-C2ME-Optimize-world-gen-math.patch → ...r/0154-C2ME-Optimize-world-gen-math.patch b/...r/0153-C2ME-Optimize-world-gen-math.patch → ...r/0154-C2ME-Optimize-world-gen-math.patch