Effectively remove chunk sending speed limit, small refactor in sign …

…logging code
kivattt · Feb 15, 2024 · 0443e92 · 0443e92
1 parent 5eea66f
commit 0443e92
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@
 - Adds a stricter mob cap which allows mobs to be enabled for servers without lag
 - Improved logging for chests and crates, see items being taken/added
 - Fixes 100% CPU usage on 1 core
+- Effectively removes the speed limit on sending chunks
 - Explosions (TNT, Creepers, Dynamite etc.) don't break chests/crates. (Configurable!)
 - Improved logging for players throwing dynamite
 - [Region protection](https://www.youtube.com/watch?v=HaCgemz3Sus) to prevent griefing of specific areas

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
 apply plugin: 'foxloader.dev'
 
-version '1.7.1'
+version '1.7.2'
 
 foxloader {
     // forceReload = true

diff --git a/src/main/java/com/kiva/kivaserverutils/KivaServerUtils.java b/src/main/java/com/kiva/kivaserverutils/KivaServerUtils.java
@@ -33,7 +33,7 @@ public class KivaServerUtils extends Mod {
     public static LinkedHashMap<String, String> nameColorChoicesNames = new LinkedHashMap<>();
     public static LinkedHashMap<String, String> flagColorChoicesNames = new LinkedHashMap<>();
     public static LinkedHashMap<String, String> pronounColorChoicesNames = new LinkedHashMap<>();
-    public static String version = "1.7.1";
+    public static String version = "1.7.2";
     public static String KSUBroadcastPrefix = ChatColors.DARK_GRAY + "[" + ChatColors.GRAY + "KSU" + ChatColors.DARK_GRAY + "] " + ChatColors.RESET;
 
     public static String handleWindowClickLatestPlayerUsername;

diff --git a/src/server/java/com/kiva/kivaserverutils/server/mixins/MixinEntityPlayerMP.java b/src/server/java/com/kiva/kivaserverutils/server/mixins/MixinEntityPlayerMP.java
@@ -6,7 +6,9 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(EntityPlayerMP.class)
@@ -19,6 +21,16 @@ public void onHandleFalling(double arg1, boolean arg3, CallbackInfo ci){
             ci.cancel();
     }
 
+    @ModifyConstant(method = "onUpdateEntity", constant = @Constant(intValue = 24))
+    private int removeChunkSendingLimits1(int value){
+        return Integer.MAX_VALUE;
+    }
+
+    @ModifyConstant(method = "onUpdateEntity", constant = @Constant(intValue = 40))
+    private int removeChunkSendingLimits2(int value){
+        return Integer.MAX_VALUE;
+    }
+
     // Scrapped code to add nicknames to death msgs, this might come in a later update to KivaServerUtils
     /*
     @ModifyArg(method = "onDeath", at = @At(value = "INVOKE", target = "Lnet/minecraft/src/server/ServerConfigurationManager;sendPacketToAllPlayers(Lnet/minecraft/src/server/packets/Packet;)V"))

diff --git a/src/server/java/com/kiva/kivaserverutils/server/mixins/MixinNetServerHandler.java b/src/server/java/com/kiva/kivaserverutils/server/mixins/MixinNetServerHandler.java
@@ -96,18 +96,20 @@ public void onEditSign(Packet130UpdateSign packet130UpdateSign, CallbackInfo ci)
         }
 
         StringBuilder signText = new StringBuilder();
-        for (String line : packet130UpdateSign.signLines) {
-            boolean discard = line.length() > 15;
-
-            for (int i = 0; i < line.length(); i++){
-                if (ChatAllowedCharacters.allowedCharacters.indexOf(line.charAt(i)) < 0) {
-                    discard = true;
-                    break;
-                }
+
+        for (int i = 0; i < Math.min(4, packet130UpdateSign.signLines.length); i++){
+            String line = packet130UpdateSign.signLines[i];
+            if (line.length() > 15)
+                continue;
+
+            for (int j = 0; j < line.length(); j++){
+                if (ChatAllowedCharacters.allowedCharacters.indexOf(line.charAt(j)) < 0)
+                    continue;
+
+                signText.append(line.charAt(j));
             }
 
-            if (!discard)
-                signText.append(line).append("\n");
+            signText.append("\n");
         }
 
         ServerMod.getGameInstance().logWarning(playerEntity.username + " placed/edited sign @ x:" + packet130UpdateSign.xPosition + ", y:" + packet130UpdateSign.yPosition + ", z:" + packet130UpdateSign.zPosition + " with text:\n" + signText);