Add suit example commands

Author: ItsNature

api/src/main/java/com/lunarclient/apollo/module/evnt/Character.java

@@ -25,6 +25,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
+import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 import java.util.UUID;
 
@@ -50,4 +51,6 @@ public final class Character {
 
     boolean equipped;
 
+    @Nullable String suitName;
+
 }

api/src/main/java/com/lunarclient/apollo/module/evnt/EVNTModule.java

@@ -129,7 +129,7 @@ public abstract class EVNTModule extends ApolloModule {
     public static final SimpleOption<Boolean> DISABLE_OPTIFINE_CAPES = Option.<Boolean>builder()
         .comment("Set to 'true' to disable optifine capes, otherwise 'false'.")
         .node("disable-optifine-capes").type(TypeToken.get(Boolean.class))
-        .defaultValue(true).build();
+        .defaultValue(true).notifyClient().build();
 
     public static final SimpleOption<Boolean> DISABLE_NOTIFY_MISMATCH = Option.<Boolean>builder()
         .comment("Set to 'true' to disable notifications for players using the wrong branch or version, otherwise 'false'.")
@@ -182,16 +182,16 @@ public boolean isClientNotify() {
 
     public abstract void updateCosmetics(Recipients recipients, List<String> models, List<String> animations);
 
-    public abstract void overrideCharacterSuitResources(Recipients recipients, List<Integer> cosmeticIds);
+    public abstract void overrideCharacterSuitAccess(Recipients recipients, CharacterType type, List<String> suitNames);
 
     public abstract void overrideCharacterCosmetic(Recipients recipients, UUID playerUuid, CharacterType type);
 
+    public abstract void overrideCharacterCosmetic(Recipients recipients, UUID playerUuid, CharacterType type, String suitName);
+
     public abstract void overrideCharacterAbility(Recipients recipients, List<CharacterAbility> abilities);
 
     public abstract void overrideCharacter(Recipients recipients, Character character);
 
-    public abstract void overrideCharacterSuit(Recipients recipients, Suit suit);
-
     public abstract void updateGameOverview(Recipients recipients, EventGame game);
 
     public abstract void updateStatusOverview(Recipients recipients, EventStatus status);

bukkit-example/src/main/java/com/lunarclient/apollo/example/api/examples/EVNTApiExample.java

@@ -101,6 +101,21 @@ public void overrideCharacterExample(Player viewer) {
         });
     }
 
+    @Override
+    public void overrideCharacterSuitExample(Player viewer, CharacterType type, String suitName) {
+        Optional<ApolloPlayer> apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId());
+
+        apolloPlayerOpt.ifPresent(apolloPlayer -> {
+            this.evntModule.overrideCharacter(apolloPlayer, Character.builder()
+                    .playerUuid(apolloPlayer.getUniqueId())
+                    .type(type)
+                    .color(Color.RED)
+                    .equipped(true)
+                    .suitName(suitName)
+                .build());
+        });
+    }
+
     @Override
     public void overrideCharacterAbilityExample(Player viewer) {
         Optional<ApolloPlayer> apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId());
@@ -146,6 +161,15 @@ public void overrideCharacterResources(Player viewer) {
         });
     }
 
