Receive mod status from the handshake packet

Author: ItsNature

api/src/main/java/com/lunarclient/apollo/event/mods/ApolloUpdateModOptionEvent.java

@@ -35,7 +35,7 @@
  * @since 1.2.1
  */
 @Value
-public final class ApolloUpdateModOptionEvent implements Event {
+public class ApolloUpdateModOptionEvent implements Event {
 
     /**
      * The {@link ApolloPlayer} that the option was updated for.

common/src/main/java/com/lunarclient/apollo/mods/ApolloModsManager.java

@@ -168,16 +168,34 @@ private void handleConfiguration(ApolloPlayer player, Any any) {
                 continue;
             }
 
-            for (Map.Entry<String, Value> entry : setting.getPropertiesMap().entrySet()) {
-                Option<?, ?, ?> option = this.playerOptions.getOptionsByKey().get(entry.getKey());
+            this.updateOptions(player, setting.getPropertiesMap(), false);
+        }
+    }
+
+    /**
+     * Updates the {@link Option}s for a specific {@link ApolloPlayer} using the properties
+     * received from the client.
+     *
+     * @param player     the apollo player
+     * @param properties a map of option keys and values
+     * @param callEvent  whether to call the update mod option event
+     * @since 1.2.1
+     */
+    public void updateOptions(ApolloPlayer player, Map<String, Value> properties, boolean callEvent) {
+        System.out.println("Update options: " + properties.size());
+
+        for (Map.Entry<String, Value> entry : properties.entrySet()) {
+            Option<?, ?, ?> option = this.playerOptions.getOptionsByKey().get(entry.getKey());
 
-                Object unwrappedValue = NetworkOptions.unwrapValue(
-                    entry.getValue(),
-                    option.getTypeToken().getType()
-                );
+            Object unwrappedValue = NetworkOptions.unwrapValue(
+                entry.getValue(),
+                option.getTypeToken().getType()
+            );
 
-                this.playerOptions.set(player, option, unwrappedValue);
+            this.playerOptions.set(player, option, unwrappedValue);
+            System.out.println("Set: " + option.getKey() + "=" + unwrappedValue);
 
+            if (callEvent) {
                 EventBus.EventResult<ApolloUpdateModOptionEvent> eventResult = EventBus.getBus()
                     .post(new ApolloUpdateModOptionEvent(player, option, unwrappedValue));
 

common/src/main/java/com/lunarclient/apollo/network/NetworkOptions.java

@@ -142,8 +142,11 @@ public static Value wrapValue(Value.Builder valueBuilder, Type type, @Nullable O
                 String string = (String) current;
                 return valueBuilder.setStringValue(string).build();
             } else if (current instanceof Color) {
-                Color currentColor = (Color) current;
-                return valueBuilder.setStringValue(Integer.toHexString(currentColor.getRGB())).build();
+                Color color = (Color) current;
+                return valueBuilder.setStringValue(Integer.toHexString(color.getRGB())).build();
+            } else if (current instanceof Integer) {
+                int color = (int) current;
+                return valueBuilder.setStringValue(Integer.toHexString(color)).build();
             } else {
                 throw new RuntimeException("Unable to wrap Color value of type '" + clazz.getSimpleName() + "'!");
 

common/src/main/java/com/lunarclient/apollo/player/ApolloPlayerManagerImpl.java

@@ -23,6 +23,7 @@
  */
 package com.lunarclient.apollo.player;
 
+import com.google.protobuf.Value;
 import com.lunarclient.apollo.Apollo;
 import com.lunarclient.apollo.ApolloManager;
 import com.lunarclient.apollo.client.mod.LunarClientMod;
@@ -34,11 +35,8 @@
 import com.lunarclient.apollo.event.player.ApolloRegisterPlayerEvent;
 import com.lunarclient.apollo.event.player.ApolloUnregisterPlayerEvent;
 import com.lunarclient.apollo.mods.ModStatusImpl;
-import com.lunarclient.apollo.mods.impl.ModFreelook;
-import com.lunarclient.apollo.mods.impl.ModWaypoints;
 import com.lunarclient.apollo.module.tebex.TebexEmbeddedCheckoutSupport;
 import com.lunarclient.apollo.network.NetworkOptions;
-import com.lunarclient.apollo.option.Options;
 import com.lunarclient.apollo.player.v1.PlayerHandshakeMessage;
 import java.util.Collection;
 import java.util.Collections;
@@ -162,11 +160,10 @@ public void handlePlayerHandshake(@NotNull ApolloPlayer player, @NotNull PlayerH
         apolloPlayer.setInstalledMods(mods);
         apolloPlayer.setTebexEmbeddedCheckoutSupport(checkoutSupportType);
 
-        // TODO: receive data from client
-        // mock
-        Options options = ApolloManager.getModsManager().getPlayerOptions();
-        options.set(apolloPlayer, ModWaypoints.ENABLED, false);
-        options.set(apolloPlayer, ModFreelook.INVERT_YAW, true);
+        Map<String, Value> modStatus = message.getModStatusMap();
+        if (!modStatus.isEmpty()) {
+            ApolloManager.getModsManager().updateOptions(apolloPlayer, modStatus, false);
+        }
 
         apolloPlayer.setModStatus(new ModStatusImpl(player.getUniqueId()));
     }

docs/developers/lightweight/protobuf/getting-started.mdx

@@ -26,7 +26,7 @@ Available fields for each message, including their types, are available on the B
         <dependency>
             <groupId>com.lunarclient</groupId>
             <artifactId>apollo-protos</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.4</version>
         </dependency>
     </dependencies>
     ```
@@ -41,7 +41,7 @@ Available fields for each message, including their types, are available on the B
     }
 
     dependencies {
-        api 'com.lunarclient:apollo-protos:0.0.2'
+        api 'com.lunarclient:apollo-protos:0.0.4'
     }
     ```
   </Tab>
@@ -55,7 +55,7 @@ Available fields for each message, including their types, are available on the B
     }
 
     dependencies {
-        api("com.lunarclient:apollo-protos:0.0.2")
+        api("com.lunarclient:apollo-protos:0.0.4")
     }
     ```
   </Tab>

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ geantyref = "1.3.11"
 idea = "1.1.7"
 jetbrains = "24.0.1"
 lombok = "1.18.38"
-protobuf = "0.0.2"
+protobuf = "0.0.4"
 gson = "2.10.1"
 shadow = "8.1.1"
 spotless = "6.13.0"