Network optimization 2

src/main/java/tanks/Game.java

@@ -135,6 +135,7 @@ public int hashCode()
     public static boolean drawFaces = false;
     public static boolean drawAvoidObjects = false;
     public static boolean recordMovableData = false;
+    public static boolean recordEventData = false;
     public static final boolean cinematic = false;
 
     public static long steamLobbyInvite = -1;
@@ -159,7 +160,7 @@ public int hashCode()
 
     public static boolean vsync = true;
     public static int maxFPS = 0;
-    public static int networkRate = 60;
+    public static int networkRate = 20;
 
     public static boolean enable3d = true;
     public static boolean enable3dBg = true;

src/main/java/tanks/Panel.java

@@ -3,11 +3,9 @@
 import basewindow.InputCodes;
 import tanks.extension.Extension;
 import tanks.gui.*;
-import tanks.gui.ScreenElement.CenterMessage;
-import tanks.gui.ScreenElement.Notification;
+import tanks.gui.ScreenElement.*;
 import tanks.gui.screen.*;
-import tanks.gui.screen.leveleditor.ScreenLevelEditor;
-import tanks.gui.screen.leveleditor.ScreenLevelEditorOverlay;
+import tanks.gui.screen.leveleditor.*;
 import tanks.item.Item;
 import tanks.network.*;
 import tanks.network.event.*;
@@ -16,8 +14,7 @@
 import tanks.rendering.*;
 import tanks.tank.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.*;
 
 public class Panel
 {
@@ -911,6 +908,15 @@ public void draw()
             this.drawBar();
         }
 
+        if (Game.recordEventData && (ScreenPartyHost.isServer || ScreenPartyLobby.isClient))
+        {
+            Drawing.drawing.setColor(255, 255, 255);
+            Drawing.drawing.setInterfaceFontSize(16);
+            double y = Drawing.drawing.getInterfaceEdgeY(true) - 20;
+            for (String s : MessageReader.eventBytesPerSecText)
+                Drawing.drawing.drawUncenteredInterfaceText(10, y -= 20, s);
+        }
+
         if (!notifications.isEmpty())
         {
             double sy = 0;

src/main/java/tanks/bullet/BulletReboundIndicator.java

@@ -27,13 +27,13 @@ public BulletReboundIndicator(Bullet b)
             Game.eventsOut.add(new EventBulletReboundIndicator(this));
     }
 
-    public BulletReboundIndicator(double posX, double posY, double posZ, double size, double maxAge, double r1, double g1, double b1, double r2, double g2, double b2)
+    public BulletReboundIndicator(double posX, double posY, double posZ, double size, double maxAge, Color color, Color color2)
     {
         super(posX, posY);
         this.posZ = posZ;
         this.size = size;
-        this.color.set(r1, g1, b1);
-        this.color2.set(r2, g2, b2);
+        this.color = color;
+        this.color2 = color2;
         this.maxAge = maxAge;
     }
 

src/main/java/tanks/gui/screen/ScreenDebug.java

@@ -30,13 +30,14 @@ public class ScreenDebug extends Screen
     Button drawAvoidObjects = createToggle("Draw avoid objects: ", b -> Game.drawAvoidObjects = b, () -> Game.drawAvoidObjects);
     Button disableFixes = createToggle("Disable fixes: ", b -> Game.disableErrorFixing = b, () -> Game.disableErrorFixing);
     Button recordMovableData = createToggle("Record movable data: ", b -> Game.recordMovableData = b, () -> Game.recordMovableData);
+    Button recordEventData = createToggle("Record event data: ", b -> Game.recordEventData = b, () -> Game.recordEventData);
 
     Button back = new Button(Drawing.drawing.interfaceSizeX / 2, Drawing.drawing.interfaceSizeY / 2 + this.objYSpace * 5, this.objWidth, this.objHeight, "Back", () -> Game.screen = new ScreenTitle());
 
     public ButtonList debugButtons = new ButtonList(new ArrayList<>(Arrays.asList(
         test, traceAllRays, firstPerson, followingCam, destroyCheat, invulnerable,
         fancyLighting, tankIDs, showPathfinding, drawFaces, showUpdatingObstacles,
-        drawAutoZoom, immutableFaces, drawAvoidObjects, disableFixes, recordMovableData
+        drawAutoZoom, immutableFaces, drawAvoidObjects, disableFixes, recordMovableData, recordEventData
     )), 0, 0, -30);
 
     public Button createToggle(String text, Consumer<Boolean> setter, Producer<Boolean> getter)

src/main/java/tanks/gui/screen/ScreenGame.java

@@ -2773,7 +2773,7 @@ public void draw()
                 }
             }
 
