Create tr-TR.yml

README.md

@@ -38,7 +38,7 @@ dependencies {
 }
 ```
 ## API usage
-
+YOU PROBABLY DON'T NEED TO USE REDISECONOMY API: USE VAULT API https://github.com/MilkBowl/VaultAPI
 ```java
 // Access Point
 RedisEconomyAPI api = RedisEconomyAPI.getAPI();
@@ -53,7 +53,7 @@ api.getCurrencyBySymbol("€");//Gets the currency by symbol
 //Currency is a Vault Economy https://github.com/MilkBowl/VaultAPI/blob/master/src/main/java/net/milkbowl/vault/economy/Economy.java, 
 //same methods and everything
 currency.getBalance(offlinePlayer);
-currency.withdrawPlayer(offlinePlayer, 100);
+currency.withdrawPlayer(offlinePlayer, 100, "Reason of withdrawal");
 
 //Modify a player balance (default currency)
 api.getDefaultCurrency().setPlayerBalance(player.getUniqueId(), 1000);

jitpack.yml

@@ -1,5 +1,5 @@
 jdk:
-  - openjdk16
+  - openjdk17
 before_install:
-  - sdk install java 16.0.1-open
-  - sdk use java 16.0.1-open
+  - sdk install java 17.0.1-open
+  - sdk use java 17.0.1-open

pom.xml

@@ -6,13 +6,13 @@
 
     <groupId>dev.unnm3d</groupId>
     <artifactId>RedisEconomy</artifactId>
-    <version>4.3.8-SNAPSHOT</version>
+    <version>4.3.21</version>
     <packaging>jar</packaging>
 
     <name>RedisEconomy</name>
 
     <properties>
-        <java.version>16</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -23,8 +23,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>16</source>
-                    <target>16</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -44,6 +44,10 @@
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>dev.unnm3d.shaded.kyori</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>de.exlll.configlib</pattern>
+                                    <shadedPattern>dev.unnm3d.shaded.configlib</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.github.Anon8281.universalScheduler</pattern>
                                     <shadedPattern>dev.unnm3d.shaded.universalScheduler</shadedPattern>
@@ -114,16 +118,17 @@
             <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
         <repository>
-            <id>devmart-other</id>
-            <url>https://nexuslite.gcnt.net/repos/other/</url>
+            <id>maven_central</id>
+            <name>Maven Central</name>
+            <url>https://repo.maven.apache.org/maven2/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -135,35 +140,35 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.14.0</version>
+            <version>4.17.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.0</version>
+            <version>4.3.3</version>
         </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.3</version>
+            <version>2.11.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.lettuce</groupId>
             <artifactId>lettuce-core</artifactId>
-            <version>6.2.4.RELEASE</version>
+            <version>6.4.0.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.Emibergo02</groupId>
-            <artifactId>ConfigLib</artifactId>
-            <version>master-SNAPSHOT</version>
+            <groupId>de.exlll</groupId>
+            <artifactId>configlib-yaml</artifactId>
+            <version>4.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.Anon8281</groupId>

src/main/java/dev/unnm3d/rediseconomy/RedisEconomyPlugin.java

