feat: more packets

Author: hamusuke0323

build.gradle

@@ -32,6 +32,7 @@ loom {
 		}
 	}
 
+    accessWidenerPath = file("src/main/resources/packetcapture.accesswidener")
 }
 
 dependencies {

src/client/java/com/hamusuke/packetcap/PacketCapture.java

@@ -7,6 +7,7 @@
 import com.google.common.collect.Sets;
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonWriter;
+import com.hamusuke.packetcap.clazz.visitor.ClassVisitor;
 import com.hamusuke.packetcap.filter.FilterType;
 import com.hamusuke.packetcap.filter.PacketFilter;
 import com.hamusuke.packetcap.gui.hud.PacketCaptureHud;
@@ -18,7 +19,6 @@
 import fuzs.forgeconfigapiport.fabric.api.forge.v4.ForgeConfigRegistry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.util.ReferenceCountUtil;
 import it.unimi.dsi.fastutil.Pair;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
@@ -248,6 +248,12 @@ public <T extends PacketListener> void onEncodingPacketInMultiplayer(NetworkStat
         }
 
         var copied = byteBuf.copy();
+        if (this.isPacketTrash(packet)) {
+            this.sentPacketNum.incrementAndGet();
+            this.sentBytes.addAndGet(copied.readableBytes());
+            copied.release();
+            return;
+        }
 
         CompletableFuture.supplyAsync(() -> {
                     int packetId = -1;
@@ -259,6 +265,8 @@ public <T extends PacketListener> void onEncodingPacketInMultiplayer(NetworkStat
                     return new PacketDetails(packet, copied, packetId, end, this.createHighlights(null, packet, end));
                 }, SENT_PACKET_DETAIL_RETRIEVER)
                 .whenComplete((dedicatedServerPacketDetails, throwable) -> {
+                    copied.release();
+
                     if (throwable != null) {
                         LOGGER.warn("Error occurred while creating packet details", throwable);
                     }
@@ -273,7 +281,7 @@ public <T extends PacketListener> void onDecodingPacketInMultiplayer(NetworkStat
         }
 
         var byteBuf = buf.copy();
-        var delivered = byteBuf.copy();
+        var delivered = buf.copy();
 
         CompletableFuture.supplyAsync(() -> {
                     int i = byteBuf.readableBytes();
@@ -286,6 +294,12 @@ public <T extends PacketListener> void onDecodingPacketInMultiplayer(NetworkStat
                         return null;
                     }
 
+                    if (this.isPacketTrash(packet)) {
+                        this.receivedPacketNum.incrementAndGet();
+                        this.receivedBytes.addAndGet(delivered.readableBytes());
+                        return null;
+                    }
+
                     int packetId = -1;
                     if (protocolInfo.codec() instanceof PacketCodecDispatcherAccessor codec) {
                         packetId = codec.getTypeToIndex().getOrDefault(codec.getPacketIdGetter().apply(packet), -1);
@@ -296,7 +310,8 @@ public <T extends PacketListener> void onDecodingPacketInMultiplayer(NetworkStat
                     return new PacketDetails(packet, delivered, packetId, end, this.createHighlights(byteBuf, packet, end));
                 }, RECEIVED_PACKET_DETAIL_RETRIEVER)
                 .whenComplete((details, throwable) -> {
-                    ReferenceCountUtil.release(byteBuf);
+                    byteBuf.release();
+                    delivered.release();
 
                     if (throwable != null) {
                         LOGGER.warn("Error occurred while creating packet details", throwable);
@@ -308,6 +323,11 @@ public <T extends PacketListener> void onDecodingPacketInMultiplayer(NetworkStat
                 });
     }
 
+    private boolean isPacketTrash(Packet<?> packet) {
+        var clazz = ClassVisitor.getClassName(packet.getClass());
+        return this.trash(this.classNameDeobfuscater.deobfuscate(clazz));
+    }
+
     public synchronized void loadFilters() {
         var file = this.filterConfig.toFile();
         if (!file.getParentFile().exists()) {

src/client/java/com/hamusuke/packetcap/PacketDetails.java

@@ -34,7 +34,6 @@ public PacketDetails(Packet<?> packet, ByteBuf data, int packetId, int packetIdE
         this.hex = ImmutableList.copyOf(ByteBufUtil.prettyHexDump(data).lines().toList());
         this.size = data.readableBytes();
         this.fSize = ByteConversion.convertBytes(this.size);
-        data.release();
 
         this.packetId = packetId;
         this.packetIdEndIndex = packetIdEndIndex;

src/client/java/com/hamusuke/packetcap/clazz/visitor/ClassVisitor.java

@@ -38,7 +38,7 @@ private static List<Field> getFields(Class<?> clazz) {
         return fields;
     }
 
-    private static String getClassName(Class<?> clazz) {
+    public static String getClassName(Class<?> clazz) {
         var stringBuilder = new StringBuilder();
         var enclosingClass = clazz.getEnclosingClass();
         if (enclosingClass != null) {

src/client/java/com/hamusuke/packetcap/gui/screen/PacketDetailsScreen.java

@@ -9,6 +9,7 @@
 import com.hamusuke.packetcap.gui.components.ClassFieldList.HasClassField;
 import com.hamusuke.packetcap.highlight.Highlight;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.tooltip.HoveredTooltipPositioner;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -20,6 +21,7 @@
 import org.joml.Vector2i;
 
 import java.util.Map;
+import java.util.Optional;
 
 public class PacketDetailsScreen extends Screen {
     private static final Text ADD_TO_FILTER = Text.translatable(PacketCapture.MOD_ID + ".add_to_filter");
@@ -115,7 +117,15 @@ private void renderHexDump(DrawContext gui, int mouseX, int mouseY, float v) {
 
     private void renderHighlightWhenHoveredField(DrawContext gui, int mouseX, int mouseY) {
         if (this.packetFields.isMouseOver(mouseX, mouseY)) {
-            var e = this.packetFields.hoveredElement(mouseX, mouseY);
+            Optional<Element> e = Optional.empty();
+
+            for (var c : this.packetFields.children()) {
+                if (c.isMouseOver(mouseX, mouseY)) {
+                    e = Optional.of(c);
+                    break;
+                }
+            }
+
             e.filter(guiEventListener -> guiEventListener instanceof HasClassField).ifPresent(guiEventListener -> {
                 var hasClassField = (HasClassField) guiEventListener;
                 var name = hasClassField.getField().getName();

src/client/java/com/hamusuke/packetcap/highlight/DataHighlightInstruction.java

@@ -19,6 +19,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import static com.hamusuke.packetcap.highlight.Highlight.NO_HIGHLIGHT;
 import static com.hamusuke.packetcap.highlight.Highlight.getWrittenByteLen;
 import static com.hamusuke.packetcap.highlight.instruction.BasicInstructions.VAR_INT;
 
@@ -67,19 +68,18 @@ protected List<Highlight<?>> sortAllHighlights(List<Highlight<?>> unordered) {
             return unordered;
         }
 
-        List<Highlight<?>> highlights = new ArrayList<>(unordered);
+        Map<Integer, Highlight<?>> highlights = Maps.newTreeMap();
         for (int i = 0; i < unordered.size(); i++) {
             if (!this.highlightOrders.containsKey(i)) {
+                highlights.put(i, unordered.get(i));
                 continue;
             }
 
             int fieldIndex = this.highlightOrders.get(i);
-            var highlight = unordered.get(fieldIndex);
-            highlights.set(fieldIndex, unordered.get(i));
-            highlights.set(i, highlight);
+            highlights.put(fieldIndex, unordered.get(i));
         }
 
-        return highlights;
+        return List.copyOf(highlights.values());
     }
 
     public static class DataHighlightInstructionBuilder<B extends ByteBuf, T> {
@@ -101,12 +101,12 @@ public static <B extends ByteBuf, T> DataHighlightInstructionBuilder<B, T> build
         }
 
         public DataHighlightInstructionBuilder<B, T> indexed(int fieldIndex) {
-            this.highlightOrders.put(this.instructionIndex.get(), fieldIndex);
+            this.highlightOrders.putIfAbsent(this.instructionIndex.get(), fieldIndex);
             return this;
         }
 
         public DataHighlightInstructionBuilder<B, T> notBeWritten() {
-            this.instructions.add((curWriterIndex, receivedByteBuf, buf, value) -> List.of());
+            this.instructions.add((curWriterIndex, receivedByteBuf, buf, value) -> Collections.singletonList(NO_HIGHLIGHT));
             return this;
         }