updates from upstream zenith

Author: rfresh2

src/main/java/org/example/command/ExampleESPCommand.java

@@ -10,7 +10,7 @@
 import org.example.ExamplePlugin;
 import org.example.module.ExampleESPModule;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
-import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
 
@@ -44,7 +44,7 @@ public LiteralArgumentBuilder<CommandContext> register() {
                         EntityMetadata<?, ?> toSend;
                         toSend = e.getMetadata().get(0);
                         if (toSend == null)
-                            toSend = new ByteEntityMetadata(0, MetadataType.BYTE, (byte) 0);
+                            toSend = new ByteEntityMetadata(0, MetadataTypes.BYTE, (byte) 0);
                         player.sendAsync(new ClientboundSetEntityDataPacket(e.getEntityId(), Lists.newArrayList(toSend)));
                     });
                 }

src/main/java/org/example/module/ExampleESPModule.java

@@ -8,7 +8,7 @@
 import org.example.ExamplePlugin;
 import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
-import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
 
@@ -22,15 +22,15 @@ public boolean enabledSetting() {
 
     @Override
     public PacketHandlerCodec registerServerPacketHandlerCodec() {
-        return PacketHandlerCodec.builder()
+        return PacketHandlerCodec.serverBuilder()
             .setId("esp")
             .setPriority(1000)
-            .state(ProtocolState.GAME, PacketHandlerStateCodec.<ServerSession>builder()
+            .state(ProtocolState.GAME, PacketHandlerStateCodec.serverBuilder()
                 // packet classes can and will change between MC versions
                 // if you want to have packet handlers you probably need separate plugin builds for each MC version
                 .registerInbound(ClientboundSetEntityDataPacket.class, new GlowingEntityMetadataPacketHandler())
                 // or with in-line lambda:
-//                .registerOutbound(ClientboundSetEntityDataPacket.class, (ClientboundSetEntityDataPacket packet, ServerSession session) -> {
+//                .registerOutbound(ClientboundSetEntityDataPacket.class, (packet, ServerSession session) -> {
 //                    ClientboundSetEntityDataPacket p = packet;
 //                    ...more impl...
 //                    return p;
@@ -52,9 +52,9 @@ public ClientboundSetEntityDataPacket apply(final ClientboundSetEntityDataPacket
             for (int i = 0; i < metadata.size(); i++) {
                 final EntityMetadata<?, ?> entityMetadata = metadata.get(i);
                 // https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Entity_metadata#Entity
-                if (entityMetadata.getId() == 0 && entityMetadata.getType() == MetadataType.BYTE) {
+                if (entityMetadata.getId() == 0 && entityMetadata.getType() == MetadataTypes.BYTE) {
                     ByteEntityMetadata byteMetadata = (ByteEntityMetadata) entityMetadata;
-                    var newMetadata = new ByteEntityMetadata(0, MetadataType.BYTE, (byte) (byteMetadata.getPrimitiveValue() | 0x40));
+                    var newMetadata = new ByteEntityMetadata(0, MetadataTypes.BYTE, (byte) (byteMetadata.getPrimitiveValue() | 0x40));
                     var newMetadataList = new ArrayList<>(metadata);
                     newMetadataList.set(i, newMetadata);
                     p = packet.withMetadata(newMetadataList);
@@ -65,7 +65,7 @@ public ClientboundSetEntityDataPacket apply(final ClientboundSetEntityDataPacket
             if (!edited) {
                 var newMetadata = new ArrayList<EntityMetadata<?, ?>>(metadata.size() + 1);
                 newMetadata.addAll(packet.getMetadata());
-                newMetadata.add(new ByteEntityMetadata(0, MetadataType.BYTE, (byte) 0x40));
+                newMetadata.add(new ByteEntityMetadata(0, MetadataTypes.BYTE, (byte) 0x40));
                 p = packet.withMetadata(newMetadata);
             }
             return p;