1.0.6-BETA

- Deleted old class that housed all commands in a switch statement - Created a new abstract command class to easily extend and create commands - Commands have now been moved to their own classes - Permissions and access to commands have been organized in the rewrite - Unrelated changes - Moved library to paper instead of spigot - Added lombok dependency for reduction of code - Added some comments to the events - Removed redundant casts and unused imports
Jeqo-Studios · Oct 20, 2023 · a60fd94 · a60fd94
2 parents ceb2ace + 17d02a1
commit a60fd94
Show file tree

Hide file tree

Showing 14 changed files with 449 additions and 268 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,8 +56,8 @@
 
     <repositories>
         <repository>
-            <id>spigotmc-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <id>papermc-repo</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
             <id>sonatype</id>
@@ -67,11 +67,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
             <version>1.18-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.26</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

diff --git a/src/main/java/net/jeqo/bloons/Bloons.java b/src/main/java/net/jeqo/bloons/Bloons.java
@@ -1,26 +1,26 @@
 package net.jeqo.bloons;
 
-import net.jeqo.bloons.data.BalloonCommand;
+import lombok.Getter;
+import lombok.Setter;
+import net.jeqo.bloons.commands.manager.CommandManager;
 import net.jeqo.bloons.data.BalloonOwner;
-import net.jeqo.bloons.data.BalloonTab;
 import net.jeqo.bloons.data.UpdateChecker;
 import net.jeqo.bloons.listeners.LeashHandlers;
 import net.jeqo.bloons.listeners.MenuHandlers;
 import net.jeqo.bloons.listeners.PlayerHandlers;
 import net.jeqo.bloons.utils.Metrics;
 import net.jeqo.bloons.utils.Utils;
