1.1.11: Use Limbo#registerPacket

Author: JNNGL

VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 setGroup("net.elytrium")
-setVersion("1.1.10")
+setVersion("1.1.11")
 
 compileJava {
     getOptions().setEncoding("UTF-8")

gradle.properties

@@ -1,4 +1,4 @@
-limboapiVersion=1.1.4
+limboapiVersion=1.1.14
 velocityVersion=3.2.0-SNAPSHOT
 nettyVersion=4.1.86.Final
 fastutilVersion=8.5.11

src/main/java/net/elytrium/limbofilter/LimboFilter.java

@@ -137,40 +137,6 @@ public LimboFilter(Logger logger, ProxyServer server, Metrics.Factory metricsFac
   public void onProxyInitialization(ProxyInitializeEvent event) {
     Settings.IMP.setLogger(LOGGER);
 
-    this.limboFactory.registerPacket(PacketDirection.SERVERBOUND, Interact.class, Interact::new, new PacketMapping[]{
-        new PacketMapping(0x02, ProtocolVersion.MINIMUM_VERSION, false),
-        new PacketMapping(0x0A, ProtocolVersion.MINECRAFT_1_9, false),
-        new PacketMapping(0x0B, ProtocolVersion.MINECRAFT_1_12, false),
-        new PacketMapping(0x0A, ProtocolVersion.MINECRAFT_1_12_1, false),
-        new PacketMapping(0x0D, ProtocolVersion.MINECRAFT_1_13, false),
-        new PacketMapping(0x0E, ProtocolVersion.MINECRAFT_1_14, false),
-        new PacketMapping(0x0D, ProtocolVersion.MINECRAFT_1_17, false),
-        new PacketMapping(0x0F, ProtocolVersion.MINECRAFT_1_19, false),
-        new PacketMapping(0x10, ProtocolVersion.MINECRAFT_1_19_1, false),
-        new PacketMapping(0x0F, ProtocolVersion.MINECRAFT_1_19_3, false),
-        new PacketMapping(0x10, ProtocolVersion.MINECRAFT_1_19_4, false),
-    });
-
-    this.limboFactory.registerPacket(PacketDirection.CLIENTBOUND, SetEntityMetadata.class, SetEntityMetadata::new, new PacketMapping[]{
-        new PacketMapping(0x1C, ProtocolVersion.MINIMUM_VERSION, true),
-        new PacketMapping(0x39, ProtocolVersion.MINECRAFT_1_9, true),
-        new PacketMapping(0x3B, ProtocolVersion.MINECRAFT_1_12, true),
-        new PacketMapping(0x3C, ProtocolVersion.MINECRAFT_1_12_1, true),
-        new PacketMapping(0x3F, ProtocolVersion.MINECRAFT_1_13, true),
-        new PacketMapping(0x43, ProtocolVersion.MINECRAFT_1_14, true),
-        new PacketMapping(0x44, ProtocolVersion.MINECRAFT_1_15, true),
-        new PacketMapping(0x4D, ProtocolVersion.MINECRAFT_1_17, true),
-        new PacketMapping(0x50, ProtocolVersion.MINECRAFT_1_19_1, true),
-        new PacketMapping(0x4E, ProtocolVersion.MINECRAFT_1_19_3, true),
-        new PacketMapping(0x52, ProtocolVersion.MINECRAFT_1_19_4, true),
-    });
-
-    this.limboFactory.registerPacket(PacketDirection.CLIENTBOUND, SpawnEntity.class, SpawnEntity::new, new PacketMapping[]{
-        new PacketMapping(0x0E, ProtocolVersion.MINIMUM_VERSION, true),
-        new PacketMapping(0x00, ProtocolVersion.MINECRAFT_1_9, true),
-        new PacketMapping(0x01, ProtocolVersion.MINECRAFT_1_19_4, true),
-    });
-
     this.reload();
 
     Metrics metrics = this.metricsFactory.make(this, 13699);
@@ -255,16 +221,6 @@ public void reload() {
         .repeat(Settings.IMP.MAIN.CAPTCHA_REGENERATE_RATE, TimeUnit.SECONDS)
         .schedule();
 
-    CachedPackets cachedPackets = new CachedPackets();
-    cachedPackets.createPackets(this.limboFactory, this.packetFactory);
-
-    CachedPackets previousCachedPackets = this.packets;
-    this.packets = cachedPackets;
-
-    if (previousCachedPackets != null) {
-      previousCachedPackets.dispose();
-    }
-
     this.cachedFilterChecks.clear();
 
     Settings.IMP.MAIN.WHITELISTED_PLAYERS.forEach(player -> {
@@ -308,7 +264,48 @@ public void reload() {
         .setWorldTime(Settings.IMP.MAIN.WORLD_TICKS)
         .setGameMode(Settings.IMP.MAIN.GAME_MODE)
         .setShouldRespawn(false)
-        .setShouldUpdateTags(false);
+        .setShouldUpdateTags(false)
+        .registerPacket(PacketDirection.SERVERBOUND, Interact.class, Interact::new, new PacketMapping[]{
+            new PacketMapping(0x02, ProtocolVersion.MINIMUM_VERSION, false),
+            new PacketMapping(0x0A, ProtocolVersion.MINECRAFT_1_9, false),
+            new PacketMapping(0x0B, ProtocolVersion.MINECRAFT_1_12, false),
+            new PacketMapping(0x0A, ProtocolVersion.MINECRAFT_1_12_1, false),
+            new PacketMapping(0x0D, ProtocolVersion.MINECRAFT_1_13, false),
+            new PacketMapping(0x0E, ProtocolVersion.MINECRAFT_1_14, false),
+            new PacketMapping(0x0D, ProtocolVersion.MINECRAFT_1_17, false),
+            new PacketMapping(0x0F, ProtocolVersion.MINECRAFT_1_19, false),
+            new PacketMapping(0x10, ProtocolVersion.MINECRAFT_1_19_1, false),
+            new PacketMapping(0x0F, ProtocolVersion.MINECRAFT_1_19_3, false),
+            new PacketMapping(0x10, ProtocolVersion.MINECRAFT_1_19_4, false),
+        })
+        .registerPacket(PacketDirection.CLIENTBOUND, SetEntityMetadata.class, SetEntityMetadata::new, new PacketMapping[]{
+            new PacketMapping(0x1C, ProtocolVersion.MINIMUM_VERSION, true),
+            new PacketMapping(0x39, ProtocolVersion.MINECRAFT_1_9, true),
+            new PacketMapping(0x3B, ProtocolVersion.MINECRAFT_1_12, true),
+            new PacketMapping(0x3C, ProtocolVersion.MINECRAFT_1_12_1, true),
+            new PacketMapping(0x3F, ProtocolVersion.MINECRAFT_1_13, true),
+            new PacketMapping(0x43, ProtocolVersion.MINECRAFT_1_14, true),
+            new PacketMapping(0x44, ProtocolVersion.MINECRAFT_1_15, true),
+            new PacketMapping(0x4D, ProtocolVersion.MINECRAFT_1_17, true),
+            new PacketMapping(0x50, ProtocolVersion.MINECRAFT_1_19_1, true),
+            new PacketMapping(0x4E, ProtocolVersion.MINECRAFT_1_19_3, true),
+            new PacketMapping(0x52, ProtocolVersion.MINECRAFT_1_19_4, true),
+        })
+        .registerPacket(PacketDirection.CLIENTBOUND, SpawnEntity.class, SpawnEntity::new, new PacketMapping[]{
+            new PacketMapping(0x0E, ProtocolVersion.MINIMUM_VERSION, true),
+            new PacketMapping(0x00, ProtocolVersion.MINECRAFT_1_9, true),
+            new PacketMapping(0x01, ProtocolVersion.MINECRAFT_1_19_4, true),
+        });
+
+    CachedPackets cachedPackets = new CachedPackets();
+    cachedPackets.createPackets(this.limboFactory, this.packetFactory);
+
+    CachedPackets previousCachedPackets = this.packets;
+    this.packets = cachedPackets;
+
+    if (previousCachedPackets != null) {
+      previousCachedPackets.dispose();
+    }
 
     CommandManager manager = this.server.getCommandManager();
     manager.unregister("limbofilter");