Merge pull request #1 from Uweb95/dev

V1.1

Author: Uweb95

README.md

@@ -1,7 +1,9 @@
 ## Inventory Database
 
-This plugin syncs players' inventory and armor using a database.
-Currently, the data is only saved when the user disconnects or gets kicked.
+This plugin syncs players' inventory and armor using a database.  
+I wrote the plugin for paper, but it should work on Bukkit/Spigot too.  
+
+Tested minecraft version: 1.19.3
 
 ### Configuration
 
@@ -20,7 +22,9 @@ general:
   # Enable inventory sync
   syncInventory: true
   # Enable armor sync
-  syncArmor: true 
+  syncArmor: true
+  # Time between data saves in minutes. (0 to only sync when connecting/disconnecting)
+  saveInterval: 2
 
 debug:
   # Inventory sync debug messages.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.lunarsoftware</groupId>
     <artifactId>inventorydatabase</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
 
     <name>InventoryDatabase</name>

src/main/java/de/lunarsoftware/inventorydatabase/InventoryDatabase.java

@@ -4,6 +4,8 @@
 import de.lunarsoftware.inventorydatabase.events.PlayerJoin;
 import de.lunarsoftware.inventorydatabase.events.PlayerLeave;
 import de.lunarsoftware.inventorydatabase.sync.Sync;
+import org.bukkit.Bukkit;
+import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -29,6 +31,13 @@ public void onEnable() {
         pluginManager.registerEvents(new PlayerLeave(), this);
     }
 
+    public void onDisable() {
+        sync.saveOnlinePlayers();
+        Bukkit.getScheduler().cancelTasks(this);
+        HandlerList.unregisterAll(this);
+        database.disconnect();
+    }
+
     public static Logger logger() {
         return logger;
     }

src/main/java/de/lunarsoftware/inventorydatabase/sync/Sync.java

@@ -2,6 +2,7 @@
 
 import de.lunarsoftware.inventorydatabase.InventoryDatabase;
 import de.lunarsoftware.inventorydatabase.database.PlayerInventory;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.io.BukkitObjectInputStream;
@@ -11,7 +12,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class Sync {
@@ -20,10 +23,14 @@ public class Sync {
     private final boolean inventorySync;
     private final boolean armorSync;
 
+    private final SyncTask syncTask;
+
     public Sync() {
         enableDebug = InventoryDatabase.getInstance().getConfig().getBoolean("debug.syncMessages", false);
         inventorySync = InventoryDatabase.getInstance().getConfig().getBoolean("general.syncInventory", false);
         armorSync = InventoryDatabase.getInstance().getConfig().getBoolean("general.syncArmor", false);
+
+        syncTask = new SyncTask();
     }
 
     public void loadPlayerInventory(Player player) {
@@ -77,6 +84,22 @@ public void saveData(final Player player, final ItemStack[] inventory, final Ite
         }
     }
 
+    public void saveOnlinePlayers() {
+        if (enableDebug) InventoryDatabase.logger().info("Start saving task");
+        List<Player> players = new ArrayList<>(Bukkit.getOnlinePlayers());
+
+        if (players.size() == 0) {
+            if (enableDebug) InventoryDatabase.logger().info("No players online to save.");
+            return;
+        }
+
+        for (Player player : players) {
+            if (player.isOnline()) InventoryDatabase.getInstance().getSync().savePlayerInventory(player);
+        }
+
+        if (enableDebug) InventoryDatabase.logger().info("Inventory of " + players.size() + " players saved.");
+    }
+
     public void loadData(final Player player) {
         PlayerInventory playerInventory = PlayerInventory.getInventory(player);
         if (!inventorySync && !armorSync) return;

src/main/java/de/lunarsoftware/inventorydatabase/sync/SyncTask.java

@@ -0,0 +1,19 @@
+package de.lunarsoftware.inventorydatabase.sync;
+
+import de.lunarsoftware.inventorydatabase.InventoryDatabase;
+import org.bukkit.Bukkit;
+
+public class SyncTask {
+    private final long saveInterval;
+
+    public SyncTask() {
+        saveInterval = InventoryDatabase.getInstance().getConfig().getLong("general.saveInterval", 0) * 60 * 20;
+
+        // Only activate task when saveInterval is set higher than 0
+        if (saveInterval > 0) runTask();
+    }
+
+    private void runTask() {
+        Bukkit.getScheduler().runTaskTimerAsynchronously(InventoryDatabase.getInstance(), () -> InventoryDatabase.getInstance().getSync().saveOnlinePlayers(), saveInterval, saveInterval);
+    }
+}

src/main/resources/config.yml

@@ -11,6 +11,8 @@ database:
 general:
   syncInventory: true
   syncArmor: true
+  # Time between data saves in minutes. (0 to only sync when connecting/disconnecting)
+  saveInterval: 2
 
 debug:
   # Inventory sync debug messages.