@@ -30,19 +30,24 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.time.Duration;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 public final class RedisEconomyPlugin extends JavaPlugin {
 
+    @Getter
     private static RedisEconomyPlugin instance;
-    //private EzRedisMessenger ezRedisMessenger;
     @Getter
     private ConfigManager configManager;
     @Getter
     private CurrenciesManager currenciesManager;
     private RedisManager redisManager;
     @Getter
     private TaskScheduler scheduler;
+    @Getter
+    private Plugin vaultPlugin;
+    @Getter
+    private static UUID instanceUUID;
 
 
     public Settings settings() {
@@ -53,41 +58,44 @@ public Langs langs() {
         return configManager.getLangs();
     }
 
-    public static RedisEconomyPlugin getInstance() {
-        return instance;
-    }
-
     @Override
     public void onLoad() {
         instance = this;
+        //Generate a unique instance id to not send redis updates to itself
+        instanceUUID = UUID.randomUUID();
 
         this.configManager = new ConfigManager(this);
 
         if (!setupRedis()) {
             this.getLogger().severe("Disabling: redis server unreachable!");
             this.getLogger().severe("Please setup a redis server before running this plugin!");
             this.getServer().getPluginManager().disablePlugin(this);
-            return;
         } else {
             this.getLogger().info("Redis server connected!");
         }
-
-        if (!setupVault()) { //creates currenciesManager and exchange
-            this.getLogger().severe("Disabled due to no Vault dependency found!");
-            this.getServer().getPluginManager().disablePlugin(this);
-        } else {
-            this.getLogger().info("Hooked into Vault!");
-        }
     }
 
     @Override
     public void onEnable() {
+        if (redisManager == null) return;
+
         this.scheduler = UniversalScheduler.getScheduler(this);
-        this.configManager.postStartupLoad();
+        this.configManager.loadLangs();
+        this.vaultPlugin = getServer().getPluginManager().getPlugin("Vault");
+        if (this.vaultPlugin == null) { //creates currenciesManager and exchange
+            this.getLogger().severe("Disabled due to no Vault dependency found!");
+            this.getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+
+        this.currenciesManager = new CurrenciesManager(redisManager, this, configManager);
+        this.getLogger().info("Hooked into Vault!");
+
         if (settings().migrationEnabled) {
             scheduler.runTaskLater(() ->
-                            currenciesManager.getCompleteMigration().complete(null),
-                    100L);//load: STARTUP doesn't consider dependencies on load so i have to wait a bit (bukkit bug?)
+                    currenciesManager.migrateFromOfflinePlayers(getServer().getOfflinePlayers()), 100L);
+        } else {
+            currenciesManager.loadDefaultCurrency(this.vaultPlugin);
         }
 
         getServer().getPluginManager().registerEvents(currenciesManager, this);
@@ -124,11 +132,10 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        redisManager.close();
+        if (redisManager != null)
+            redisManager.close();
         if (currenciesManager != null)
             this.getServer().getServicesManager().unregister(Economy.class, currenciesManager.getDefaultCurrency());
-        this.getServer().getMessenger().unregisterOutgoingPluginChannel(this);
-        this.getServer().getMessenger().unregisterIncomingPluginChannel(this);
         getLogger().info("RedisEconomy disabled successfully!");
     }
 
@@ -143,16 +150,16 @@ private boolean setupRedis() {
             if (configManager.getSettings().redis.user().equals("changecredentials"))
                 getLogger().warning("You are using default redis credentials. Please change them in the config.yml file!");
             //Authentication params
-            redisURIBuilder = configManager.getSettings().redis.password().equals("") ?
+            redisURIBuilder = configManager.getSettings().redis.password().isEmpty() ?
                     redisURIBuilder :
-                    configManager.getSettings().redis.user().equals("") ?
+                    configManager.getSettings().redis.user().isEmpty() ?
                             redisURIBuilder.withPassword(configManager.getSettings().redis.password().toCharArray()) :
                             redisURIBuilder.withAuthentication(configManager.getSettings().redis.user(), configManager.getSettings().redis.password());
 
             getLogger().info("Connecting to redis server " + redisURIBuilder.build().toString() + "...");
-            this.redisManager = new RedisManager(RedisClient.create(redisURIBuilder.build()));
+            this.redisManager = new RedisManager(RedisClient.create(redisURIBuilder.build()), configManager.getSettings().redis.getPoolSize());
             redisManager.isConnected().get(1, java.util.concurrent.TimeUnit.SECONDS);
-            if (!configManager.getSettings().clusterId.equals(""))
+            if (!configManager.getSettings().clusterId.isEmpty())
                 RedisKeys.setClusterId(configManager.getSettings().clusterId);
             return true;
         } catch (Exception e) {
@@ -164,14 +171,6 @@ private boolean setupRedis() {
         }
     }
 
-    private boolean setupVault() {
-        Plugin vault = getServer().getPluginManager().getPlugin("Vault");
-        if (vault == null)
-            return false;
-        this.currenciesManager = new CurrenciesManager(redisManager, this, configManager);
-        currenciesManager.loadDefaultCurrency(vault);
-        return true;
-    }
 
     private void loadCommand(String cmdName, CommandExecutor executor, TabCompleter tabCompleter) {
         PluginCommand cmd = getServer().getPluginCommand(cmdName);

src/main/java/dev/unnm3d/rediseconomy/command/MainCommand.java

@@ -27,17 +27,29 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         } else if (args.length == 1) {
             if (!args[0].equalsIgnoreCase("reload")) return true;
             if (!sender.hasPermission("rediseconomy.admin")) return true;
-            String serverId = plugin.getConfigManager().getSettings().serverId; //Keep serverId
             plugin.getConfigManager().loadSettingsConfig();//Reload configs
-            plugin.getConfigManager().loadLangs();
-            plugin.getConfigManager().getSettings().serverId = serverId; //Restore serverId
+            plugin.getConfigManager().loadLangs(); //Reload langs
             plugin.getConfigManager().saveConfigs(); //Save configs
             this.adventureWebuiEditorAPI = new AdventureWebuiEditorAPI(plugin.getConfigManager().getSettings().webEditorUrl);
-            sender.sendMessage("§aReloaded successfully " + plugin.getConfigManager().getSettings().serverId + "!");
+            sender.sendMessage("§aReloaded successfully!");
             return true;
         }
         String langField = args[1];
 
+        if (args[0].equalsIgnoreCase("expandpool")) {
+            if (!sender.hasPermission("rediseconomy.admin.expandpool")) {
+                plugin.getConfigManager().getLangs().send(sender, plugin.getConfigManager().getLangs().noPermission);
+                return true;
+            }
+            try {
+                plugin.getCurrenciesManager().getRedisManager().expandPool(Integer.parseInt(args[1]));
+                plugin.getConfigManager().getLangs().send(sender, "§aPool expanded successfully!");
+            } catch (Exception e) {
+                plugin.getConfigManager().getLangs().send(sender, "§cError expanding pool: " + e.getMessage());
+            }
+            return true;
+        }
+
         if (!sender.hasPermission("rediseconomy.admin.editmessage")) {
             plugin.getConfigManager().getLangs().send(sender, plugin.getConfigManager().getLangs().noPermission);
             return true;
@@ -83,9 +95,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     @Override
     public @NotNull List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
         if (args.length == 1) {
-            return List.of("reload", "editmessage");
-        } else if (args.length == 2 && sender.hasPermission("rediseconomy.admin.editmessage")) {
-            return Arrays.stream(plugin.getConfigManager().getLangs().getClass().getFields()).filter(field -> field.getType().equals(String.class)).map(Field::getName).toList();
+            return List.of("reload", "editmessage", "expandpool");
+        } else if (args.length == 2 && args[0].equalsIgnoreCase("expandpool")) {
+            return List.of("1", "2", "3", "4", "5");
+        } else if (args.length == 2 && sender.hasPermission("rediseconomy.admin.editmessage") && args[0].equalsIgnoreCase("editmessage")) {
+            return Arrays.stream(plugin.getConfigManager().getLangs().getClass().getFields())
+                    .filter(field -> field.getType().equals(String.class))
+                    .map(Field::getName)
+                    .filter(name -> name.startsWith(args[1]))
+                    .toList();
         }
         return List.of();
     }