Make book writing configurable

patches/server/0043-Make-book-writing-configurable.patch

@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Mon, 26 Dec 2022 02:11:29 +0100
+Subject: [PATCH] Make book writing configurable
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+This patch is based on the following patch:
+"Add option to disable books"
+By: Kevin Raneri <kevin.raneri@gmail.com>
+As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+* Pufferfish description *
+
+Books are commonly the target of duping-related exploits. If you
+anticipate that your server will be an early target of duping attacks in
+the event that new exploits are found, you may want to consider removing
+the ability for non-privileged players to edit books. This patch allows
+you to easily disable books, should you want to preemptively remove this
+functionality before additional exploits are found.
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 81b27d48c1421c02f86b95db1d7a1eeaf130cd09..2503af47e491d456e3044e097f35c928e45e5a21 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -182,6 +182,8 @@ import net.minecraft.world.phys.Vec3;
+ import net.minecraft.world.phys.shapes.BooleanOp;
+ import net.minecraft.world.phys.shapes.Shapes;
+ import net.minecraft.world.phys.shapes.VoxelShape;
++import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
++import org.galemc.gale.configuration.GaleGlobalConfiguration;
+ import org.slf4j.Logger;
+ 
+ // CraftBukkit start
+@@ -1202,6 +1204,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ 
+     @Override
+     public void handleEditBook(ServerboundEditBookPacket packet) {
++        // Gale start - Pufferfish - make book writing configurable
++        if (!(GaleGlobalConfiguration.get().gameplayMechanics.enableBookWriting || this.player.getBukkitEntity().hasPermission(CraftDefaultPermissions.writeBooks) || this.player.getBukkitEntity().hasPermission("pufferfish.usebooks"))) {
++            return;
++        }
++        // Gale end - Pufferfish - make book writing configurable
+         // Paper start
+         if (!this.cserver.isPrimaryThread()) {
+             List<String> pageList = packet.getPages();
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
+index 2e23147f807c6620b54d3047fe24a3847900712c..9ae9eff03fa9b240ed736eaa97fee0da7168c41d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
+@@ -7,6 +7,8 @@ public final class CraftDefaultPermissions {
+     private static final String ROOT = "minecraft";
+     public static final String GALE_ROOT = "gale"; // Gale - set Gale permissions root
+ 
++    public static final String writeBooks = GALE_ROOT + ".writebooks"; // Gale - Pufferfish - make book writing configurable
++
+     private CraftDefaultPermissions() {}
+ 
+     public static void registerCorePermissions() {
+@@ -19,6 +21,7 @@ public final class CraftDefaultPermissions {
+         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE/* , parent */); // Paper - should not have this parent, as it's not a "vanilla" utility
+         DefaultPermissions.registerPermission(CraftDefaultPermissions.ROOT + ".commandblock", "Gives the user the ability to use command blocks.", org.bukkit.permissions.PermissionDefault.OP, parent); // Paper
+         // Spigot end
++        DefaultPermissions.registerPermission(writeBooks, "Gives the user the ability to write books even when writing books is disabled in the Gale configuration", org.bukkit.permissions.PermissionDefault.OP); // Gale - Pufferfish - make book writing configurable
+         parent.recalculatePermissibles();
+     }
+ }
+diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..be4e05851e94f943b6382ba5bb9f0750c95bdad4 100644
+--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+@@ -35,6 +35,25 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+ 
+     }
+ 
++    public GameplayMechanics gameplayMechanics;
++    public class GameplayMechanics extends ConfigurationPart {
++
++        // Gale start - Pufferfish - make book writing configurable
++        /**
++         * Whether books should be writeable.
++         * Servers that anticipate being a target for duping may want to consider disabling this option.
++         * <br>
++         * If set to false, players with the permission {@code gale.writebooks} can still use books.
++         * <ul>
++         *     <li><i>Default</i>: true</li>
++         *     <li><i>Vanilla</i>: true</li>
++         * </ul>
++         */
++        public boolean enableBookWriting = true;
++        // Gale end - Pufferfish - make book writing configurable
++
++    }
++
+     public Misc misc;
+     public class Misc extends ConfigurationPart {
+ 

patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -25,10 +25,10 @@ index a07da939bb6b2dd0bd75cc74dd79493695035259..9d74ef6973f6a9e12861256aa7032f8d
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 81b27d48c1421c02f86b95db1d7a1eeaf130cd09..8fac3c35b04429e66e440895ab82a65497147812 100644
+index 2503af47e491d456e3044e097f35c928e45e5a21..cf95be6fcad6ad508d6ea1f6b10efa4e3bd2bfe5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2324,6 +2324,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2331,6 +2331,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
              return Optional.empty();

patches/server/0050-Do-not-log-invalid-statistics.patch

@@ -44,10 +44,10 @@ index 72946e324c575ef39f3939225b96b68f724da460..75e2a7d19a7056b73c1524902e44cca0
                              }
                          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..4fd116ba1666b154650805ce5558221ffc6f4190 100644
+index be4e05851e94f943b6382ba5bb9f0750c95bdad4..79f8d5286adeabffdcb682c33e5d2b83afb11dda 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -39,6 +39,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -58,6 +58,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public class Misc extends ConfigurationPart {
  
          public IncludeInTimingsReport includeInTimingsReport;
@@ -55,7 +55,7 @@ index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..4fd116ba1666b154650805ce5558221f
          public class IncludeInTimingsReport extends ConfigurationPart {
  
              // Gale start - include server.properties in timings
-@@ -74,4 +75,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -93,4 +94,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
      }
  

patches/server/0051-Do-not-log-empty-message-warnings.patch

@@ -7,19 +7,18 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8fac3c35b04429e66e440895ab82a65497147812..ee3acb578d4f72836eb3a4e8336701b3b939da50 100644
+index cf95be6fcad6ad508d6ea1f6b10efa4e3bd2bfe5..5fcca730767294e88445e701083c07c96d740147 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -182,6 +182,8 @@ import net.minecraft.world.phys.Vec3;
+@@ -183,6 +183,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
- import net.minecraft.world.phys.shapes.BooleanOp;
  import net.minecraft.world.phys.shapes.Shapes;
  import net.minecraft.world.phys.shapes.VoxelShape;
+ import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
 +import org.apache.commons.lang3.StringUtils;
-+import org.galemc.gale.configuration.GaleGlobalConfiguration;
+ import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.slf4j.Logger;
  
- // CraftBukkit start
+@@ -2539,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-@@ -2532,7 +2534,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          String s = message.signedContent();
          if (s.isEmpty()) {
@@ -29,10 +28,10 @@ index 8fac3c35b04429e66e440895ab82a65497147812..ee3acb578d4f72836eb3a4e8336701b3
              final String conversationInput = s;
              this.server.processQueue.add(new Runnable() {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 4fd116ba1666b154650805ce5558221ffc6f4190..85239fb626a1ea7b81d0be4711822fcadf4d1022 100644
+index 79f8d5286adeabffdcb682c33e5d2b83afb11dda..1ac238ebf7280c70ba49c3f59d3b3800d6b39ee0 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -80,6 +80,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -99,6 +99,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
  

patches/server/0052-Do-not-log-ignored-advancements.patch

@@ -58,10 +58,10 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..5ba0a756d45350dcda3caa5518c9a47a
                              // CraftBukkit end
                          } else {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 85239fb626a1ea7b81d0be4711822fcadf4d1022..5d4ddec708638aa3f22391cfbc27059c9980f367 100644
+index 1ac238ebf7280c70ba49c3f59d3b3800d6b39ee0..883a344b3e0c1a9c1cb2ed9e70a8b0e73ce28bed 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -79,6 +79,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -98,6 +98,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public class LogToConsole extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics

patches/server/0053-Do-not-log-setBlock-in-far-chunks.patch

@@ -57,10 +57,10 @@ index 877498729c66de9aa6a27c9148f7494d7895615c..d2bbbb0e73dafd2294838137bfbd16ac
              Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
              hasSetFarWarned = true;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 5d4ddec708638aa3f22391cfbc27059c9980f367..7641e941027153cea10699b1928122241befe2c2 100644
+index 883a344b3e0c1a9c1cb2ed9e70a8b0e73ce28bed..a1a073a0600ecc78b76abcd312d005aa82cad69e 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -80,6 +80,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements

patches/server/0054-Do-not-log-unrecognized-recipes.patch

@@ -58,10 +58,10 @@ index d13ed3069e944d138442ea440ac3eaf8d44c18d3..c89b8e5ea10a465160504f7364db4741
                      handler.accept((Recipe) optional.get());
                  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 7641e941027153cea10699b1928122241befe2c2..efd05ee1eed398eaef04419166a928302b8a8bb2 100644
+index a1a073a0600ecc78b76abcd312d005aa82cad69e..e3ba0c7bfe1f79206cf60dcd93481a14affbecbd 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -81,6 +81,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -100,6 +100,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks

patches/server/0055-Do-not-log-legacy-Material-initialization.patch

@@ -58,10 +58,10 @@ index 110503062b3043cffa082a1cda6b8d57152869aa..951ca1e25cdcdf6a1ade4090ca397f6d
              new Exception().printStackTrace();
          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index efd05ee1eed398eaef04419166a928302b8a8bb2..578207b0a2b202a33f0690541f7ee7b8afc1c13b 100644
+index e3ba0c7bfe1f79206cf60dcd93481a14affbecbd..62e6e2a526190cd1ea2dcd0825619aeb942f5c4f 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -82,6 +82,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -101,6 +101,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes

patches/server/0056-Do-not-log-expired-message-warnings.patch

@@ -28,10 +28,10 @@ index c0a80824a0307ea673805015119cc834b268f0dc..d7c6e90ccf3a8ce58e5533c5158ce626
  
                      return playerChatMessage;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 578207b0a2b202a33f0690541f7ee7b8afc1c13b..881619cd6231bafa8319c8562273009557399723 100644
+index 62e6e2a526190cd1ea2dcd0825619aeb942f5c4f..038d48c12b9d8612cba7c02149d4b867eff25dfd 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -87,6 +87,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -106,6 +106,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public Chat chat;
          public class Chat extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings

patches/server/0057-Do-not-log-Not-Secure-marker.patch

@@ -49,10 +49,10 @@ index 6cc577d17201513af62ce847363ee25a3852a1b5..8a59fade265e586622bcaa2cab277261
          boolean flag1 = false;
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 881619cd6231bafa8319c8562273009557399723..5c2e99459227f363179ea3cb964c839fd27f016b 100644
+index 038d48c12b9d8612cba7c02149d4b867eff25dfd..4e9f7b3986521e9d20d5b7e6f4bed67428ce8e6a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -88,6 +88,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -107,6 +107,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public class Chat extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
              public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings

patches/server/0060-Softly-log-invalid-pool-element-errors.patch

@@ -39,7 +39,7 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70
          });
          this.rotation = Rotation.valueOf(nbt.getString("rotation"));
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 5c2e99459227f363179ea3cb964c839fd27f016b..eb9e845cbdf239718e42e1c04699fa41d2f3905f 100644
+index 4e9f7b3986521e9d20d5b7e6f4bed67428ce8e6a..203c58977b05f9191b8b02f5f15f38f4977a8f02 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -4,8 +4,12 @@ package org.galemc.gale.configuration;
@@ -55,7 +55,7 @@ index 5c2e99459227f363179ea3cb964c839fd27f016b..eb9e845cbdf239718e42e1c04699fa41
  @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
  public class GaleGlobalConfiguration extends ConfigurationPart {
      static final int CURRENT_VERSION = 1;
-@@ -76,7 +80,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -95,7 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      }
  
      public LogToConsole logToConsole;
@@ -64,7 +64,7 @@ index 5c2e99459227f363179ea3cb964c839fd27f016b..eb9e845cbdf239718e42e1c04699fa41
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-@@ -91,6 +95,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -110,6 +114,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
              public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
          }
  

patches/server/0061-Fix-legacy-colors-in-console.patch

@@ -131,10 +131,10 @@ index b9922b07cb105618390187d98acdf89e728e1f5a..a66d202749f243f6752df5027cb7c82f
 +
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index eb9e845cbdf239718e42e1c04699fa41d2f3905f..2d8d042112db908d76da023329f16402791029aa 100644
+index 203c58977b05f9191b8b02f5f15f38f4977a8f02..c5e20847f609ad6e21c84a2aaa7f932956995863 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -82,6 +82,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -101,6 +101,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public LogToConsole logToConsole;
      public class LogToConsole extends ConfigurationPart.Post { // Gale - EMC - softly log invalid pool element errors
  

patches/server/0074-Make-logging-login-locations-configurable.patch

@@ -31,10 +31,10 @@ index 8a59fade265e586622bcaa2cab2772613f9391aa..b4c97cf1755e95bb8f2547d0b4def2d9
  
      public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 2d8d042112db908d76da023329f16402791029aa..58f9d024f5a17c2d28d89f740e04f638fe3a2a92 100644
+index c5e20847f609ad6e21c84a2aaa7f932956995863..1cd80a98b222df886d39b62663d1060b47dbd966 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -88,6 +88,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -107,6 +107,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
          public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization

patches/server/0075-Reduce-array-allocations.patch

@@ -479,7 +479,7 @@ index 89aaa846d5cb1cfd8ccf634f85bdc4180013cfd0..f69ea29648b090334d98dd8f3ed71cf8
          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 ee3acb578d4f72836eb3a4e8336701b3b939da50..60e2b951216003ae1861b1ee218e38da107b1760 100644
+index 5fcca730767294e88445e701083c07c96d740147..2e82442846b275d4928a0905e4d5a4bbfa752d9b 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;
@@ -507,7 +507,7 @@ index ee3acb578d4f72836eb3a4e8336701b3b939da50..60e2b951216003ae1861b1ee218e38da
  import net.minecraft.world.level.block.state.BlockState;
  import net.minecraft.world.phys.AABB;
  import net.minecraft.world.phys.BlockHitResult;
-@@ -224,8 +224,6 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
+@@ -225,8 +225,6 @@ import org.bukkit.event.inventory.InventoryCreativeEvent;
  import org.bukkit.event.inventory.InventoryType.SlotType;
  import org.bukkit.event.inventory.SmithItemEvent;
  import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -516,7 +516,7 @@ index ee3acb578d4f72836eb3a4e8336701b3b939da50..60e2b951216003ae1861b1ee218e38da
  import org.bukkit.event.player.PlayerChatEvent;
  import org.bukkit.event.player.PlayerCommandPreprocessEvent;
  import org.bukkit.event.player.PlayerInteractAtEntityEvent;
-@@ -400,7 +398,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -401,7 +399,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -525,7 +525,7 @@ index ee3acb578d4f72836eb3a4e8336701b3b939da50..60e2b951216003ae1861b1ee218e38da
              }
          } else {
              if (elapsedTime >= 15000L) { // 15 seconds
-@@ -864,13 +862,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -865,13 +863,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
          // CraftBukkit start
          if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -541,7 +541,7 @@ index ee3acb578d4f72836eb3a4e8336701b3b939da50..60e2b951216003ae1861b1ee218e38da
              return;
          }
          // Paper end
-@@ -3251,7 +3249,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3257,7 +3255,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {

patches/server/0112-Send-multiple-keep-alive-packets.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187df12235de 100644
+index 2e82442846b275d4928a0905e4d5a4bbfa752d9b..6faa4013b8a6b44d49f90decb4ad91ad585a3549 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -49,7 +49,7 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d
  import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
  import it.unimi.dsi.fastutil.objects.ObjectIterator;
  import java.time.Duration;
-@@ -259,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -260,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private long keepAliveTime = Util.getMillis();
      private boolean keepAlivePending;
      private long keepAliveChallenge;
@@ -57,7 +57,7 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d
      // CraftBukkit start - multithreaded fields
      private final AtomicInteger chatSpamTickCount = new AtomicInteger();
      private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
-@@ -296,7 +299,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -297,7 +300,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      private final LastSeenMessagesValidator lastSeenMessages;
      private final MessageSignatureCache messageSignatureCache;
      private final FutureChain chatMessageChain;
@@ -69,7 +69,7 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d
      private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80); // Paper
  
      private String clientBrandName = null; // Paper - Brand name
-@@ -395,6 +401,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -396,6 +402,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          long currentTime = Util.getMillis();
          long elapsedTime = currentTime - this.keepAliveTime;
  
@@ -91,7 +91,7 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3453,6 +3474,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3459,6 +3480,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -109,10 +109,10 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 58f9d024f5a17c2d28d89f740e04f638fe3a2a92..e87d93e364eccc4dde3c00d34df6d63fae597b25 100644
+index 1cd80a98b222df886d39b62663d1060b47dbd966..521f134697ee40b7d5503d54fbdd7de06df6c5d0 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -77,6 +77,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -96,6 +96,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          }
  

patches/server/0113-Make-slow-login-timeout-configurable.patch

@@ -31,10 +31,10 @@ index 2ed3f42b1e487374287d033ac634a922a5ef37bd..af96c170c58553f4ce0554c9bd24fea2
          }
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index e87d93e364eccc4dde3c00d34df6d63fae597b25..d0ca76c0087e7cf309a452f50888dc0ef419ed53 100644
+index 521f134697ee40b7d5503d54fbdd7de06df6c5d0..b1ead236d2e3d3cc9817ce978904883aec0bc204 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -42,6 +42,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -61,6 +61,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public Misc misc;
      public class Misc extends ConfigurationPart {
  

patches/server/0114-Make-max-interaction-distance-configurable.patch

@@ -20,18 +20,10 @@ index 58b093bb1de78ee3b3b2ea364aa50474883f443a..7be34e5df2b6d33c1d7943c9c0b6fd06
              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 315c7737f75c426a7e5c091fb340187df12235de..9e45e69b16f483d1b94b21f4510d056eb0ceb8b1 100644
+index 6faa4013b8a6b44d49f90decb4ad91ad585a3549..171ee521040d1e971a39eac2a748937a41dcf6e5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -184,7 +184,6 @@ import net.minecraft.world.phys.Vec3;
+@@ -250,7 +250,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- import net.minecraft.world.phys.shapes.BooleanOp;
- import net.minecraft.world.phys.shapes.Shapes;
- import net.minecraft.world.phys.shapes.VoxelShape;
--import org.apache.commons.lang3.StringUtils;
- import org.galemc.gale.configuration.GaleGlobalConfiguration;
- import org.slf4j.Logger;
- 
-@@ -249,7 +248,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      static final Logger LOGGER = LogUtils.getLogger();
      private static final int LATENCY_CHECK_INTERVAL = 15000;
@@ -40,7 +32,7 @@ index 315c7737f75c426a7e5c091fb340187df12235de..9e45e69b16f483d1b94b21f4510d056e
      private static final int NO_BLOCK_UPDATES_TO_ACK = -1;
      private static final int TRACKED_MESSAGE_DISCONNECT_THRESHOLD = 4096;
      private static final Component CHAT_VALIDATION_FAILED = Component.translatable("multiplayer.disconnect.chat_validation_failed");
-@@ -346,6 +345,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -347,6 +347,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
      // CraftBukkit end
  
@@ -54,7 +46,7 @@ index 315c7737f75c426a7e5c091fb340187df12235de..9e45e69b16f483d1b94b21f4510d056e
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -1962,7 +1968,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1968,7 +1975,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              BlockPos blockposition = movingobjectpositionblock.getBlockPos();
              Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
  
@@ -63,7 +55,7 @@ index 315c7737f75c426a7e5c091fb340187df12235de..9e45e69b16f483d1b94b21f4510d056e
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  
-@@ -2777,7 +2783,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2783,7 +2790,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  return;
              }
  