+    @Override
+    public void overrideCharacterSuitAccessExample(Player viewer, CharacterType type, List<String> suitNames) {
+        Optional<ApolloPlayer> apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId());
+
+        apolloPlayerOpt.ifPresent(apolloPlayer -> {
+            this.evntModule.overrideCharacterSuitAccess(apolloPlayer, type, suitNames);
+        });
+    }
+
     @Override
     public void updateGameOverviewExample() {
         EventTeam teamOne = EventTeam.builder()

bukkit-example/src/main/java/com/lunarclient/apollo/example/common/commands/module/EVNTCommand.java

@@ -25,13 +25,16 @@
 
 import com.lunarclient.apollo.example.ApolloExamplePlugin;
 import com.lunarclient.apollo.example.common.modules.impl.EVNTExample;
+import com.lunarclient.apollo.module.evnt.CharacterType;
 import com.lunarclient.apollo.module.evnt.GuiType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class EVNTCommand implements CommandExecutor {
@@ -46,6 +49,34 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         Player player = (Player) sender;
         EVNTExample evntExample = ApolloExamplePlugin.getPlugin().getEvntExample();
 
+        if (args.length > 2) {
+            CharacterType type;
+            try {
+                type = CharacterType.valueOf(args[1]);
+            } catch (IllegalArgumentException e) {
+                player.sendMessage("Invalid Character Type!");
+                player.sendMessage("Available Character types: " + Arrays.toString(CharacterType.values()));
+                return true;
+            }
+
+            if (args[0].equalsIgnoreCase("overridesuitaccess")) {
+                List<String> suits = new ArrayList<>();
+                for (int i = 2; i < args.length; i++) {
+                    suits.add(args[i]);
+                }
+
+                evntExample.overrideCharacterSuitAccessExample(player, type, suits);
+                return true;
+            }
+
+            if (args[0].equalsIgnoreCase("overridesuit")) {
+                evntExample.overrideCharacterSuitExample(player, type, args[2]);
+                return true;
+            }
+
+            return true;
+        }
+
         if (args.length == 2 && args[0].equalsIgnoreCase("opengui")) {
             try {
                 GuiType type = GuiType.valueOf(args[1].toUpperCase());
@@ -148,6 +179,8 @@ private void sendUsage(CommandSender sender) {
         sender.sendMessage("/evnt overrideCosmeticResource");
         sender.sendMessage("/evnt updateGameOverview");
         sender.sendMessage("/evnt updateStatusOverview");
+        sender.sendMessage("/evnt overrideSuitAccess <type> <suits>");
+        sender.sendMessage("/evnt overrideSuit <type> <suit>");
     }
 
 }

bukkit-example/src/main/java/com/lunarclient/apollo/example/common/modules/impl/EVNTExample.java

@@ -24,8 +24,10 @@
 package com.lunarclient.apollo.example.common.modules.impl;
 
 import com.lunarclient.apollo.example.common.modules.ApolloExample;
+import com.lunarclient.apollo.module.evnt.CharacterType;
 import com.lunarclient.apollo.module.evnt.GuiType;
 import org.bukkit.entity.Player;
+import java.util.List;
 
 public abstract class EVNTExample extends ApolloExample {
 
@@ -39,10 +41,14 @@ public abstract class EVNTExample extends ApolloExample {
 
     public abstract void overrideCharacterExample(Player viewer);
 
+    public abstract void overrideCharacterSuitExample(Player viewer, CharacterType type, String suitName);
+
     public abstract void overrideCharacterAbilityExample(Player viewer);
 
     public abstract void overrideCharacterCosmeticExample(Player viewer);
 
+    public abstract void overrideCharacterSuitAccessExample(Player viewer, CharacterType type, List<String> suitNames);
+
     public abstract void overrideCharacterResources(Player viewer);
 
     public abstract void updateGameOverviewExample();

bukkit-example/src/main/java/com/lunarclient/apollo/example/json/examples/EVNTJsonExample.java

@@ -24,8 +24,10 @@
 package com.lunarclient.apollo.example.json.examples;
 
 import com.lunarclient.apollo.example.common.modules.impl.EVNTExample;
+import com.lunarclient.apollo.module.evnt.CharacterType;
 import com.lunarclient.apollo.module.evnt.GuiType;
 import org.bukkit.entity.Player;
+import java.util.List;
 
 public class EVNTJsonExample extends EVNTExample {
 
@@ -54,6 +56,11 @@ public void overrideCharacterExample(Player viewer) {
         this.sendNotImplemented(viewer);
     }
 
+    @Override
+    public void overrideCharacterSuitExample(Player viewer, CharacterType type, String suitName) {
+        this.sendNotImplemented(viewer);
+    }
+
     @Override
     public void overrideCharacterAbilityExample(Player viewer) {
         this.sendNotImplemented(viewer);
@@ -64,6 +71,11 @@ public void overrideCharacterCosmeticExample(Player viewer) {
         this.sendNotImplemented(viewer);
     }
 
+    @Override
+    public void overrideCharacterSuitAccessExample(Player viewer, CharacterType type, List<String> suitNames) {
+        this.sendNotImplemented(viewer);
+    }
+
     @Override
     public void overrideCharacterResources(Player viewer) {
         this.sendNotImplemented(viewer);

bukkit-example/src/main/java/com/lunarclient/apollo/example/proto/examples/EVNTProtoExample.java

@@ -24,9 +24,12 @@
 package com.lunarclient.apollo.example.proto.examples;
 
 import com.lunarclient.apollo.example.common.modules.impl.EVNTExample;
+import com.lunarclient.apollo.module.evnt.CharacterType;
 import com.lunarclient.apollo.module.evnt.GuiType;
 import org.bukkit.entity.Player;
 
+import java.util.List;
+
 public class EVNTProtoExample extends EVNTExample {
 
     @Override
@@ -54,6 +57,16 @@ public void overrideCharacterExample(Player viewer) {
         this.sendNotImplemented(viewer);
     }
 
+    @Override
+    public void overrideCharacterSuitExample(Player viewer, CharacterType type, String suitName) {
+        this.sendNotImplemented(viewer);
+    }
+
+    @Override
+    public void overrideCharacterSuitAccessExample(Player viewer, CharacterType type, List<String> suitNames) {
+        this.sendNotImplemented(viewer);
+    }
+
     @Override
     public void overrideCharacterAbilityExample(Player viewer) {
         this.sendNotImplemented(viewer);

common/src/main/java/com/lunarclient/apollo/module/evnt/EVNTModuleImpl.java

@@ -40,6 +40,7 @@
 import com.lunarclient.apollo.evnt.v1.OverrideCharacterAbilityMessage;
 import com.lunarclient.apollo.evnt.v1.OverrideCharacterCosmeticMessage;
 import com.lunarclient.apollo.evnt.v1.OverrideCharacterMessage;
+import com.lunarclient.apollo.evnt.v1.OverrideCharacterSuitResourcesMessage;
 import com.lunarclient.apollo.evnt.v1.OverrideCosmeticResourcesMessage;
 import com.lunarclient.apollo.evnt.v1.OverrideHeartTextureMessage;
 import com.lunarclient.apollo.evnt.v1.ResetHeartTextureMessage;
@@ -61,6 +62,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Provides the EVNT module.
@@ -149,17 +151,31 @@ public void updateCosmetics(@NonNull Recipients recipients, @NonNull List<String
     }
 
     @Override
-    public void overrideCharacterSuitResources(@NonNull Recipients recipients, @NonNull List<Integer> cosmeticIds) {
-        // TODO
+    public void overrideCharacterSuitAccess(@NonNull Recipients recipients, @NonNull CharacterType type, @NonNull List<String> suitNames) {
+        OverrideCharacterSuitResourcesMessage message = OverrideCharacterSuitResourcesMessage.newBuilder()
+            .setCharacterType(this.toProtobuf(type))
+            .addAllSuitNames(suitNames)
+            .build();
+
+        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
     }
 
     @Override
     public void overrideCharacterCosmetic(@NonNull Recipients recipients, @NonNull UUID playerUuid, @NonNull CharacterType type) {
-        OverrideCharacterCosmeticMessage message = OverrideCharacterCosmeticMessage.newBuilder()
+        this.overrideCharacterCosmetic(recipients, playerUuid, type, null);
+    }
+
+    @Override
+    public void overrideCharacterCosmetic(@NonNull Recipients recipients, @NonNull UUID playerUuid, @NonNull CharacterType type, @Nullable String suitName) {
+        OverrideCharacterCosmeticMessage.Builder builder = OverrideCharacterCosmeticMessage.newBuilder()
             .setPlayerUuid(NetworkTypes.toProtobuf(playerUuid))
-            .setCharacterType(this.toProtobuf(type))
-            .build();
+            .setCharacterType(this.toProtobuf(type));
 
+        if (suitName != null) {
+            builder.setSuitName(suitName);
+        }
+
+        OverrideCharacterCosmeticMessage message = builder.build();
         recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
     }
 
@@ -174,19 +190,18 @@ public void overrideCharacterAbility(@NonNull Recipients recipients, @NonNull Li
 
     @Override
     public void overrideCharacter(@NonNull Recipients recipients, @NonNull Character character) {
-        OverrideCharacterMessage message = OverrideCharacterMessage.newBuilder()
+        OverrideCharacterMessage.Builder builder = OverrideCharacterMessage.newBuilder()
             .setPlayerUuid(NetworkTypes.toProtobuf(character.getPlayerUuid()))
             .setCharacterType(this.toProtobuf(character.getType()))
             .setColor(NetworkTypes.toProtobuf(character.getColor()))
-            .setEquipped(character.isEquipped())
-            .build();
+            .setEquipped(character.isEquipped());
 
-        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
-    }
+        if (character.getSuitName() != null) {
+            builder.setSuitName(character.getSuitName());
+        }
 
-    @Override
-    public void overrideCharacterSuit(@NonNull Recipients recipients, @NonNull Suit suit) {
-        // TODO
+        OverrideCharacterMessage message = builder.build();
+        recipients.forEach(player -> ((AbstractApolloPlayer) player).sendPacket(message));
     }
 
     @Override