change to using functional interface for clientbound packet handling

Author: nextdayy

src/main/java/net/hypixel/modapi/HypixelModAPI.java

@@ -28,7 +28,7 @@ public static HypixelModAPI getInstance() {
  }
 
  private final PacketRegistry registry = new PacketRegistry();
- private final List<ClientboundPacketHandler> handlers = new CopyOnWriteArrayList<>();
+ private final Map<Class<? extends ClientboundHypixelPacket>, Collection<ClientboundPacketHandler<?>>> handlers = new ConcurrentHashMap<>();
  private final Set<String> subscribedEvents = ConcurrentHashMap.newKeySet();
  private Set<String> lastSubscribedEvents = Collections.emptySet();
  private Predicate<HypixelPacket> packetSender = null;
@@ -71,20 +71,16 @@ private void registerEventPackets() {
  }
 
  private void registerDefaultHandler() {
- registerHandler(new ClientboundPacketHandler() {
- @Override
- public void onHelloEvent(ClientboundHelloPacket packet) {
- sendRegisterPacket(true);
- }
- });
+ registerHandler(ClientboundHelloPacket.class, p -> sendRegisterPacket(true));
  }
 
  public PacketRegistry getRegistry() {
  return registry;
  }
 
- public void registerHandler(ClientboundPacketHandler handler) {
- handlers.add(handler);
+ public <T extends ClientboundHypixelPacket> void registerHandler(Class<T> packetClass, ClientboundPacketHandler<T> handler) {
+ if (packetClass == null || handler == null) return;
+ handlers.computeIfAbsent(packetClass, cls -> new CopyOnWriteArrayList<>()).add(handler);
  }
 
  public void subscribeToEventPacket(Class<? extends EventPacket> packet) {
@@ -135,7 +131,10 @@ public void handle(String identifier, PacketSerializer serializer) {
  }
 
  public void handle(ClientboundHypixelPacket packet) {
- for (ClientboundPacketHandler handler : handlers) {
+ Collection<ClientboundPacketHandler<?>> typedHandlers = handlers.get(packet.getClass());
+ // nothing registered for this packet.
+ if (typedHandlers == null) return;
+ for (ClientboundPacketHandler<?> handler : typedHandlers) {
  packet.handle(handler);
  }
  }

src/main/java/net/hypixel/modapi/handler/ClientboundPacketHandler.java

@@ -1,25 +1,8 @@
 package net.hypixel.modapi.handler;
 
-import net.hypixel.modapi.packet.impl.clientbound.ClientboundHelloPacket;
-import net.hypixel.modapi.packet.impl.clientbound.ClientboundPartyInfoPacket;
-import net.hypixel.modapi.packet.impl.clientbound.ClientboundPingPacket;
-import net.hypixel.modapi.packet.impl.clientbound.ClientboundPlayerInfoPacket;
-import net.hypixel.modapi.packet.impl.clientbound.event.ClientboundLocationPacket;
+import net.hypixel.modapi.packet.ClientboundHypixelPacket;
 
-public interface ClientboundPacketHandler {
-
- default void onHelloEvent(ClientboundHelloPacket packet) {
- }
-
- default void onPingPacket(ClientboundPingPacket packet) {
- }
-
- default void onPartyInfoPacket(ClientboundPartyInfoPacket packet) {
- }
-
- default void onPlayerInfoPacket(ClientboundPlayerInfoPacket packet) {
- }
-
- default void onLocationEvent(ClientboundLocationPacket packet) {
- }
+@FunctionalInterface
+public interface ClientboundPacketHandler<T extends ClientboundHypixelPacket> {
+ void handle(T packet);
 }