Fix incorrect packet handling

Release 0.3.1
HypixelDev · Apr 13, 2024 · da7897c · da7897c
1 parent 6acb9ff
commit da7897c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -32,12 +32,12 @@ You can then include the dependency in your project.
 <dependency>
     <groupId>net.hypixel</groupId>
     <artifactId>mod-api</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
 </dependency>
 ```
 
 ```gradle
 dependencies {
-    implementation 'net.hypixel:mod-api:0.3.0'
+    implementation 'net.hypixel:mod-api:0.3.1'
 }
 ```
diff --git a/src/main/java/net/hypixel/modapi/HypixelModAPI.java b/src/main/java/net/hypixel/modapi/HypixelModAPI.java
@@ -3,7 +3,7 @@
 import net.hypixel.modapi.error.ErrorReason;
 import net.hypixel.modapi.error.ModAPIException;
 import net.hypixel.modapi.handler.ClientboundPacketHandler;
-import net.hypixel.modapi.packet.HypixelPacket;
+import net.hypixel.modapi.packet.ClientboundHypixelPacket;
 import net.hypixel.modapi.packet.PacketRegistry;
 import net.hypixel.modapi.packet.impl.clientbound.ClientboundLocationPacket;
 import net.hypixel.modapi.packet.impl.clientbound.ClientboundPartyInfoPacket;
@@ -66,9 +66,9 @@ public void handle(String identifier, PacketSerializer serializer) {
             throw new ModAPIException(identifier, reason);
         }
 
-        HypixelPacket packet = registry.createClientboundPacket(identifier, serializer);
+        ClientboundHypixelPacket packet = registry.createClientboundPacket(identifier, serializer);
         for (ClientboundPacketHandler handler : handlers) {
-            handler.handle(packet);
+            packet.handle(handler);
         }
     }
 

diff --git a/src/main/java/net/hypixel/modapi/handler/ClientboundPacketHandler.java b/src/main/java/net/hypixel/modapi/handler/ClientboundPacketHandler.java
@@ -5,7 +5,7 @@
 import net.hypixel.modapi.packet.impl.clientbound.ClientboundPingPacket;
 import net.hypixel.modapi.packet.impl.clientbound.ClientboundPlayerInfoPacket;
 
-public interface ClientboundPacketHandler extends PacketHandler {
+public interface ClientboundPacketHandler {
 
     default void onPingPacket(ClientboundPingPacket packet) {
     }

diff --git a/src/main/java/net/hypixel/modapi/handler/PacketHandler.java b/src/main/java/net/hypixel/modapi/handler/PacketHandler.java
diff --git a/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundLocationPacket.java b/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundLocationPacket.java
@@ -77,7 +77,7 @@ public void write(PacketSerializer serializer) {
 
     @Override
     public void handle(ClientboundPacketHandler handler) {
-        handler.handle(this);
+        handler.onLocationPacket(this);
     }
 
     public Environment getEnvironment() {

diff --git a/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundPartyInfoPacket.java b/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundPartyInfoPacket.java
@@ -58,7 +58,7 @@ public void write(PacketSerializer serializer) {
 
     @Override
     public void handle(ClientboundPacketHandler handler) {
-        handler.handle(this);
+        handler.onPartyInfoPacket(this);
     }
 
     public boolean isInParty() {

diff --git a/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundPingPacket.java b/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundPingPacket.java
@@ -28,7 +28,7 @@ public void write(PacketSerializer serializer) {
 
     @Override
     public void handle(ClientboundPacketHandler handler) {
-        handler.handle(this);
+        handler.onPingPacket(this);
     }
 
     public String getResponse() {

diff --git a/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundPlayerInfoPacket.java b/src/main/java/net/hypixel/modapi/packet/impl/clientbound/ClientboundPlayerInfoPacket.java
@@ -50,7 +50,7 @@ public void write(PacketSerializer serializer) {
 
     @Override
     public void handle(ClientboundPacketHandler handler) {
-        handler.handle(this);
+        handler.onPlayerInfoPacket(this);
     }
 
     public PlayerRank getPlayerRank() {