break changes (change command manager, permission, commands)

nivcoo · Sep 23, 2021 · 62749a6 · 62749a6
1 parent 9b0670d
commit 62749a6
Show file tree

Hide file tree

Showing 19 changed files with 763 additions and 533 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@
 .idea
 *.iml
 
+dependency-reduced-pom.xml
+
 # Ignore output generated files
 target
 out
diff --git a/pom.xml b/pom.xml
@@ -5,10 +5,10 @@
 
     <groupId>fr.nivcoo</groupId>
     <artifactId>Pointz</artifactId>
-    <version>2.2.0</version>
+    <version>2.5.0</version>
     <packaging>jar</packaging>
 
-    <name>Pointz</name>
+    <name>${project.artifactId}</name>
     <url>https://github.com/nivcoo/Spigot-Pointz/</url>
 
     <properties>
@@ -66,11 +66,17 @@
             <artifactId>gson</artifactId>
             <version>2.8.8</version>
         </dependency>
+        <dependency>
+            <groupId>fr.nivcoo</groupId>
+            <artifactId>UtilsZ</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <defaultGoal>clean install</defaultGoal>
-        <finalName>Pointz-${project.version}</finalName>
+        <finalName>${project.name}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -87,30 +93,10 @@
                 <version>3.1.0</version>
                 <executions>
                     <execution>
-                        <id>shaded</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.projectlombok:lombok</exclude>
-                                </excludes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/src/main/java/fr/nivcoo/pointz/Pointz.java b/src/main/java/fr/nivcoo/pointz/Pointz.java
@@ -1,17 +1,25 @@
 package fr.nivcoo.pointz;
 
 import fr.nivcoo.pointz.cache.CacheManager;
-import fr.nivcoo.pointz.commands.Commands;
-import fr.nivcoo.pointz.commands.GuiCommands;
+import fr.nivcoo.pointz.commands.commands.CheckCMD;
+import fr.nivcoo.pointz.commands.commands.SendCMD;
+import fr.nivcoo.pointz.commands.commands.gui.ConverterGuiCMD;
+import fr.nivcoo.pointz.commands.commands.gui.ShopGuiCMD;
+import fr.nivcoo.pointz.commands.commands.manage.AddManageCMD;
+import fr.nivcoo.pointz.commands.commands.manage.DelManageCMD;
+import fr.nivcoo.pointz.commands.commands.manage.SetManageCMD;
 import fr.nivcoo.pointz.constructor.ItemsConverter;
 import fr.nivcoo.pointz.constructor.ItemsShop;
 import fr.nivcoo.pointz.constructor.MWConfig;
 import fr.nivcoo.pointz.inventory.Inventories;
 import fr.nivcoo.pointz.inventory.InventoryManager;
 import fr.nivcoo.pointz.placeholder.PlaceHolderAPI;
-import fr.nivcoo.pointz.utils.Config;
 import fr.nivcoo.pointz.utils.WebsiteAPI;
