Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-22 16:29:23 +00:00
Code Issues Releases Activity

[ci-skip] fix linear region patch

Browse Source
This commit is contained in:
NONPLAYT
2024-04-17 00:29:46 +03:00
parent a00a536905
commit cb78fe9ff2
6 changed files with 236 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
.github/workflows/automatic-update.yml → .github/workflows/upstream.yml vendored
View File

@@ -1,47 +1,47 @@
name: Automatically update Purpur commit hash name: Upstream Purpur
on: on:
workflow_dispatch: {} workflow_dispatch: {}
schedule: schedule:
- cron: "0 0 * * *" - cron: "0 0 */3 * *"
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout DivineMC Repository - name: Checkout DivineMC Repository
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
path: 'DivineMC' path: 'DivineMC'
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout Purpur Repository - name: Checkout Purpur Repository
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
path: 'Purpur' path: 'Purpur'
repository: "PurpurMC/Purpur" repository: "PurpurMC/Purpur"
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
- name: Get Purpur Latest Commit Hash - name: Get Purpur Latest Commit Hash
id: purpurRef id: purpurRef
run: | run: |
ls ls
cd Purpur cd Purpur
echo "::set-output name=purpurRef::$(git rev-parse HEAD)" echo "::set-output name=purpurRef::$(git rev-parse HEAD)"
cd .. cd ..
- name: Update purpurRef in DivineMC - name: Update purpurRef in DivineMC
run: | run: |
cd DivineMC cd DivineMC
sed -i "s/\(purpurRef\s*=\s*\).*/\1$PAPER_REF/" gradle.properties sed -i "s/\(purpurRef\s*=\s*\).*/\1$PAPER_REF/" gradle.properties
env: env:
PAPER_REF: ${{ steps.purpurRef.outputs.purpurRef }} PAPER_REF: ${{ steps.purpurRef.outputs.purpurRef }}
- name: Check for changes and Write to repository - name: Check for changes and Write to repository
run: | run: |
cd DivineMC cd DivineMC
if ! git diff --quiet; then if ! git diff --quiet; then
git add gradle.properties git add gradle.properties
git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions" git config --global user.email "action@github.com" && git config --global user.name "Github Action"
git commit -m "Updated Upstream (Purpur)" git commit -m "Updated Upstream (Purpur)"
git push git push
else else
echo "No changes to commit." echo "No changes to commit."
fi fi

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = space.bxteam.divinemc group = space.bxteam.divinemc
version = 1.20.4-R0.1-SNAPSHOT version = 1.20.4-R0.1-SNAPSHOT
purpurRef = 0b95a8072acbd1ffa415fd80d9f5406b113c2a7f purpurRef = f2a5ca87a9ae3e640144051214f58b5c2ece0915
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