-            if (Crusade.crusadeMode)
+            if (Crusade.crusadeMode && Crusade.currentCrusade != null /* lag */)
             {
                 if (Level.isDark())
                     Drawing.drawing.setColor(255, 255, 255, 127);

src/main/java/tanks/network/ClientHandler.java

@@ -117,8 +117,10 @@ public synchronized void sendEvent(INetworkEvent e, boolean flush)
         e.write(b);
 
         ByteBuf b2 = ctx.channel().alloc().buffer();
-        b2.writeInt(b.readableBytes());
-        MessageReader.upstreamBytes += b.readableBytes() + 4;
+        int rb = b.readableBytes();
+        b2.writeInt(rb);
+        MessageReader.upstreamBytes += rb + 4;
+        MessageReader.eventBytes.put(i, MessageReader.eventBytes.getOrDefault(i, 0) + rb + 4);
         MessageReader.updateLastMessageTime();
         b2.writeBytes(b);
 

src/main/java/tanks/network/MessageReader.java

@@ -1,14 +1,14 @@
 package tanks.network;
 
+import io.netty.buffer.ByteBuf;
 import tanks.Game;
-import tanks.gui.screen.ScreenPartyHost;
-import tanks.gui.screen.ScreenPartyLobby;
+import tanks.gui.screen.*;
 import tanks.network.event.*;
 import tanks.network.event.online.IOnlineServerEvent;
+import tanks.translation.Translation;
 
-import io.netty.buffer.ByteBuf;
-
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class MessageReader
 {
@@ -18,8 +18,11 @@ public class MessageReader
     public static int upstreamBytes;
     public static long lastMessageTime;
 
+    public static HashMap<Integer, Integer> eventBytes = new HashMap<>();
+
     public static int upstreamBytesPerSec;
     public static int downstreamBytesPerSec;
+    public static List<String> eventBytesPerSecText = new ArrayList<>();
 
     public boolean useQueue = true;
     public ByteBuf queue;
@@ -33,7 +36,6 @@ public void queueMessage(ClientHandler c, ByteBuf m, UUID clientID)
         this.queueMessage(null, c, m, clientID);
     }
 
-
     public void queueMessage(ServerHandler s, ByteBuf m, UUID clientID)
     {
         this.queueMessage(s, null, m, clientID);
@@ -215,6 +217,11 @@ public static void updateLastMessageTime()
             lastMessageTime = time;
             upstreamBytesPerSec = upstreamBytes;
             downstreamBytesPerSec = downstreamBytes;
+            eventBytesPerSecText = eventBytes.entrySet().stream()
+                .sorted(Comparator.comparingInt(Map.Entry::getValue))
+                .map(entry -> Translation.translate("%s: %.2f KB/s", NetworkEventMap.get(entry.getKey()).getSimpleName(), entry.getValue() / 1024.))
+                .collect(Collectors.toList());
+            eventBytes.clear();
             upstreamBytes = 0;
             downstreamBytes = 0;
         }

src/main/java/tanks/network/NetworkEventMap.java

@@ -1,5 +1,6 @@
 package tanks.network;
 
+import io.netty.buffer.*;
 import tanks.Game;
 import tanks.network.event.INetworkEvent;
 
@@ -13,18 +14,45 @@ public class NetworkEventMap
 
     public static void register(Class<? extends INetworkEvent> c)
     {
+        map1.put(id, c);
+        map2.put(c, id);
+        id++;
+
+        if (!Game.debug)
+            return;
+
         try
         {
             c.getConstructor();
         }
         catch (Exception e)
         {
-            Game.exitToCrash(new RuntimeException("The network event " + c + " does not have a no-parameter constructor. Please give it one."));
+            Game.exitToCrash(new RuntimeException("The network event " + c + " does not have a no-parameter" +
+                " constructor. Please give it one."));
         }
 
-        map1.put(id, c);
-        map2.put(c, id);
-        id++;
+        ByteBuf b = Unpooled.buffer();
+        INetworkEvent e;
+        try
+        {
+            e = c.getConstructor().newInstance();
+            e.write(b);
+            e.read(b);
+            if (b.readableBytes() > 0)
+                throw new IndexOutOfBoundsException("Readable bytes > 0 after read");
+        }
+        catch (ReflectionHandle.MissingHandleException exc)
+        {
+            throw new RuntimeException("Missing handle in " + c.getSimpleName() + ": " + exc.getMessage());
+        }
+        catch (IndexOutOfBoundsException exc)
+        {
+            throw new RuntimeException("Read does not match write in " + c.getSimpleName() + ": " + exc.getMessage());
+        }
+        catch (Exception ignored)
+        {
+
+        }
     }
 
     public static int get(Class<? extends INetworkEvent> c)

src/main/java/tanks/network/NetworkUtils.java

@@ -1,11 +1,9 @@
 package tanks.network;
 
 import basewindow.Color;
-
 import io.netty.buffer.ByteBuf;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.*;
 
 public class NetworkUtils
 {