From 8455e5b0e060c97c38aea45202d878c6ba8af36e Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Sat, 17 Sep 2022 11:34:39 +0200
Subject: [PATCH] WIP: Store modlist

---
 .../forge/ForgeFML2ClientConnectionPhase.java       | 13 ++++++++++---
 .../VelocityForgeClientConnectionPhase.java         |  1 +
 .../VelocityForgeHandshakeSessionHandler.java       |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
index 5769e43..137eddb 100644
--- a/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
+++ b/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
@@ -12,18 +12,20 @@ import org.adde0109.ambassador.velocity.VelocityForgeClientConnectionPhase;
 import org.adde0109.ambassador.velocity.VelocityForgeHandshakeSessionHandler;
 
 import javax.annotation.Nullable;
+import java.util.Optional;
 
 public class ForgeFML2ClientConnectionPhase implements VelocityForgeClientConnectionPhase {
 
   private final MinecraftConnection connection;
   private boolean isResettable;
-  private ByteBuf modListData;
+  private Optional<ByteBuf> modListData = Optional.empty();
   private Continuation whenComplete;
   ForgeFML2ClientConnectionPhase(MinecraftConnection connection) {
     this.connection = connection;
   }
   @Override
   public void handleLogin(ForgeHandshakeUtils.CachedServerHandshake handshake, Continuation continuation) {
+    this.whenComplete = continuation;
     VelocityForgeHandshakeSessionHandler sessionHandler = new VelocityForgeHandshakeSessionHandler(this);
     if(handshake == null) {
       this.connection.write(new LoginPluginMessage(98,"fml:loginwrapper", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generateResetPacket())));
@@ -44,8 +46,13 @@ public class ForgeFML2ClientConnectionPhase implements VelocityForgeClientConnec
   public void handle(LoginPluginResponse packet, boolean lastMessage) {
     if (packet.getId() == 98) {
       isResettable = packet.isSuccess();
-    } else {
-      modListData = packet.content().retain();
+    } else if (packet.getId() == 1) {
+      if (!packet.isSuccess()) {
+        //TODO: Write disconnect message to end user
+        connection.close();
+        return;
+      }
+      modListData = Optional.of(packet.content().retain());
     }
     if (lastMessage) {
       whenComplete.resume();
diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java
index 9918e0a..53cf8c5 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java
@@ -9,6 +9,7 @@ import org.adde0109.ambassador.forge.ForgeHandshakeUtils;
 import javax.annotation.Nullable;
 
 public interface VelocityForgeClientConnectionPhase extends ClientConnectionPhase {
+  //TODO:Make class when PCF is done
 
   default void handleLogin(@Nullable ForgeHandshakeUtils.CachedServerHandshake initialHandshake, Continuation continuation) {
   }
diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java
index 6b9051d..10191ee 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java
@@ -18,8 +18,9 @@ public class VelocityForgeHandshakeSessionHandler implements MinecraftSessionHan
   public boolean handle(LoginPluginResponse packet) {
     if (listenerList.removeIf(id -> id.equals(packet.getId()))) {
       phase.handle(packet, listenerList.isEmpty());
+      return true;
     }
-    return true;
+    return false;
   }
   public void listen(int id) {
     listenerList.add(id);