diff --git a/gradle.properties b/gradle.properties index 1216af7..797253a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=3716832282a136dbbd29ab04d1a37ae88ac3726e +paperRef=a751001ed1649860794a57ab818a5e51793aafe6 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0008-Gale-semantic-version.patch b/patches/server/0008-Gale-semantic-version.patch index 345356f..baec88e 100644 --- a/patches/server/0008-Gale-semantic-version.patch +++ b/patches/server/0008-Gale-semantic-version.patch @@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb } diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java new file mode 100644 -index 0000000000000000000000000000000000000000..97fd440ec0f9389a6886f2a1b71ae380bbb85575 +index 0000000000000000000000000000000000000000..4d3bfdbf81daada0859cc70e3c23a90e04e4521d --- /dev/null +++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java @@ -0,0 +1,37 @@ @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..97fd440ec0f9389a6886f2a1b71ae380 + * The patch version is incremented for small changes that do not affect the goal of any feature, + * such as bug fixes, performance improvements or changes in wording. + */ -+ public static final @NotNull String version = "0.6.2"; ++ public static final @NotNull String version = "0.6.3"; + + /** + * The "major.minor" portion of the {@link #version}. diff --git a/patches/server/0140-Optimize-nearest-structure-border-iteration.patch b/patches/server/0140-Optimize-nearest-structure-border-iteration.patch deleted file mode 100644 index 1fc60db..0000000 --- a/patches/server/0140-Optimize-nearest-structure-border-iteration.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Mon, 21 Aug 2023 21:05:09 +0200 -Subject: [PATCH] Optimize nearest structure border iteration - -License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) -Gale - https://galemc.org - -Getting the nearest generated structure contains a nested set of loops that -iterates over all chunks at a specific chessboard distance. It does this by -iterating over the entire square of chunks within that distance, and checking -if the coordinates are at exactly the right distance to be on the border. - -This patch optimizes the iteration by only iterating over the border chunks. -This evaluated chunks are the same, and in the same order, as before, to -ensure that the returned found structure (which may for example be a buried -treasure that will be marked on a treasure map) is the same as in vanilla. - -diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index 8bab3fcfc6aa6c0b37621474a69f15e94bda2113..fa4960b9dac289a83273d8f87d069e2833eb9fc9 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -@@ -262,10 +262,8 @@ public abstract class ChunkGenerator { - for (int j1 = -radius; j1 <= radius; ++j1) { - boolean flag1 = j1 == -radius || j1 == radius; - -- for (int k1 = -radius; k1 <= radius; ++k1) { -- boolean flag2 = k1 == -radius || k1 == radius; -+ for (int k1 = -radius; k1 <= radius; k1 += flag1 ? 1 : radius * 2) { // Gale - iterate over border chunks instead of entire square chunk area - -- if (flag1 || flag2) { - int l1 = centerChunkX + i1 * j1; - int i2 = centerChunkZ + i1 * k1; - ChunkPos chunkcoordintpair = placement.getPotentialStructureChunk(seed, l1, i2); -@@ -274,7 +272,6 @@ public abstract class ChunkGenerator { - if (pair != null) { - return pair; - } -- } - } - } - diff --git a/patches/server/0141-Pre-compute-VarInt-and-VarLong-sizes.patch b/patches/server/0140-Pre-compute-VarInt-and-VarLong-sizes.patch similarity index 100% rename from patches/server/0141-Pre-compute-VarInt-and-VarLong-sizes.patch rename to patches/server/0140-Pre-compute-VarInt-and-VarLong-sizes.patch diff --git a/patches/server/0142-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch b/patches/server/0141-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch similarity index 100% rename from patches/server/0142-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch rename to patches/server/0141-Optimize-FriendlyByteBuf-writeVarInt-and-FriendlyByt.patch diff --git a/patches/server/0143-Reduce-RandomSource-instances.patch b/patches/server/0142-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0143-Reduce-RandomSource-instances.patch rename to patches/server/0142-Reduce-RandomSource-instances.patch diff --git a/patches/server/0144-Add-xor-shift-random.patch b/patches/server/0143-Add-xor-shift-random.patch similarity index 100% rename from patches/server/0144-Add-xor-shift-random.patch rename to patches/server/0143-Add-xor-shift-random.patch diff --git a/patches/server/0145-Server-thread-priority-environment-variable.patch b/patches/server/0144-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0145-Server-thread-priority-environment-variable.patch rename to patches/server/0144-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0146-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0145-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0146-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0145-Instantly-continue-on-world-upgrade-finish.patch diff --git a/patches/server/0147-Virtual-thread-support.patch b/patches/server/0146-Virtual-thread-support.patch similarity index 100% rename from patches/server/0147-Virtual-thread-support.patch rename to patches/server/0146-Virtual-thread-support.patch