-import org.bukkit.command.TabCompleter;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.HashMap;
-import java.util.Objects;
 import java.util.UUID;
 
 public final class Bloons extends JavaPlugin {
 
     public static HashMap<UUID, BalloonOwner> playerBalloons = new HashMap<>();
     public static HashMap<UUID, String> playerBalloonID = new HashMap<>();
+    @Getter @Setter
     private static Bloons instance;
 
     @Override
@@ -29,9 +29,14 @@ public void onEnable() {
         Utils.log("|                           Plugin loaded.                           |");
         Utils.log("|-------------------------------------------------[ MADE BY JEQO ]---|");
 
-        instance = this;
-        loadCommands(); loadListeners();
-        Metrics metrics = new Metrics(this, pluginId); updateChecker();
+        setInstance(this);
+
+        new CommandManager(getInstance());
+        loadListeners();
+
+        new Metrics(this, pluginId);
+        updateChecker();
+
         getConfig().options().copyDefaults(); saveDefaultConfig();
     }
 
@@ -65,13 +70,6 @@ private void loadListeners() {
         getServer().getPluginManager().registerEvents(new PlayerHandlers(), this);
         getServer().getPluginManager().registerEvents(new MenuHandlers(), this);
     }
-
-    private void loadCommands() {
-        Objects.requireNonNull(getCommand("bloons")).setExecutor(new BalloonCommand());
-        TabCompleter tc = new BalloonTab();
-        Objects.requireNonNull(this.getCommand("bloons")).setTabCompleter(tc);
-    }
-
     public static String getMessage(String id, String arg) {
         return Utils.hex(String.format(getInstance().getConfig().getString("messages." + id, ""), arg));
     }
@@ -80,10 +78,6 @@ public static String getMessage(String id) {
         return Utils.hex(getInstance().getConfig().getString("messages." + id, ""));
     }
 
-    public static Bloons getInstance() {
-        return instance;
-    }
-
     public static String getString(String path) {
         return getInstance().getConfig().getString(path);
     }

diff --git a/src/main/java/net/jeqo/bloons/commands/CommandEquip.java b/src/main/java/net/jeqo/bloons/commands/CommandEquip.java
@@ -0,0 +1,51 @@
+package net.jeqo.bloons.commands;
+
+import net.jeqo.bloons.Bloons;
+import net.jeqo.bloons.commands.manager.Command;
+import net.jeqo.bloons.commands.manager.enums.CommandPermission;
+import net.jeqo.bloons.data.BalloonOwner;
+import net.jeqo.bloons.utils.Utils;
+import org.bukkit.Sound;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import static net.jeqo.bloons.commands.utils.ErrorHandling.usage;
+
+public class CommandEquip extends Command {
+
+    public CommandEquip(JavaPlugin plugin) {
+        super(plugin);
+        this.addCommandAlias("equip");
+        this.setCommandDescription("Equips a balloon to you");
+        this.setCommandSyntax("/bloons equip <balloon>");
+        this.setRequiredPermission(CommandPermission.EQUIP);
+    }
+
+    @Override
+    public boolean execute(CommandSender sender, String[] args) {
+        if (args.length < 1) {
+            usage(sender);
+        }
+
+        Player player = (Player) sender;
+        String str1 = args[0];
+
+        if (!plugin.getConfig().contains("balloons." + str1)) {
+            player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("balloon-not-found"));
+            return false;
+        }
+
+        if (!player.hasPermission(plugin.getConfig().getString("balloons." + str1 + ".permission", "balloons." + str1))) {
+            player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("no-permission"));
+            return false;
+        }
+
+        Utils.removeBalloon(player, Bloons.playerBalloons.get(player.getUniqueId()));
+        BalloonOwner.checkBalloonRemovalOrAdd(player, str1);
+        player.playSound(player.getLocation(), Sound.ENTITY_CHICKEN_EGG, 1, 1);
+        String balloonName = Bloons.getString("balloons." + str1 + ".name");
+        player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("equipped", balloonName));
+        return false;
+    }
+}
diff --git a/src/main/java/net/jeqo/bloons/commands/CommandForceEquip.java b/src/main/java/net/jeqo/bloons/commands/CommandForceEquip.java
@@ -0,0 +1,48 @@
+package net.jeqo.bloons.commands;
+
+import net.jeqo.bloons.Bloons;
+import net.jeqo.bloons.commands.manager.Command;
+import net.jeqo.bloons.commands.manager.enums.CommandPermission;
+import net.jeqo.bloons.data.BalloonOwner;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import static net.jeqo.bloons.commands.utils.ErrorHandling.usage;
+
+public class CommandForceEquip extends Command {
+
+    public CommandForceEquip(JavaPlugin plugin) {
+        super(plugin);
+        this.addCommandAlias("fequip");
+        this.setCommandDescription("Force equips a balloon to you");
+        this.setCommandSyntax("/bloons fequip <player> <balloon>");
+        this.setRequiredPermission(CommandPermission.FORCE);
+    }
+
+    @Override
+    public boolean execute(CommandSender sender, String[] args) {
+        if (args.length < 1) {
+            usage(sender);
+            System.out.println("args.length < 1");
+        }
+
+        Player player = Bukkit.getPlayer(args[0]);
+
+        if (player == null) {
+            sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("player-not-found"));
+            return false;
+        }
+        String balloonId = args[1];
+        if (!plugin.getConfig().contains("balloons." + balloonId)) {
+            sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("balloon-not-found"));
+            return false;
+        }
+
+        BalloonOwner.checkBalloonRemovalOrAdd(player.getPlayer(), balloonId);
+        String balloonName2 = Bloons.getString("balloons." + balloonId + ".name");
+        player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("equipped", balloonName2));
+        return false;
+    }
+}
diff --git a/src/main/java/net/jeqo/bloons/commands/CommandForceUnequip.java b/src/main/java/net/jeqo/bloons/commands/CommandForceUnequip.java
@@ -0,0 +1,42 @@
+package net.jeqo.bloons.commands;
+
+import net.jeqo.bloons.Bloons;
+import net.jeqo.bloons.commands.manager.Command;
+import net.jeqo.bloons.commands.manager.enums.CommandPermission;
+import net.jeqo.bloons.data.BalloonOwner;
+import net.jeqo.bloons.utils.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.Sound;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class CommandForceUnequip extends Command {
+
+    public CommandForceUnequip(JavaPlugin plugin) {
+        super(plugin);
+        this.addCommandAlias("funequip");
+        this.setCommandDescription("Force unequips a balloon that you have equipped");
+        this.setCommandSyntax("/bloons funequip <player>");
+        this.setRequiredPermission(CommandPermission.FORCE);
+    }
+
+    @Override
+    public boolean execute(CommandSender sender, String[] args) {
+        Player player = Bukkit.getPlayer(args[0]);
+        if (player == null) {
+            sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("player-not-found"));
+            return false;
+        }
+
+        BalloonOwner owner = Bloons.playerBalloons.get(player.getUniqueId());
+        if (owner == null) {
+            player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_DIDGERIDOO, 1, 1);
+            sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("not-equipped"));
+            return false;
+        }
+        Utils.removeBalloon(player, owner);
+        sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("unequipped"));
+        return false;
+    }
+}
diff --git a/src/main/java/net/jeqo/bloons/commands/CommandReload.java b/src/main/java/net/jeqo/bloons/commands/CommandReload.java
@@ -0,0 +1,26 @@
+package net.jeqo.bloons.commands;
+
+import net.jeqo.bloons.Bloons;
+import net.jeqo.bloons.commands.manager.Command;
+import net.jeqo.bloons.commands.manager.enums.CommandPermission;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class CommandReload extends Command {
+
+    public CommandReload(JavaPlugin plugin) {
+        super(plugin);
+        this.addCommandAlias("reload");
+        this.addCommandAlias("rl");
+        this.setCommandDescription("Reloads the bloons config");
+        this.setCommandSyntax("/bloons reload");
+        this.setRequiredPermission(CommandPermission.RELOAD);
+    }
+
+    @Override
+    public boolean execute(CommandSender sender, String[] args) {
+        Bloons.getInstance().reloadConfig();
+        sender.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("config-reloaded"));
+        return false;
+    }
+}
diff --git a/src/main/java/net/jeqo/bloons/commands/CommandUnequip.java b/src/main/java/net/jeqo/bloons/commands/CommandUnequip.java
@@ -0,0 +1,37 @@
+package net.jeqo.bloons.commands;
+
+import net.jeqo.bloons.Bloons;
+import net.jeqo.bloons.commands.manager.Command;
+import net.jeqo.bloons.commands.manager.enums.CommandPermission;
+import net.jeqo.bloons.data.BalloonOwner;
+import net.jeqo.bloons.utils.Utils;
+import org.bukkit.Sound;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class CommandUnequip extends Command {
+
+    public CommandUnequip(JavaPlugin plugin) {
+        super(plugin);
+        this.addCommandAlias("equip");
+        this.setCommandDescription("Equips a balloon to you");
+        this.setCommandSyntax("/bloons unequip <balloon>");
+        this.setRequiredPermission(CommandPermission.UNEQUIP);
+    }
+
+    @Override
+    public boolean execute(CommandSender sender, String[] args) {
+        Player player = (Player) sender;
+        BalloonOwner balloonOwner1 = Bloons.playerBalloons.get(player.getUniqueId());
+        if (balloonOwner1 == null) {
+            player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_DIDGERIDOO, 1, 1);
+            player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("not-equipped"));
+            return false;
+        }
+        Utils.removeBalloon(player, balloonOwner1);
+        player.sendMessage(Bloons.getMessage("prefix") + Bloons.getMessage("unequipped"));
+        player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_HURT_SWEET_BERRY_BUSH, 1, 1);
+        return false;
+    }
+}
diff --git a/src/main/java/net/jeqo/bloons/commands/manager/Command.java b/src/main/java/net/jeqo/bloons/commands/manager/Command.java
@@ -0,0 +1,82 @@
+package net.jeqo.bloons.commands.manager;
+
+import lombok.Getter;
+import lombok.Setter;
+import net.jeqo.bloons.commands.manager.enums.CommandAccess;
+import net.jeqo.bloons.commands.manager.enums.CommandPermission;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.ArrayList;
+
+public abstract class Command {
+
+    protected JavaPlugin plugin;
+
+    @Getter @Setter
+    private CommandPermission requiredPermission;
+    @Getter @Setter
+    private CommandAccess requiredAccess = CommandAccess.ENABLED;
+    @Getter @Setter
+    private String commandSyntax;
+    @Getter @Setter
+    private String commandDescription;
+    @Getter
+    private final ArrayList<String> commandAliases = new ArrayList<>();
+
+    public Command(JavaPlugin providedPlugin) {
+        plugin = providedPlugin;
+    }
+
+    /**
+     * Adds alias commands to the current command
+     * Note: All aliases added here must be added to the plugin.yml file
+     * @param alias The alias to add to the command
+     */
+    public void addCommandAlias(String alias) {
+        commandAliases.add(alias);
+    }
+
+    public abstract boolean execute(CommandSender sender, String[] args) throws Exception;
+
+    /**
+     * Checks if the command meets the requirements to be executed
+     * @param s The sender of the command
+     * @param perm The permission required to execute the command
+     * @return Whether or not the command meets the requirements
+     */
+    public boolean hasRequirement(CommandSender s, CommandPermission perm) {
+        switch (perm) {
+            case EQUIP -> {
+                if (s instanceof Player) {
+                    if (!s.hasPermission("bloons.equip")) {
+                        return false;
+                    }
+                }
+            }
+            case UNEQUIP -> {
+                if (s instanceof Player) {
+                    if (!s.hasPermission("bloons.unequip")) {
+                        return false;
+                    }
+                }
+            }
+            case FORCE -> {
+                if (s instanceof Player) {
+                    if (!s.hasPermission("bloons.force")) {
+                        return false;
+                    }
+                }
+            }
+            case RELOAD -> {
+                if (s instanceof Player) {
+                    if (!s.hasPermission("bloons.reload")) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+}