patches/server/0119-Ignore-null-legacy-structure-data.patch

@@ -46,10 +46,10 @@ index 3b2df0411f9ef85445a53292a65f805a80218979..99126888d4ccae266e55ed3d9ed858fb
                          continue;
                      }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index d0ca76c0087e7cf309a452f50888dc0ef419ed53..75f3ca0b8fed2fbc9219045d2b28999d0a592064 100644
+index b1ead236d2e3d3cc9817ce978904883aec0bc204..1ee1c66710559da9cb7c2b41a5911470a5d14fcc 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -56,6 +56,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -75,6 +75,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public int premiumAccountSlowLoginTimeout = -1;
          // Gale end - make slow login timeout configurable
  

patches/server/0130-Show-last-tick-time-in-tps-command.patch

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 75f3ca0b8fed2fbc9219045d2b28999d0a592064..c530e10f0de3dee69949e1752f0b27180d9b2fe5 100644
+index 1ee1c66710559da9cb7c2b41a5911470a5d14fcc..0764acc8f254814e7308c3c21da072107c1b2487 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -111,6 +111,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -130,6 +130,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          }
  

patches/server/0131-Increase-time-statistics-in-intervals.patch

@@ -87,7 +87,7 @@ index 68247b9daf710c71f84e1fae9d91efed151d39aa..92b30f5293e80e078d8a1a740d22367e
  
          int i = 29999999;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index c530e10f0de3dee69949e1752f0b27180d9b2fe5..a7f1be75344f5f4d20d7561704a20a90a7db8a66 100644
+index 0764acc8f254814e7308c3c21da072107c1b2487..e6cd22031e3a9b77c244bf5781216f794b191ab3 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -27,7 +27,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0138-CPU-cores-estimation.patch

@@ -68,10 +68,10 @@ index b9a799997e3475117ab91d7f3edb5f2f243a9f6b..e23fdd5ba09b50b7eef0ca4f36c54807
  import org.yaml.snakeyaml.constructor.SafeConstructor;
  import org.yaml.snakeyaml.error.MarkedYAMLException;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index a7f1be75344f5f4d20d7561704a20a90a7db8a66..1452704bc21ca859261169431d2d36a90d5f1e3f 100644
+index e6cd22031e3a9b77c244bf5781216f794b191ab3..9ee138fe1d943b7057a9b84c5e69527856d1f4b9 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -153,6 +153,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -172,6 +172,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
          public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
          public boolean playerLoginLocations = true; // Gale - JettPack - make logging login location configurable