Merge pull request #1 from lumi-git/v1.5.0

v1.5.0

Author: lumi-git

pom.xml

@@ -21,13 +21,18 @@
     </repositories>
 
     <dependencies>
-
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>1.15-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 
@@ -65,6 +70,14 @@
                         </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>fr.lumi</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
             </plugin>
         </plugins>
         <resources>

src/main/java/fr/lumi/Commandes/CommandRunnerCommand.java

@@ -116,11 +116,14 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+
         if (args.length == 0){
             sender.sendMessage(plugin.getUt().replacePlaceHoldersForPlayerPlgVar("&7This commands require more arguments! Use /acmdhelp for more information."));
             return true;
         }
 
+        CommandSender player = sender;
+
         if (args.length >= 1) {
             if (Objects.equals(args[0], "list")) {
 
@@ -279,13 +282,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
 
-
-
-
-
-
-
-
         if (Objects.equals(args[0], "delete") && args.length >= 2) {
 
             String id = args[1];
@@ -351,11 +347,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     index++;
                 }
                 player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayer(plugin.getLangConfig().getString("onAddingANewCommand"), cmd));
-
-
             cmd.saveInConfig(plugin.getCommandsConfig(), plugin);//sauvegarde de la commande dans le fichier de commands
-
-
             cmd.setRunning(cmd.isRunning(), plugin.getCommandsConfig(), plugin);
             plugin.getcommandList().add(cmd);
 

src/main/java/fr/lumi/Commandes/CommandRunnerEditor.java

@@ -42,8 +42,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
             valid = valid && openMenu( (Player) sender);
             if(!valid) return false;
-            player.sendMessage(plugin.getUt().replacePlaceHoldersForPlayerPlgVar("&eMenu Opened"));
-
 
             valid = valid && SaveMenu();
             if(!valid) return false;

src/main/java/fr/lumi/Main.java

@@ -3,7 +3,7 @@
 import fr.lumi.Commandes.CommandRunnerCommand;
 import fr.lumi.Commandes.CommandRunnerEditor;
 import fr.lumi.Commandes.CommandRunnerHelp;
-
+import fr.lumi.Metrics.Metrics;
 import fr.lumi.Commandes.CommandRunnerReload;
 import fr.lumi.FileVerifiers.ConfigFileVerification;
 import fr.lumi.FileVerifiers.LangFileVerification;
@@ -23,14 +23,13 @@ public final class Main extends JavaPlugin {
 
     private String[] Logo ={
     "&e&9     &6__     __ &e ",
-    "&e&9 /\\ &6/  |\\/||  \\&e|  &9Auto&6Commands &aVersion &e1.2.1",
+    "&e&9 /\\ &6/  |\\/||  \\&e|  &9Auto&6Commands &aVersion &e1.5.2",
     "&e&9/--\\&6\\__|  ||__/&e|  &8running on bukkit - paper",
     ""};
 
-
-
-
     FileConfiguration config = getConfig();
+
+    // TODO: implement condition system
     ConditionVerifier amcdVerifier = new ConditionVerifier(this);
     dailyCommandExecuter executer;
     CommandEditor acmdGUIEditor;
@@ -71,34 +70,16 @@ public FileConfiguration getLangConfig() {
         return Langconfig;
     }
 
-    public FileConfiguration getLangConfigWithoutreload() {
-        return Langconfig;
-    }
-
 
     public File getLangFile() {
         Langfile= new File(getDataFolder(),"lang.yml");
         return Langfile;
     }
 
-    public boolean saveLangFilewithLoad() {
-        try {
-            getLangConfig().save(getLangFile());
-        } catch (IOException ignored){
-            return false;
-        }
-        return true;
-    }
-
-
 
-    public boolean saveLangFile() {
-        try {
-            getLangConfigWithoutreload().save(getLangFile());
-        } catch (IOException ignored){
-            return false;
-        }
-        return true;
+    public void addBstatsMetrics(){
+        int pluginId = 21737;
+        Metrics metrics = new Metrics(this, pluginId);
     }
 
 
@@ -139,6 +120,10 @@ public void init(){
 
     @Override
     public void onEnable() {
+
+        // add bstat metrics
+        addBstatsMetrics();
+
         long  start = System.currentTimeMillis();
         init();
 
@@ -147,14 +132,10 @@ public void onEnable() {
 
         saveDefaultConfig();
         getRessourceFile(getLangFile(),"lang.yml",this);
-        //saveLangFile();
         boolean verified = Load();
 
         long exeTime = System.currentTimeMillis() - start;
         Bukkit.getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&',config.getString("ConsolePrefix")+" &aOn (took "+exeTime+" ms)"));
-
-
-
     }
 
     public boolean verifyFiles(){
@@ -164,30 +145,26 @@ public boolean verifyFiles(){
         return verified;
     }
 
-
-
     @Override
     public void onDisable() {
         Unload();
-
         Bukkit.getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&',config.getString("ConsolePrefix")+" &cOff"));
     }
 
     public boolean Load() {
         boolean verified = false;
+
         verified = verifyFiles();
+        if (!verified) {
+            Bukkit.getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&',config.getString("ConsolePrefix")+"&4Ignore these errors if this is the first time you are running the plugin."));
+        }
+
         reloadConfig();
         config = getConfig();
-
-
-
-
-
         Objects.requireNonNull(this.getCommand("acmdhelp")).setExecutor(new CommandRunnerHelp(this));
         Objects.requireNonNull(this.getCommand("acmd")).setExecutor(new CommandRunnerCommand(this));
         Objects.requireNonNull(this.getCommand("acmdreload")).setExecutor(new CommandRunnerReload(this));
 
-
         Bukkit.getConsoleSender().sendMessage(ChatColor.translateAlternateColorCodes('&',config.getString("ConsolePrefix")+ "&e-Loading "+getCommandsConfig().getKeys(false).size()+" AutoComands-"));
 
         //loading the commands in the plugin
@@ -277,8 +254,6 @@ public int getRunningCommand(){
         return count;
     }
 
-
-
     public long convertToTick(long seconds){
         return (long) seconds*20;
     }
@@ -290,7 +265,6 @@ public static void getRessourceFile(File file, String resource, Main plugin) {
                 file.createNewFile();
                 InputStream inputStream = plugin.getResource(resource);
                 OutputStream outputStream = new FileOutputStream(file);
-
                 byte[] buffer = new byte[1024];
                 int bytesRead;
                 while ((bytesRead = inputStream.read(buffer)) != -1) {
@@ -303,9 +277,6 @@ public static void getRessourceFile(File file, String resource, Main plugin) {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
         YamlConfiguration.loadConfiguration(file);
     }
-
-
 }

src/main/java/fr/lumi/Metrics/CustomChart.java

@@ -0,0 +1,37 @@
+package fr.lumi.Metrics;
+
+import java.util.function.BiConsumer;
+
+public abstract class CustomChart {
+
+    private final String chartId;
+
+    protected CustomChart(String chartId) {
+        if (chartId == null) {
+            throw new IllegalArgumentException("chartId must not be null");
+        }
+        this.chartId = chartId;
+    }
+
+    public Metrics.JsonObjectBuilder.JsonObject getRequestJsonObject(
+            BiConsumer<String, Throwable> errorLogger, boolean logErrors) {
+        Metrics.JsonObjectBuilder builder = new Metrics.JsonObjectBuilder();
+        builder.appendField("chartId", chartId);
+        try {
+            Metrics.JsonObjectBuilder.JsonObject data = getChartData();
+            if (data == null) {
+                // If the data is null we don't send the chart.
+                return null;
+            }
+            builder.appendField("data", data);
+        } catch (Throwable t) {
+            if (logErrors) {
+                errorLogger.accept("Failed to get data for custom chart with id " + chartId, t);
+            }
+            return null;
+        }
+        return builder.build();
+    }
+
+    protected abstract Metrics.JsonObjectBuilder.JsonObject getChartData() throws Exception;
+}