New update 2.1.0 with Title perform when point change

PlayerNguyen · PlayerNguyen · commit b41e6a51a418 · 2020-11-09T20:29:10.000+07:00
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 def devBuild = false
 
 group = 'com.playernguyen'
-version = ('2.0.4b') + ((devBuild) ? "-devbuild": "")
+version = ('2.1b') + ((devBuild) ? "-devbuild": "")
 
 sourceCompatibility = '1.8'
 
@@ -41,9 +41,11 @@ dependencies {
     implementation 'org.jetbrains:annotations:19.0.0'
     compileOnly 'me.clip:placeholderapi:2.10.4'
     compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT'
-    compile 'com.zaxxer:HikariCP:3.4.5'
-
     compileOnly files('lib/BossShopPro.jar')
+
+    // Compile and put to jar
+    compile 'com.zaxxer:HikariCP:3.4.5'
+    compile 'org.slf4j:slf4j-site:2.0.0-alpha1'
 }
 
 publishing {
diff --git a/src/main/java/me/playernguyen/opteco/OptEco.java b/src/main/java/me/playernguyen/opteco/OptEco.java
@@ -29,7 +29,7 @@
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.sql.SQLException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.logging.Logger;
 
@@ -60,6 +60,8 @@ public class OptEco extends JavaPlugin {
     private Metrics metrics;
     private ScheduleManager scheduleManager;
 
+    private boolean canLoad = true;
+
     @Override
     public void onEnable() {
         this.setupInstance();
@@ -107,9 +109,11 @@ private void hookBossShopPro() {
     @Override
     public void onDisable() {
         // Unregister listen
-        listenerManager.unregisterAll();
+        if (listenerManager != null)
+            listenerManager.unregisterAll();
         // Command manager
-        commandManager.getContainer().clear();
+        if (commandManager != null)
+            commandManager.getContainer().clear();
     }
 
     private void setupMetric() {
@@ -122,7 +126,9 @@ private void setupMetric() {
     }
 
     private void setupInstance() {
-        instance = this;
+        if (instance == null) {
+            instance = this;
+        }
     }
 
     private void setupManager() {
@@ -133,12 +139,19 @@ private void setupManager() {
     }
 
     private void setupLoader() {
-        // Configuration Loader
-        this.optEcoConfigurationLoader = new OptEcoConfigurationLoader();
-        // Language Loader
-        this.optEcoLanguageLoader = new OptEcoLanguageLoader(
-                getConfigurationLoader().getString(OptEcoConfiguration.LANGUAGE_FILE)
-        );
+        try {
+            if (canLoad) {
+                // Configuration Loader
+                this.optEcoConfigurationLoader = new OptEcoConfigurationLoader();
+                // Language Loader
+                this.optEcoLanguageLoader = new OptEcoLanguageLoader(
+                        getConfigurationLoader().getString(OptEcoConfiguration.LANGUAGE_FILE)
+                );
+            }
+        } catch (IOException e) {
+            this.canLoad = false;
+            e.printStackTrace();
+        }
     }
 
     private void setupAccount() {
diff --git a/src/main/java/me/playernguyen/opteco/OptEcoConfiguration.java b/src/main/java/me/playernguyen/opteco/OptEcoConfiguration.java
@@ -25,18 +25,24 @@ public enum OptEcoConfiguration {
     SQL_ACCOUNT_TABLE_NAME("Settings.SQL.Table.Accounts", "opteco"),
     SQL_TRANSACT_TABLE_NAME("Settings.SQL.Table.Transactions", "opteco_transaction"),
 
-    SQL_CLOSE_CONNECT_TIMEOUT("Settings.SQL.ConnectionPool.Timeout", 60),
     COMMAND_LIMIT_TOP("Settings.Preferences.LimitTopCommand", 5),
     COUNTDOWN_ENABLE("Settings.Payment.Pending.Countdown.Enable", true),
     COUNTDOWN_TYPE("Settings.Payment.Pending.Countdown.Type", "message"),
 
     REFRESH_TIME("Settings.Preferences.Cache.RefreshTime", 5),
 
-    DEBUG("Settings.Debug", false),
+    DEBUG("Debug", false),
     LANGUAGE_FILE("Settings.Preferences.Language", "language.yml"),
 
-    TITLE_STAY("Settings.Title.Stay", 20),
-    TITLE_FADE_OUT("Settings.Title.FadeOut", 100),
+    TITLE_ENABLE("Settings.Effect.TittleCounter.Enable", true),
+    TITLE_STAY("Settings.Effect.TittleCounter.Stay", 20),
+    TITLE_FADE_OUT("Settings.Effect.TittleCounter.FadeOut", 100),
+    TITLE_SPEED("Settings.Effect.TittleCounter.Speed", 5),
+
+    TITLE_LIMIT_VALUE("Settings.Effect.TitleCounter.Limit", 10000),
+
+    TAB_EXECUTOR("Settings.Preferences.TabExecutor", true)
+
     ;
 
     private final String path;
diff --git a/src/main/java/me/playernguyen/opteco/OptEcoLanguage.java b/src/main/java/me/playernguyen/opteco/OptEcoLanguage.java
@@ -61,6 +61,11 @@ public enum OptEcoLanguage {
     UNACCEPTED_VALUE_PAYMENT("COMMAND.UNACCEPTED_VALUE", "&cThis value is unaccepted in transaction"),
     MUST_BE_INTEGER("MUST_BE_INTEGER", "&cThe value must be an integer!"),
 
+    FORMAT_INCREASE_TITLE("EFFECT.TITLE.INCREASE.TITLE", "&a+ &8%current% &a+"),
+    FORMAT_INCREASE_SUB_TITLE("EFFECT.TITLE.INCREASE.SUBTITLE", "&c^ &6%remain% &c^ "),
+
+    FORMAT_DECREASE_TITLE("EFFECT.TITLE.DECREASE.TITLE", "&c- &8%current% &c-"),
+    FORMAT_DECREASE_SUB_TITLE("EFFECT.TITLE.DECREASE.SUBTITLE", "&c^ &6%remain% &c^"),
 
     ;
 
diff --git a/src/main/java/me/playernguyen/opteco/account/SQLAccountDatabase.java b/src/main/java/me/playernguyen/opteco/account/SQLAccountDatabase.java
@@ -138,6 +138,18 @@ public boolean hasAccount(UUID uuid) {
 
     @Override
     public boolean setBalance(UUID uuid, double newBalance) {
+        double oldBalance = this.getBalance(uuid);
+        OptEcoPointChangedEvent.ModifyType type = (oldBalance > newBalance)
+                ? OptEcoPointChangedEvent.ModifyType.DECREASE
+                : OptEcoPointChangedEvent.ModifyType.INCREASE;
+        // Call event
+        Bukkit.getPluginManager().callEvent(new OptEcoPointChangedEvent(
+                uuid,
+                oldBalance,
+                newBalance,
+                type
+        ));
+
         return this.save(new Account(uuid, newBalance));
     }
 
@@ -149,26 +161,12 @@ public double getBalance(UUID uuid) {
     @Override
     public boolean takeBalance(UUID uuid, double amount) {
         // Take balance
-        // Call event
-        Bukkit.getPluginManager().callEvent(new OptEcoPointChangedEvent(
-                uuid,
-                this.getBalance(uuid),
-                this.getBalance(uuid) - amount,
-                OptEcoPointChangedEvent.ModifyType.DECREASE
-        ));
         return this.setBalance(uuid, this.getBalance(uuid) - amount);
     }
 
     @Override
     public boolean addBalance(UUID uuid, double amount) {
         // Add new balance
-        // Call event
-        Bukkit.getPluginManager().callEvent(new OptEcoPointChangedEvent(
-                uuid,
-                this.getBalance(uuid),
-                this.getBalance(uuid) + amount,
-                OptEcoPointChangedEvent.ModifyType.INCREASE
-        ));
         return this.setBalance(uuid, this.getBalance(uuid) + amount);
     }
 
diff --git a/src/main/java/me/playernguyen/opteco/command/OptEcoCommand.java b/src/main/java/me/playernguyen/opteco/command/OptEcoCommand.java
@@ -1,5 +1,6 @@
 package me.playernguyen.opteco.command;
 
+import me.playernguyen.opteco.OptEcoConfiguration;
 import me.playernguyen.opteco.OptEcoLanguage;
 import me.playernguyen.opteco.permission.OptEcoPermission;
 import org.bukkit.ChatColor;
@@ -8,6 +9,7 @@
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.RemoteConsoleCommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -78,15 +80,22 @@ private boolean execute(CommandSender sender, Command command, String s, String[
     }
 
     @Override
-    public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] strings) {
+    public List<String> onTabComplete(@NotNull CommandSender commandSender,
+                                      @NotNull Command command,
+                                      @NotNull String s,
+                                      String[] strings) {
+        // Whether the tab executor disabled
+        if (!getConfigurationLoader().getBool(OptEcoConfiguration.TAB_EXECUTOR)) {
+            return null;
+        }
+        // Whether enabled
         if (strings.length < 2) {
             ArrayList<String> allowCommand = new ArrayList<>();
             for (SubCommand subCommand : getSubCommands()) {
                 if (subCommand.checkPermission(commandSender)) allowCommand.add(subCommand.getCommand());
             }
             return allowCommand;
         } else {
-
             SubCommand subCommand = getSubCommand(strings[0]);
             if (subCommand == null) return null;
             else return subCommand.onTabComplete(commandSender, separator(strings, 1));
diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandSet.java b/src/main/java/me/playernguyen/opteco/command/SubCommandSet.java
@@ -13,6 +13,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class SubCommandSet extends SubCommand {
     SubCommandSet(String command, OptEco plugin) {
@@ -78,7 +79,7 @@ private boolean execute(CommandSender sender, ArrayList<String> args) {
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.SET_SUCCESS))
                             .replace("%value%", Double.toString(value))
-                            .replace("%who%", target.getName())
+                            .replace("%who%", Objects.requireNonNull(target.getName()))
                             .replace("%currency%", getPlugin().getConfigurationLoader().getString(OptEcoConfiguration.CURRENCY_SYMBOL))
             );
             // Refresh the cache account
@@ -88,7 +89,7 @@ private boolean execute(CommandSender sender, ArrayList<String> args) {
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.SET_FAIL))
                             .replace("%value%", _value)
-                            .replace("%who%", target.getName())
+                            .replace("%who%", Objects.requireNonNull(target.getName()))
                             .replace("%currency%", getPlugin().getConfigurationLoader().getString(OptEcoConfiguration.CURRENCY_SYMBOL))
             );
         }
diff --git a/src/main/java/me/playernguyen/opteco/configuration/OptEcoLanguageLoader.java b/src/main/java/me/playernguyen/opteco/configuration/OptEcoLanguageLoader.java
@@ -9,29 +9,26 @@ public class OptEcoLanguageLoader extends OptEcoLoaderAbstract {
 
     public static final char COLOR_SYMBOL = '&';
 
-    public OptEcoLanguageLoader(String file) {
+    public OptEcoLanguageLoader(String file) throws IOException {
 //        super(new File(OptEco.getInstance().getDataFolder(), file));
         super(file, "Auto-generated language by OptEco", "language", false);
         saveDefault();
     }
 
-    public void saveDefault() {
+    public void saveDefault() throws IOException {
         this.getConfiguration().options().copyDefaults(true);
 
         for (OptEcoLanguage dc : OptEcoLanguage.values())
             this.getConfiguration().addDefault(dc.getPath(), dc.getDefaultSetting());
 
-        try {
-            this.getConfiguration().save(getFile());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        this.getConfiguration().save(getFile());
     }
 
     public String getRawLanguage(OptEcoLanguage optEcoLanguage) {
         return this.getConfiguration().getString(optEcoLanguage.getPath());
     }
 
+
     public String getLanguage(OptEcoLanguage optEcoLanguage) {
         return ChatColor.translateAlternateColorCodes(COLOR_SYMBOL, this.getRawLanguage(optEcoLanguage));
     }
diff --git a/src/main/java/me/playernguyen/opteco/configuration/OptEcoLoaderAbstract.java b/src/main/java/me/playernguyen/opteco/configuration/OptEcoLoaderAbstract.java
@@ -57,7 +57,7 @@ public void setHeader(String header) {
         this.header = header;
     }
 
-    public abstract void saveDefault();
+    public abstract void saveDefault() throws IOException;
 
     public File getFile() {
         return file;
diff --git a/src/main/java/me/playernguyen/opteco/listener/OptEcoPlayerListener.java b/src/main/java/me/playernguyen/opteco/listener/OptEcoPlayerListener.java
@@ -1,5 +1,6 @@
 package me.playernguyen.opteco.listener;
 
+import me.playernguyen.opteco.OptEcoConfiguration;
 import me.playernguyen.opteco.event.OptEcoPointChangedEvent;
 import me.playernguyen.opteco.schedule.PointChangedPerformance;
 import org.bukkit.entity.Player;
@@ -38,6 +39,8 @@ public void onPlayerQuitEvent(PlayerQuitEvent e) {
 
     @EventHandler
     public void onChange(OptEcoPointChangedEvent e) {
+        // Whether enable the title counter
+        if (getConfigurationLoader().getBool(OptEcoConfiguration.TITLE_ENABLE))
         // Call new async
         this.getScheduleManager().callAsyncTimer(new PointChangedPerformance(e), 0, 0);
     }
diff --git a/src/main/java/me/playernguyen/opteco/logger/OptEcoDebugger.java b/src/main/java/me/playernguyen/opteco/logger/OptEcoDebugger.java
@@ -8,7 +8,7 @@
 
 public class OptEcoDebugger extends OptEcoImplementation implements Debugger {
 
-    private CommandSender sender;
+    private final CommandSender sender;
 
     private final String prefix;
 
diff --git a/src/main/java/me/playernguyen/opteco/schedule/PointChangedPerformance.java b/src/main/java/me/playernguyen/opteco/schedule/PointChangedPerformance.java
@@ -1,6 +1,7 @@
 package me.playernguyen.opteco.schedule;
 
 import me.playernguyen.opteco.OptEcoConfiguration;
+import me.playernguyen.opteco.OptEcoLanguage;
 import me.playernguyen.opteco.event.OptEcoPointChangedEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -32,16 +33,26 @@ public void run() {
         }
         // Decrease case
         if (event.getType() == OptEcoPointChangedEvent.ModifyType.DECREASE) {
-            double changeValue = Math.sqrt((pointCounter - event.getNewPoint()));
+            // Point counter limit
+            if (pointCounter - event.getNewPoint()
+                    > getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_LIMIT_VALUE)) {
+                pointCounter = event.getNewPoint();
+            }
+            double changeValue = Math.sqrt((pointCounter - event.getNewPoint()) *
+                    getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_SPEED));
             pointCounter -= changeValue;
             // Send title
             String formattedPoint = new DecimalFormat("#0.00")
                     .format(Math.max(event.getNewPoint(), pointCounter));
             String formattedMinusPoint = new DecimalFormat("#0.00")
                     .format(Math.max((pointCounter - (event.getNewPoint())), 0));
             player.sendTitle(
-                    ChatColor.translateAlternateColorCodes('&', String.format("&a- &8%s &a-", formattedPoint)),
-                    ChatColor.translateAlternateColorCodes('&', String.format("&c^ &6%s &c^", formattedMinusPoint)),
+                    ChatColor.translateAlternateColorCodes('&',
+                            getInstance().getLanguageLoader().getLanguage(OptEcoLanguage.FORMAT_DECREASE_TITLE)
+                                .replace("%current%", formattedPoint).replace("%remain%", formattedMinusPoint)
+                    ),
+                    getInstance().getLanguageLoader().getLanguage(OptEcoLanguage.FORMAT_DECREASE_SUB_TITLE)
+                            .replace("%current%", formattedPoint).replace("%remain%", formattedMinusPoint),
                     0,
                     getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_STAY),
                     getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_FADE_OUT)
@@ -54,17 +65,26 @@ public void run() {
         }
         // Increase case
         if (event.getType() == OptEcoPointChangedEvent.ModifyType.INCREASE) {
+            // If out of limit, just display one time
+            if (event.getNewPoint() - pointCounter
+                    > getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_LIMIT_VALUE)) {
+                this.pointCounter = event.getNewPoint();
+            }
             // Count up and push to the counter
-            double changeValue = Math.sqrt((event.getNewPoint() - pointCounter));
+            double changeValue = Math.sqrt((event.getNewPoint() - pointCounter) *
+                    getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_SPEED));
             pointCounter += changeValue;
             // Send title
             String formattedPoint = new DecimalFormat("#0.00")
                     .format(Math.min(pointCounter, event.getNewPoint()));
             String formattedMinusPoint = new DecimalFormat("#0.00")
                     .format(Math.max((event.getNewPoint() - (pointCounter)), 0));
 
-            player.sendTitle(ChatColor.translateAlternateColorCodes('&', String.format("&a+ &8%s &a+", formattedPoint)),
-                    ChatColor.translateAlternateColorCodes('&', String.format("&c^ &6%s &c^", formattedMinusPoint)),
+            player.sendTitle(
+                    getInstance().getLanguageLoader().getLanguage(OptEcoLanguage.FORMAT_INCREASE_TITLE)
+                            .replace("%current%", formattedPoint).replace("%remain%", formattedMinusPoint),
+                    getInstance().getLanguageLoader().getLanguage(OptEcoLanguage.FORMAT_INCREASE_SUB_TITLE)
+                            .replace("%current%", formattedPoint).replace("%remain%", formattedMinusPoint),
                     0,
                     getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_STAY),
                     getInstance().getConfigurationLoader().getInt(OptEcoConfiguration.TITLE_FADE_OUT)
diff --git a/src/main/java/me/playernguyen/opteco/sql/MySQLEstablish.java b/src/main/java/me/playernguyen/opteco/sql/MySQLEstablish.java

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,11 @@ public enum OptEcoLanguage {`
`61`	`61`	`UNACCEPTED_VALUE_PAYMENT("COMMAND.UNACCEPTED_VALUE", "&cThis value is unaccepted in transaction"),`
`62`	`62`	`MUST_BE_INTEGER("MUST_BE_INTEGER", "&cThe value must be an integer!"),`
`63`	`63`
	`64`	`+ FORMAT_INCREASE_TITLE("EFFECT.TITLE.INCREASE.TITLE", "&a+ &8%current% &a+"),`
	`65`	`+ FORMAT_INCREASE_SUB_TITLE("EFFECT.TITLE.INCREASE.SUBTITLE", "&c^ &6%remain% &c^ "),`
	`66`	`+`
	`67`	`+ FORMAT_DECREASE_TITLE("EFFECT.TITLE.DECREASE.TITLE", "&c- &8%current% &c-"),`
	`68`	`+ FORMAT_DECREASE_SUB_TITLE("EFFECT.TITLE.DECREASE.SUBTITLE", "&c^ &6%remain% &c^"),`
`64`	`69`
`65`	`70`	`;`
`66`	`71`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void setHeader(String header) {`
`57`	`57`	`this.header = header;`
`58`	`58`	`}`
`59`	`59`
`60`		`- public abstract void saveDefault();`
	`60`	`+ public abstract void saveDefault() throws IOException;`
`61`	`61`
`62`	`62`	`public File getFile() {`
`63`	`63`	`return file;`