Added back being able to create new tricks

Author: RealMangorage

build.gradle

@@ -77,7 +77,7 @@ dependencies {
     bootstrap("org.mangorage:mangobotbootstrap:1.0.84")
     launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
 
-    plugin('org.mangorage:mangobot:12.0.101')
+    plugin('org.mangorage:mangobot:12.0.103')
 
     library('org.slf4j:slf4j-simple:2.0.13') // Use a recent version)
     library('org.luaj:luaj-jme:3.0.1')

src/main/java/org/mangorage/mangobotplugin/commands/trick/Trick.java

@@ -4,9 +4,7 @@
 import org.mangorage.mangobotcore.api.util.data.FileName;
 import org.mangorage.mangobotcore.api.util.data.IFileNameResolver;
 
-import java.util.HashMap;
-
-public class Trick implements IFileNameResolver {
+public final class Trick implements IFileNameResolver {
     @Expose
     private long ownerID;
 
@@ -50,44 +48,45 @@ public class Trick implements IFileNameResolver {
     private TrickType type;
 
 
-    protected Trick(String trickID, long guildID) {
+    public Trick(String trickID, long guildID) {
         this.trickID = trickID;
         this.guildID = guildID;
         this.created = System.currentTimeMillis();
     }
 
-    protected void setAliasTarget(String target) {
+    public void setAliasTarget(String target) {
         this.aliasTarget = target;
     }
-    protected void setSuppress(boolean suppress) {
+
+    public void setSuppress(boolean suppress) {
         this.suppress = suppress;
     }
 
-    protected void setType(TrickType type) {
+    public void setType(TrickType type) {
         this.type = type;
     }
 
-    protected void setContent(String content) {
+    public void setContent(String content) {
         this.content = content;
     }
 
-    protected void setScript(String script) {
+    public void setScript(String script) {
         this.script = script;
     }
 
-    protected void setOwnerID(long ownerID) {
+    public void setOwnerID(long ownerID) {
         this.ownerID = ownerID;
     }
 
-    protected void setLastUserEdited(long user) {
+    public void setLastUserEdited(long user) {
         this.lastUserEdited = user;
     }
 
-    protected void setLock(boolean locked) {
+    public void setLock(boolean locked) {
         this.locked = locked;
     }
 
-    protected void setLastEdited(long ms) {
+    public void setLastEdited(long ms) {
         this.lastEdited = ms;
     }
 
@@ -143,7 +142,7 @@ public boolean isSuppressed() {
         return suppress;
     }
 
-    protected void use() {
+    public void use() {
         timesUsed++;
     }
 

src/main/java/org/mangorage/mangobotplugin/commands/trick/TrickManager.java

@@ -52,4 +52,8 @@ public boolean removeTrick(String trickID, long guildID) {
         return false;
     }
 
+    public void addTrick(Trick trick) {
+        loadedTricks.put(new TrickKey(trick.getTrickID(), trick.getGuildID()), trick);
+        TRICKS_DATA_HANDLER.save(plugin.getPluginDirectory(), trick);
+    }
 }

src/main/java/org/mangorage/mangobotplugin/commands/trick/impl/TrickAddSubCommand.java

@@ -2,12 +2,22 @@
 
 import net.dv8tion.jda.api.entities.Message;
 import org.mangorage.mangobotcore.api.command.v1.CommandParseResult;
+import org.mangorage.mangobotcore.api.command.v1.argument.RequiredArg;
+import org.mangorage.mangobotcore.api.command.v1.argument.types.BooleanArgumentType;
+import org.mangorage.mangobotcore.api.command.v1.argument.types.EnumArgumentType;
+import org.mangorage.mangobotcore.api.command.v1.argument.types.StringArgumentType;
 import org.mangorage.mangobotcore.api.jda.command.v2.AbstractJDACommand;
 import org.mangorage.mangobotcore.api.jda.command.v2.JDACommandResult;
+import org.mangorage.mangobotplugin.commands.trick.Trick;
 import org.mangorage.mangobotplugin.commands.trick.TrickManager;
+import org.mangorage.mangobotplugin.commands.trick.TrickType;
 
 public final class TrickAddSubCommand extends AbstractJDACommand {
     private final TrickManager trickManager;
+    private final RequiredArg<String> trickArg = registerRequiredArgument("trick", "The trick to add", StringArgumentType.single());
+    private final RequiredArg<TrickType> trickTypeArg = registerRequiredArgument("type", "The trick type", EnumArgumentType.of(TrickType.class));
+    private final RequiredArg<Boolean> trickSuppressArg = registerRequiredArgument("suppress", "Whether to suppress output", BooleanArgumentType.INSTANCE);
+    private final RequiredArg<String> trickDataArg = registerRequiredArgument("data", "The trick data", StringArgumentType.quote());
 
     public TrickAddSubCommand(String name, TrickManager trickManager) {
         super(name);
@@ -16,7 +26,40 @@ public TrickAddSubCommand(String name, TrickManager trickManager) {
 
     @Override
     public JDACommandResult run(Message context, String[] arguments, CommandParseResult commandParseResult) throws Throwable {
-        context.reply("Adding tricks is under maintenance!").queue();
+        final var trickName = trickArg.get(arguments, commandParseResult);
+        final var trickType = trickTypeArg.get(arguments, commandParseResult);
+        final var trickSuppress = trickSuppressArg.get(arguments, commandParseResult);
+        final var trickData = trickDataArg.get(arguments, commandParseResult);
+
+        final var trick = new Trick(trickName, context.getGuildIdLong());
+
+        if (trickManager.getTrickForGuildByName(context.getGuildIdLong(), trickName) != null) {
+            context.reply("A trick with that name already exists!").queue();
+            return JDACommandResult.PASS;
+        }
+
+        switch (trickType) {
+            case NORMAL -> {
+                trick.setType(TrickType.NORMAL);
+                trick.setContent(trickData);
+            }
+            case ALIAS -> {
+                trick.setType(TrickType.ALIAS);
+                trick.setAliasTarget(trickData);
+            }
+            case SCRIPT -> {
+                trick.setType(TrickType.SCRIPT);
+                trick.setScript(trickData);
+            }
+        }
+
+        trick.setSuppress(trickSuppress);
+        trick.setLastUserEdited(context.getAuthor().getIdLong());
+        trick.setOwnerID(context.getAuthor().getIdLong());
+
+        trickManager.addTrick(trick);
+        context.reply("Added Trick '" + trickName + "' of type '" + trickType + "'!").queue();
+
         return JDACommandResult.PASS;
     }
 }