+import fr.nivcoo.utilsz.commands.CommandManager;
+import fr.nivcoo.utilsz.config.Config;
 import org.bukkit.Bukkit;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -22,15 +30,17 @@
 
 public class Pointz extends JavaPlugin implements Listener {
     private static Pointz INSTANCE;
-    private static Config config;
-    private static Config configMessage;
+    private Config config;
+    private Config configMessage;
     // public static GuiShop guiShop;
     private WebsiteAPI websiteAPI;
     private InventoryManager inventoryManager;
     private Inventories inventories;
     private String prefix;
     private MWConfig mwConfig;
 
+    private CommandManager commandManager;
+
     private CacheManager cacheManager;
     private List<ItemsConverter> getItemsConverter;
     private List<ItemsShop> getItemsShop;
@@ -40,8 +50,8 @@ public class Pointz extends JavaPlugin implements Listener {
     @Override
     public void onEnable() {
         INSTANCE = this;
-        config = new Config(new File("plugins" + File.separator + "Pointz" + File.separator + "config.yml"));
-        configMessage = new Config(new File("plugins" + File.separator + "Pointz" + File.separator + "messages.yml"));
+        config = new Config(loadFile("config.yml"));
+        configMessage = new Config(loadFile("messages.yml"));
         prefix = configMessage.getString("prefix");
         saveDefaultConfig();
         boolean goodKey = false;
@@ -94,14 +104,12 @@ public void onEnable() {
         getItemsConverter = websiteAPI.initItemsConverter();
         getItemsShop = websiteAPI.initItemsShop();
 
-        // guiShop = new GuiShop(this);
-        getCommand("pointz").setExecutor(new Commands());
-        getCommand("pshop").setExecutor(new GuiCommands());
-        getCommand("pconverter").setExecutor(new GuiCommands());
+        commandManager = new CommandManager(this, configMessage, "pointz", "pointz.commands");
+
+        registerCommands();
 
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI") && config.getBoolean("hooks.placeholder-api")) {
             new PlaceHolderAPI().register();
-
         }
 
         inventoryManager = new InventoryManager();
@@ -119,8 +127,35 @@ public void onDisable() {
             inventoryManager.closeAllInventories();
 
         cacheManager.stopScheduler();
+    }
 
+    public void registerCommands() {
+        commandManager.addCommand(new CheckCMD());
+        commandManager.addCommand(new SendCMD());
 
+        commandManager.addCommand(new AddManageCMD());
+        commandManager.addCommand(new DelManageCMD());
+        commandManager.addCommand(new SetManageCMD());
+
+        commandManager.addCommand(new ConverterGuiCMD());
+        commandManager.addCommand(new ShopGuiCMD());
+    }
+
+    private File loadFile(String path) {
+        File configFile = new File(getDataFolder(), path);
+        if (!configFile.exists()) {
+            configFile.getParentFile().mkdirs();
+            saveResource(path, false);
+        }
+
+        return configFile;
+    }
+
+    public void sendCommand(Player player, String cmds) {
+        ConsoleCommandSender console = Bukkit.getServer().getConsoleSender();
+        for (String cmd : cmds.split("\\[\\{\\+\\}\\]")) {
+            Bukkit.dispatchCommand(console, cmd.replace("{PLAYER}", player.getName()));
+        }
     }
 
     public Config getMessages() {
@@ -161,7 +196,10 @@ public WebsiteAPI getWebsiteAPI() {
 
     public void saveRessources(String name) {
         saveResource(name, false);
+    }
 
+    public CommandManager getCommandManager() {
+        return commandManager;
     }
 
     public List<ItemsConverter> getItemsConverter() {

diff --git a/src/main/java/fr/nivcoo/pointz/cache/CacheManager.java b/src/main/java/fr/nivcoo/pointz/cache/CacheManager.java
@@ -2,8 +2,8 @@
 
 import fr.nivcoo.pointz.Pointz;
 import fr.nivcoo.pointz.constructor.PlayersInformations;
-import fr.nivcoo.pointz.utils.Config;
 import fr.nivcoo.pointz.utils.WebsiteAPI;
+import fr.nivcoo.utilsz.config.Config;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/src/main/java/fr/nivcoo/pointz/commands/CCommand.java b/src/main/java/fr/nivcoo/pointz/commands/CCommand.java
@@ -0,0 +1,41 @@
+package fr.nivcoo.pointz.commands;
+
+import fr.nivcoo.pointz.Pointz;
+import fr.nivcoo.pointz.constructor.PlayersInformations;
+import fr.nivcoo.utilsz.commands.Command;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public interface CCommand extends Command {
+
+    default void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        execute((Pointz) plugin, sender, args);
+    }
+
+    default List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        return tabComplete((Pointz) plugin, sender, args);
+    }
+
+    void execute(Pointz plugin, CommandSender sender, String[] args);
+
+    List<String> tabComplete(Pointz plugin, CommandSender sender, String[] args);
+
+    default PlayersInformations getWebsiteUser(Player p) {
+        List<PlayersInformations> users = Pointz.get().getWebsiteAPI().getPlayersInfos(Collections.singletonList(p));
+        return users.get(0);
+    }
+
+    default List<String> getOnlinePlayersNames() {
+        List<String> players = new ArrayList<>();
+        for (Player p : Bukkit.getOnlinePlayers()) {
+            players.add(p.getName());
+        }
+        return players;
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ @@
     .idea
     *.iml
+    dependency-reduced-pom.xml
     # Ignore output generated files
     target
     out