From 58cf52fd1f54cb16a8b41605a4024242800f4187 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Mon, 10 Feb 2025 18:33:05 -0500
Subject: [PATCH] Effect Map Register + Effect Command WIP

---
 build.gradle                                  |   2 +-
 .../kamkeel/npcs/command/EffectCommand.java   | 139 ++++++++++++++++++
 .../controllers/CustomEffectController.java   |   5 +-
 3 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/kamkeel/npcs/command/EffectCommand.java

diff --git a/build.gradle b/build.gradle
index 409a3d12e..a726d1bf7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'idea'
 }
 
-version = "1.9.4-beta2.2"
+version = "1.9.4-beta2.3"
 group= "kamkeel.customnpc-plus"
 archivesBaseName = "CustomNPC-Plus"
 
diff --git a/src/main/java/kamkeel/npcs/command/EffectCommand.java b/src/main/java/kamkeel/npcs/command/EffectCommand.java
new file mode 100644
index 000000000..9286a30a9
--- /dev/null
+++ b/src/main/java/kamkeel/npcs/command/EffectCommand.java
@@ -0,0 +1,139 @@
+package kamkeel.npcs.command;
+
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import noppes.npcs.controllers.PlayerDataController;
+import noppes.npcs.controllers.data.CustomEffect;
+import noppes.npcs.controllers.data.PlayerData;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class EffectCommand extends CommandKamkeelBase {
+
+    @Override
+    public String getDescription() {
+        return "Custom Effect operations";
+    }
+
+    @Override
+    public String getCommandName() {
+        return "effect";
+    }
+
+    // info all
+    @SubCommand(desc = "Lists all effects")
+    public void infoAll(ICommandSender sender, String[] args) throws CommandException {
+        // TODO: FIX EFFECT COMMAND
+//        Set<Map.Entry<Integer, StatusEffect>> effects = DBCEffectController.getInstance().standardEffects.entrySet();
+//        Set<Map.Entry<Integer, CustomEffect>> customEffects = DBCEffectController.getInstance().customEffects.entrySet();
+//
+//        if (effects.isEmpty() && customEffects.isEmpty()) {
+//            sendError(sender, "No effects found.");
+//            return;
+//        }
+//
+//        sendResult(sender, "--------------------");
+//
+//        for (Map.Entry<Integer, StatusEffect> entry : effects) {
+//            sendResult(sender, String.format("\u00a7b%2$s \u00a77(ID%3$s: %1$s)", entry.getKey(), entry.getValue().getName(), entry.getValue().isCustom() ? " - CUSTOM" : " "));
+//        }
+//        for (Map.Entry<Integer, CustomEffect> entry : customEffects) {
+//            sendResult(sender, String.format("\u00a7b%2$s \u00a77(ID%3$s: %1$s)", entry.getKey(), entry.getValue().getName(), entry.getValue().isCustom() ? " - CUSTOM" : " "));
+//        }
+//
+//        sendResult(sender, "--------------------");
+    }
+
+    @SubCommand(desc = "Gives a effect to a player", usage = "<player> <time> <effectName>")
+    public void give(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        int time = Integer.parseInt(args[1]);
+//        String name = "";
+//        for (int i = 2; i < args.length; i++) {
+//            name += args[i] + (i != args.length - 1 ? " " : "");
+//        }
+//
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        StatusEffect statusEffect = DBCEffectController.getInstance().get(name);
+//        if (statusEffect == null) {
+//            sendError(sender, "Unknown effect: " + name);
+//            return;
+//        }
+//
+//        for (PlayerData playerdata : data) {
+//            DBCEffectController.getInstance().applyEffect(playerdata.player, statusEffect.getID(), time);
+//            sendResult(sender, String.format("%s §agiven to §7'§b%s§7'", statusEffect.getName(), playerdata.playername));
+//            if (sender != playerdata.player) {
+//                sendResult(playerdata.player, String.format("§Effect §7%s §aadded.", statusEffect.getName()));
+//            }
+//        }
+    }
+
+
+    @SubCommand(desc = "Removes a effect from a player", usage = "<player> <effectName>")
+    public void remove(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        String name = "";
+//        for (int i = 1; i < args.length; i++) {
+//            name += args[i] + (i != args.length - 1 ? " " : "");
+//        }
+//
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        StatusEffect statusEffect = DBCEffectController.getInstance().get(name);
+//        if (statusEffect == null) {
+//            sendError(sender, "Unknown effect: " + name);
+//            return;
+//        }
+//
+//        for (PlayerData playerData : data) {
+//            DBCEffectController.getInstance().removeEffect(playerData.player, statusEffect.getID(), DBCPlayerEvent.EffectEvent.ExpirationType.REMOVED);
+//            sendResult(sender, String.format("Effect %s removed from %s", statusEffect.getName(), playerData.playername));
+//        }
+    }
+
+    @SubCommand(desc = "Gives a effect to a player", usage = "<player> <time> <effectId>")
+    public void giveId(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        int time = Integer.parseInt(args[1]);
+//
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        for (PlayerData playerdata : data) {
+//            int statusEffectId = Integer.parseInt(args[2]);
+//            DBCEffectController.getInstance().applyEffect(playerdata.player, statusEffectId, time);
+//            sendResult(sender, String.format("Effect %d given to %s", statusEffectId, playerdata.playername));
+//        }
+    }
+
+    @SubCommand(desc = "Removes a effect from a player", usage = "<player> <effectId>")
+    public void removeId(ICommandSender sender, String[] args) throws CommandException {
+//        String playername = args[0];
+//        List<PlayerData> data = PlayerDataController.Instance.getPlayersData(sender, playername);
+//        if (data.isEmpty()) {
+//            sendError(sender, "Unknown player: " + playername);
+//            return;
+//        }
+//
+//        for (PlayerData playerData : data) {
+//            int statusEffectId = Integer.parseInt(args[1]);
+//            DBCEffectController.getInstance().removeEffect(playerData.player, statusEffectId, DBCPlayerEvent.EffectEvent.ExpirationType.REMOVED);
+//            sendResult(sender, String.format("Effect %d removed from %s", statusEffectId, playerData.playername));
+//        }
+    }
+}
diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
index f68b73a52..c207f447a 100644
--- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java
+++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
@@ -49,8 +49,9 @@ public class CustomEffectController implements ICustomEffectHandler {
         return Instance;
     }
 
-    public void registerEffectMap(int index, HashMap<Integer, CustomEffect> effectHashMap){
-        indexMapper.put(index, effectHashMap);
+    public <T extends CustomEffect> void registerEffectMap(int index, HashMap<Integer, T> effectHashMap) {
+        HashMap<Integer, CustomEffect> map = new HashMap<>(effectHashMap);
+        indexMapper.put(index, map);
     }
 
     public void load() {