diff --git a/gradle.properties b/gradle.properties index 674ff44..9f7540c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.5-R0.1-SNAPSHOT mcVersion=1.20.5 -paperRef=306b203c2d06979e94eeab36d21c6a9596254d56 +paperRef=f9397e108e02ae558493d7bb63b0264af2cc7693 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0007-Do-not-log-plugin-library-loads.patch b/patches/api/0007-Do-not-log-plugin-library-loads.patch index 223c0dd..37d8532 100644 --- a/patches/api/0007-Do-not-log-plugin-library-loads.patch +++ b/patches/api/0007-Do-not-log-plugin-library-loads.patch @@ -55,10 +55,10 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..92d20e70d26318fbaed8adffd21c6b77 * This class was not meant to be constructed explicitly * diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java -index f4d655a158410039305ac68cebe0d79000f73df8..7ad6d1007154357a33bca49fec43cb4a4a15b832 100644 +index 8e1b6be2462aaa692efa1f72986921a6dc357196..72b20fa06b461d89f0eeff7b2fbbbe89bae0027c 100644 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java -@@ -66,6 +66,7 @@ public class LibraryLoader +@@ -68,6 +68,7 @@ public class LibraryLoader @Override public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException { @@ -66,7 +66,7 @@ index f4d655a158410039305ac68cebe0d79000f73df8..7ad6d1007154357a33bca49fec43cb4a logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() ); } } ); -@@ -86,6 +87,7 @@ public class LibraryLoader +@@ -88,6 +89,7 @@ public class LibraryLoader { return null; } @@ -74,7 +74,7 @@ index f4d655a158410039305ac68cebe0d79000f73df8..7ad6d1007154357a33bca49fec43cb4a logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[] { java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix -@@ -124,6 +126,7 @@ public class LibraryLoader +@@ -135,6 +137,7 @@ public class LibraryLoader } jarFiles.add( url ); diff --git a/patches/server/0078-Reduce-array-allocations.patch b/patches/server/0078-Reduce-array-allocations.patch index 45821fd..0c8cdfe 100644 --- a/patches/server/0078-Reduce-array-allocations.patch +++ b/patches/server/0078-Reduce-array-allocations.patch @@ -479,7 +479,7 @@ index ee05f0131f336c50536fe47eda4693b696634796..f0436b9a2457eac9904e56f45fa1118e import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractAtEntityEvent; diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 857ea8d6fe72a1ef2094121f49db4a359e9e2080..0588e43e7607b10f66db6d0b615141250031699a 100644 +index 6bd1959d4805ebe5c60a10faaa65daa457d02674..48cf4b376b5db3849c8b11f6b78c00a6ec3874b5 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -13,9 +13,10 @@ import java.security.PrivateKey; @@ -494,20 +494,26 @@ index 857ea8d6fe72a1ef2094121f49db4a359e9e2080..0588e43e7607b10f66db6d0b61514125 import net.minecraft.DefaultUncaughtExceptionHandler; import net.minecraft.core.UUIDUtil; import net.minecraft.network.Connection; -@@ -174,8 +175,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -174,14 +175,16 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @Override public void handleHello(ServerboundHelloPacket packet) { - Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]); -- if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) Validate.validState(StringUtil.isValidPlayerName(packet.name()), "Invalid characters in username", new Object[0]); // Paper - config username validation + // Gale start - JettPack - reduce array allocations + Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", ArrayConstants.emptyObjectArray); -+ if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) Validate.validState(StringUtil.isValidPlayerName(packet.name()), "Invalid characters in username", ArrayConstants.emptyObjectArray); // Paper - config username validation + // Paper start - Validate usernames + if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() + && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation + && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) { +- Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username", new Object[0]); ++ Validate.validState(StringUtil.isReasonablePlayerName(packet.name()), "Invalid characters in username", ArrayConstants.emptyObjectArray); + } + // Paper end - Validate usernames + // Gale end - JettPack - reduce array allocations this.requestedUsername = packet.name(); GameProfile gameprofile = this.server.getSingleplayerProfile(); -@@ -271,7 +274,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -277,7 +280,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @Override public void handleKey(ServerboundKeyPacket packet) { @@ -516,7 +522,7 @@ index 857ea8d6fe72a1ef2094121f49db4a359e9e2080..0588e43e7607b10f66db6d0b61514125 final String s; -@@ -451,7 +454,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -457,7 +460,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @Override public void handleLoginAcknowledgement(ServerboundLoginAcknowledgedPacket packet) { @@ -684,7 +690,7 @@ index f38acc96f71298e40ce9433e7759fd223ca55e48..22ec9c1e74450f56cd1e390d59ca28f1 for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 36e3415b9312d3a80c9f5e1c36b42b7ea30c31c5..5c922ed680cdf54e7a1439e2181a3ba4151a1d4c 100644 +index a45389d64c04cd4c2a35fbc511595be0535a8665..5eba8eaf2fb6b5507ee4b4a6a2f386bdf26b80dd 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -1102,7 +1102,7 @@ public final class ItemStack implements DataComponentHolder {