feat: more packets

Author: hamusuke0323

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

@@ -36,7 +36,19 @@ private DataHighlightInstruction(Map<Integer, Integer> highlightOrders, List<Buf
     public List<Highlight<?>> write(int curWriterIndex, @Nullable B receivedByteBuf, B buf, V value) {
         List<Highlight<?>> highlights = Lists.newArrayList();
 
+        boolean ignoreRemaining = false;
+
         for (var instruction : this.instructions) {
+            if (instruction instanceof RestartInstruction) {
+                ignoreRemaining = false; // resume
+                continue;
+            }
+
+            if (ignoreRemaining) {
+                highlights.add(NO_HIGHLIGHT);
+                continue;
+            }
+
             if (instruction instanceof SameRefInstruction<?, ?> sameRef) {
                 highlights.add(highlights.get(sameRef.getHighlightIndex())); // Same as the previous highlight specified by the index.
                 continue;
@@ -56,7 +68,7 @@ public List<Highlight<?>> write(int curWriterIndex, @Nullable B receivedByteBuf,
             }
 
             if (!instruction.shouldContinue(receivedByteBuf, value)) {
-                break;
+                ignoreRemaining = true;
             }
         }
 
@@ -115,6 +127,11 @@ public DataHighlightInstructionBuilder<B, T> sameAs(int highlightIndex) {
             return this;
         }
 
+        public DataHighlightInstructionBuilder<B, T> restart() {
+            this.instructions.add(RestartInstruction.INSTANCE);
+            return this;
+        }
+
         public <V> DataHighlightInstructionBuilder<B, T> constant(Descriptor<? super B, V> descriptor) {
             return this.constant(descriptor.withDescription(v -> ""));
         }
@@ -185,11 +202,11 @@ public <V> DataHighlightInstructionBuilder<B, T> jsonCodec(Codec<V> codec, Funct
             return this;
         }
 
-        public <V> DataHighlightInstructionBuilder<B, T> packetCodec(PacketCodec<B, V> codec, Function<T, V> fieldGetter) {
+        public <V> DataHighlightInstructionBuilder<B, T> packetCodec(PacketCodec<? super B, V> codec, Function<T, V> fieldGetter) {
             return this.packetCodec(codec, v -> "", fieldGetter);
         }
 
-        public <V> DataHighlightInstructionBuilder<B, T> packetCodec(PacketCodec<B, V> codec, Function<V, String> descriptor, Function<T, V> fieldGetter) {
+        public <V> DataHighlightInstructionBuilder<B, T> packetCodec(PacketCodec<? super B, V> codec, Function<V, String> descriptor, Function<T, V> fieldGetter) {
             this.instructions.add(BufInstruction.writeAndGuess((byteBuf, o) -> codec.encode(byteBuf, fieldGetter.apply(o)), o -> descriptor.apply(fieldGetter.apply(o))));
             return this;
         }