GH-161 codebase maintenance: serializer fixes and API improvements

Author: imDMK

playtime-api/src/main/java/com/github/imdmk/playtime/api/event/PlayTimeChangedEvent.java

@@ -0,0 +1,56 @@
+package com.github.imdmk.playtime.api.event;
+
+import com.github.imdmk.playtime.api.PlayTime;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public final class PlayTimeChangedEvent extends Event {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+    private static final boolean ASYNC = true;
+
+    private final UUID playerId;
+    private final PlayTime newTime;
+    private final PlayTime oldTime;
+
+    public PlayTimeChangedEvent(
+            @NotNull UUID playerId,
+            @NotNull PlayTime newTime,
+            @NotNull PlayTime oldTime
+    ) {
+        super(ASYNC);
+        this.playerId = playerId;
+        this.newTime = newTime;
+        this.oldTime = oldTime;
+    }
+
+    @NotNull
+    public UUID getPlayerId() {
+        return playerId;
+    }
+
+    @NotNull
+    public PlayTime getNewTime() {
+        return newTime;
+    }
+
+    @NotNull
+    public PlayTime getOldTime() {
+        return oldTime;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    @NotNull
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+
+}

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/PlayTimeCommand.java

@@ -69,7 +69,7 @@ void playTimeOther(@Context CommandSender sender, @Arg UUID playerId) {
 
     @Execute
     void setPlayTime(@Context CommandSender sender, @Arg UUID playerId, @Arg Duration time) {
-         PlayTime playTime = PlayTime.of(time);
+        PlayTime playTime = PlayTime.of(time);
 
         userService.setPlayTime(playerId, playTime)
                 .thenAccept(v -> messageService.create()

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/PlayTimeSaveListener.java

@@ -34,8 +34,8 @@ final class PlayTimeSaveListener implements Listener {
     @EventHandler
     void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        final UUID uuid = player.getUniqueId();
-        final PlayTime playTime = playTimeAdapter.read(player);
+        UUID uuid = player.getUniqueId();
+        PlayTime playTime = playTimeAdapter.read(player);
 
         userService.getOrCreate(uuid, playTime)
                 .thenAccept(user -> playTimeAdapter.write(player, user.getPlayTime()))
@@ -47,9 +47,9 @@ void onPlayerJoin(PlayerJoinEvent event) {
 
     @EventHandler
     void onPlayerQuit(PlayerQuitEvent event) {
-        final Player player = event.getPlayer();
-        final UUID uuid = player.getUniqueId();
-        final PlayTime playTime = playTimeAdapter.read(player);
+        Player player = event.getPlayer();
+        UUID uuid = player.getUniqueId();
+        PlayTime playTime = playTimeAdapter.read(player);
 
         userService.setPlayTime(uuid, playTime)
                 .exceptionally(e -> {

playtime-core/src/main/java/com/github/imdmk/playtime/core/feature/playtime/PlayTimeUserService.java

@@ -1,7 +1,9 @@
 package com.github.imdmk.playtime.core.feature.playtime;
 
 import com.github.imdmk.playtime.api.PlayTime;
+import com.github.imdmk.playtime.api.event.PlayTimeChangedEvent;
 import com.github.imdmk.playtime.core.injector.annotations.Service;
+import com.github.imdmk.playtime.core.platform.event.EventCaller;
 import org.panda_lang.utilities.inject.annotations.Inject;
 
 import java.util.UUID;
@@ -12,11 +14,17 @@ final class PlayTimeUserService {
 
     private final PlayTimeUserCache cache;
     private final PlayTimeUserRepository repository;
+    private final EventCaller eventCaller;
 
     @Inject
-    PlayTimeUserService(PlayTimeUserCache cache, PlayTimeUserRepository repository) {
+    PlayTimeUserService(
+            PlayTimeUserCache cache,
+            PlayTimeUserRepository repository,
+            EventCaller eventCaller
+    ) {
         this.cache = cache;
         this.repository = repository;
+        this.eventCaller = eventCaller;
     }
 
     CompletableFuture<PlayTimeUser> getOrCreate(
@@ -49,11 +57,14 @@ CompletableFuture<PlayTime> getPlayTime(UUID uuid) {
 
     CompletableFuture<Void> setPlayTime(
             UUID uuid,
-            PlayTime playTime
+            PlayTime newPlayTime
     ) {
         return getOrCreate(uuid)
                 .thenCompose(user -> {
-                    user.setPlayTime(playTime);
+                    PlayTime oldPlayTime = user.getPlayTime();
+
+                    user.setPlayTime(newPlayTime);
+                    eventCaller.callEvent(new PlayTimeChangedEvent(uuid, newPlayTime, oldPlayTime));
                     return repository.save(user);
                 });
     }

playtime-core/src/main/java/com/github/imdmk/playtime/core/platform/serdes/EnchantmentSerializer.java

@@ -5,6 +5,7 @@
 import eu.okaeri.configs.serdes.ObjectSerializer;
 import eu.okaeri.configs.serdes.SerializationData;
 import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
 
 public final class EnchantmentSerializer implements ObjectSerializer<Enchantment> {
@@ -16,14 +17,23 @@ public boolean supports(Class<? super Enchantment> type) {
 
     @Override
     public void serialize(Enchantment enchantment, SerializationData data, GenericsDeclaration generics) {
-        data.setValue(enchantment.getKey().getKey(), String.class);
+        data.setValue(enchantment.getKeyOrThrow().toString(), String.class);
     }
 
     @Override
     public Enchantment deserialize(DeserializationData data, GenericsDeclaration generics) {
-        //return RegistryAccess.registryAccess()
-         //       .getRegistry(RegistryKey.ENCHANTMENT)
-        //        .get(NamespacedKey.minecraft(data.getValue(String.class)));
-        return null;
+        String value = data.getValue(String.class);
+
+        NamespacedKey key = NamespacedKey.fromString(value);
+        if (key == null) {
+            throw new IllegalArgumentException("Invalid enchantment key: " + value);
+        }
+
+        Enchantment enchantment = Registry.ENCHANTMENT.get(key);
+        if (enchantment == null) {
+            throw new IllegalArgumentException("Unknown enchantment: " + value);
+        }
+
+        return enchantment;
     }
-}
+}

playtime-core/src/main/java/com/github/imdmk/playtime/core/platform/serdes/SoundSerializer.java

@@ -17,16 +17,23 @@ public boolean supports(Class<? super Sound> type) {
 
     @Override
     public void serialize(Sound sound, SerializationData data, GenericsDeclaration generics) {
-//        NamespacedKey key = Registry.SOUNDS.getKey(sound);
-//        if (key == null) {
-//            return;
-//        }
-//
-//        data.setValue(key.getKey(), String.class);
+        data.setValue(sound.getKeyOrThrow().toString(), String.class);
     }
 
     @Override
     public Sound deserialize(DeserializationData data, GenericsDeclaration generics) {
-        return Registry.SOUNDS.get(NamespacedKey.minecraft(data.getValue(String.class)));
+        String value = data.getValue(String.class);
+
+        NamespacedKey key = NamespacedKey.fromString(value);
+        if (key == null) {
+            throw new IllegalArgumentException("Invalid sound key: " + value);
+        }
+
+        Sound sound = Registry.SOUNDS.get(key);
+        if (sound == null) {
+            throw new IllegalArgumentException("Unknown sound: " + value);
+        }
+
+        return sound;
     }
 }