8
patches/server/0035-Improve-biome-temperature-cache.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Improve biome temperature cache
diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
index 57f3193ff761cbe45846a02a15d8da9c9e2e87ee..93a7647b19315aa4dc2f0a236fac330de4bed813 100644 index 42af3888a155f114901a90d4028bafed5789f58f..25e44dbab2d758682ad89ed0038fd0ad055d3097 100644
--- a/src/main/java/net/minecraft/world/level/biome/Biome.java --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
@@ -64,7 +64,7 @@ public final class Biome { @@ -64,7 +64,7 @@ public final class Biome {
@@ -14,9 +14,9 @@ index 57f3193ff761cbe45846a02a15d8da9c9e2e87ee..93a7647b19315aa4dc2f0a236fac330d
// Pufferfish start - use our cache // Pufferfish start - use our cache
- private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> { - private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
+ private static final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> { + private static final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
/* /*
Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) { Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
protected void rehash(int i) { protected void rehash(int i) {
@@ -118,7 +118,7 @@ public final class Biome { @@ -118,7 +118,7 @@ public final class Biome {
public float getTemperature(BlockPos blockPos) { public float getTemperature(BlockPos blockPos) {
long l = blockPos.asLong(); long l = blockPos.asLong();

8
patches/to-fix/0028-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch → patches/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
View File

@@ -1,18 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sat, 13 Jan 2024 13:41:03 +0300 Date: Tue, 16 Apr 2024 01:20:51 +0300
Subject: [PATCH] Add Higher Java Version for Pufferfish SIMD Subject: [PATCH] Add Higher Java Version for Pufferfish SIMD
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5faa0d20b92d3483bd8eb1993da2a28b3416f94f 100644 index 8afc58f35deb49084a20b803e91ce4692ce6e4d6..581eb4ca8d7a09729ad9194d35f3cceeb291ecf7 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -87,7 +87,7 @@ public class PufferfishConfig { @@ -87,7 +87,7 @@ public class PufferfishConfig {
// Attempt to detect vectorization // Attempt to detect vectorization
try { try {
SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER); SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER);
- SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19; - SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21;
+ SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17; // DivineMC - Add Higher Java Version for Pufferfish SIMD + SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17; // DivineMC - Add Higher Java Version for Pufferfish SIMD
} catch (NoClassDefFoundError | Exception ignored) { } catch (NoClassDefFoundError | Exception ignored) {
ignored.printStackTrace(); ignored.printStackTrace();
@@ -21,7 +21,7 @@ index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5faa0d20b92d3483bd8eb1993da2a28b
if (SIMDDetection.isEnabled) { if (SIMDDetection.isEnabled) {
PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions."); PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");
} else if (SIMDDetection.versionLimited) { } else if (SIMDDetection.versionLimited) {
- PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, Java 18, and Java 19."); - PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 through Java 21.");
+ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 and higher."); + PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 and higher.");
} else { } else {
PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!"); PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");

13
patches/to-fix/0024-Fix-chat-signing.patch → patches/server/0039-Fix-chat-signing.patch
View File

@@ -1,27 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Wed, 4 Oct 2023 21:06:16 +0300 Date: Tue, 16 Apr 2024 01:26:18 +0300
Subject: [PATCH] Fix chat signing Subject: [PATCH] Fix chat signing
diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
index 69971b2c59e541ac4100b84c84e2972de1b44ca9..e9616926d7b2a241c833b3f023818997e2bde570 100644 index 67eeb39aede6908d2756e49821ca350ebe916902..740d3bd228eed7b322d98ac77c15429c3f2e3d68 100644
--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java --- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java +++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
@@ -43,15 +43,7 @@ public class SignedMessageChain { @@ -41,16 +41,7 @@ public class SignedMessageChain {
throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.out_of_order_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
} else { } else {
this.lastTimeStamp = body.timeStamp(); this.lastTimeStamp = body.timeStamp();
PlayerChatMessage playerChatMessage = new PlayerChatMessage(signedMessageLink, signature, body, (Component)null, FilterMask.PASS_THROUGH); - PlayerChatMessage playerChatMessage = new PlayerChatMessage(signedMessageLink, signature, body, null, FilterMask.PASS_THROUGH);
- if (!playerChatMessage.verify(signatureValidator)) { - if (!playerChatMessage.verify(signatureValidator)) {
- throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.unsigned_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event causes - throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.unsigned_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event causes
- } else { - } else {
- if (playerChatMessage.hasExpiredServer(Instant.now())) { - if (playerChatMessage.hasExpiredServer(Instant.now())) {
- LOGGER.warn("Received expired chat: '{}'. Is the client/server system time unsynchronized?", (Object)body.content()); - LOGGER.warn("Received expired chat: '{}'. Is the client/server system time unsynchronized?", body.content());
- } - }
- -
- return playerChatMessage; - return playerChatMessage;
- } - }
+ return playerChatMessage; + return new PlayerChatMessage(signedMessageLink, signature, body, null, FilterMask.PASS_THROUGH); // DivineMC - Fix chat signing
} }
}; };
} }

612
patches/to-fix/0025-Implement-Linear-region-format.patch → patches/server/0040-Implement-Linear-region-format.patch
View File

File diff suppressed because it is too large Load Diff