fix(core): update database and save user modifications

GeorgeV220 · May 30, 2023 · 0dd7686 · 0dd7686
1 parent 29b7aa2
commit 0dd7686
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/config/OptionsUtil.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/config/OptionsUtil.java
@@ -30,9 +30,9 @@ public enum OptionsUtil {
 
     DATABASE_USERS_TABLE_NAME("database.SQL.users table name", "skinoverlay_users", Optional.of("database.SQL.table name")),
 
-    DATABASE_SKINS_TABLE_NAME("database.SQL.skins table name", "skinoverlay_users", Optional.empty()),
+    DATABASE_SKINS_TABLE_NAME("database.SQL.skins table name", "skinoverlay_skins", Optional.empty()),
 
-    DATABASE_SQLITE("database.SQLite.file name", "skinoverlay", Optional.empty()),
+    DATABASE_FILE_NAME("database.SQL.SQLite file name", "skinoverlay", Optional.of("database.SQLite.file name")),
 
     DATABASE_MONGO_HOST("database.MongoDB.host", "localhost", Optional.empty()),
 

diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java
@@ -257,7 +257,7 @@ public void playerJoin() {
         if (userPreLoadEvent.isCancelled()) {
             return;
         }
-        skinOverlay.getUserCompletableFutureManager().add(skinOverlay.getCompletableFutureConsumer(), skinOverlay.getUserManager().getEntity(playerUUID())
+        skinOverlay.getUserManager().getEntity(playerUUID())
                 .handleAsync((user, throwable) -> {
                     if (throwable != null) {
                         skinOverlay.getLogger().log(Level.SEVERE, "Error retrieving user: ", throwable);
@@ -286,7 +286,13 @@ public void playerJoin() {
                         if (!event.isCancelled()) {
                             if (user.getCustomData(event.getData().key()) == null && !Objects.equals(user.getCustomData(event.getData().key()), event.getData().value())) {
                                 user.addCustomData(event.getData().key(), event.getData().value());
-                                skinOverlay.getSkinManager().save(user.defaultSkin());
+                                skinOverlay.getSkinManager().save(user.defaultSkin()).handleAsync((unused, saveThrowable) -> {
+                                    if (saveThrowable != null) {
+                                        skinOverlay.getLogger().log(Level.SEVERE, "Error: ", saveThrowable);
+                                        return unused;
+                                    }
+                                    return unused;
+                                });
                             }
                         }
                     } catch (IOException | ExecutionException | InterruptedException e) {
@@ -318,7 +324,13 @@ public void playerJoin() {
                         if (!skinOverlay.getSkinOverlay().type().isProxy() && OptionsUtil.PROXY.getBooleanValue()) {
                             return user;
                         }
-                        skinOverlay.getUserManager().save(userModifyDataEvent.getUser());
+                        skinOverlay.getUserManager().save(userModifyDataEvent.getUser()).handleAsync((unused, saveThrowable) -> {
+                            if (saveThrowable != null) {
+                                skinOverlay.getLogger().log(Level.SEVERE, "Error: ", saveThrowable);
+                                return unused;
+                            }
+                            return unused;
+                        });
                     }
                     return userModifyDataEvent.getUser();
                 }).handleAsync((user, throwable) -> {
@@ -354,7 +366,7 @@ public void playerJoin() {
                         return userPostLoadEvent.getUser();
                     }
                     return null;
-                }));
+                });
     }
 
     /**
@@ -365,7 +377,6 @@ public void playerJoin() {
      */
     public void playerQuit() {
         skinOverlay.getSkinOverlay().onlinePlayers().remove(playerUUID());
-        skinOverlay.getLoadedUsers().remove(playerUUID());
         if (!skinOverlay.getSkinOverlay().type().isProxy() && OptionsUtil.PROXY.getBooleanValue()) {
             return;
         }
@@ -383,7 +394,13 @@ public void playerQuit() {
                     if (!skinOverlay.getSkinOverlay().type().isProxy() && OptionsUtil.PROXY.getBooleanValue()) {
                         return;
                     }
-                    skinOverlay.getUserManager().save(userModifyDataEvent.getUser());
+                    skinOverlay.getUserManager().save(userModifyDataEvent.getUser()).handleAsync((unused, saveThrowable) -> {
+                        if (saveThrowable != null) {
+                            skinOverlay.getLogger().log(Level.SEVERE, "Error: ", saveThrowable);
+                            return unused;
+                        }
+                        return unused;
+                    });
                 }
             }
         });
@@ -413,6 +430,7 @@ public void updateSkin() {
                 SkinOptions skinOptions = user.skin().skinOptions();
                 if (skinOptions == null)
                     return;
+                skinOverlay.getLogger().info("Skin name " + skinOptions.getSkinName());
                 if (skinOptions.getSkinName().equals("default"))
                     return;
                 skinOverlay.getSkinHandler().updateSkin(event.getPlayerObject(), true);

diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/player/User.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/player/User.java
@@ -4,15 +4,17 @@
 import com.georgev22.skinoverlay.handler.Skin;
 
 import java.io.Serial;
+import java.io.Serializable;
 import java.util.UUID;
 
-public class User extends Entity {
+public class User extends Entity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
     public User(UUID uuid) {
         super(uuid);
+        addCustomData("entity_id", uuid.toString());
     }
 
     public Skin defaultSkin() {