feat(cosmetic): Now properly saves owned & current cosmetics.

hashtek-mc · Oct 31, 2024 · c1b48e7 · c1b48e7
1 parent 2d04a93
commit c1b48e7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/fr/hashtek/spigot/breakffa/constants/Constants.java b/src/main/java/fr/hashtek/spigot/breakffa/constants/Constants.java
@@ -6,4 +6,6 @@ public class Constants
     public static final String PLAYER_DATA_PREFIX =
         fr.hashtek.tekore.common.constants.Constants.GAME_PREFIX_KEY + "breakffa:";
 
+    public static final String COSMETIC_KEY = "cosmetics";
+
 }
diff --git a/src/main/java/fr/hashtek/spigot/breakffa/cosmetics/Cosmetic.java b/src/main/java/fr/hashtek/spigot/breakffa/cosmetics/Cosmetic.java
@@ -1,11 +1,15 @@
 package fr.hashtek.spigot.breakffa.cosmetics;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 /**
  * @param   <T>     Cosmetic type
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 public class Cosmetic
     <T extends AbstractCosmetic>
 {
@@ -178,6 +182,7 @@ protected boolean buyConditions(Player player)
     /**
      * @return  Raw name (the one stored in the database)
      */
+    @JsonValue
     public String getRawName()
     {
         return this.rawName;
@@ -239,4 +244,15 @@ public CosmeticRarity getRarity()
         return this.rarity;
     }
 
+    /**
+     * @param   rawName Cosmetic's raw name
+     * @return  Cosmetic
+     * @apiNote Solely used for Redis access.
+     */
+    @JsonCreator
+    public static Cosmetic getFromRawName(String rawName)
+    {
+        return CosmeticManager.COSMETIC_REGISTRY.get(rawName);
+    }
+
 }
diff --git a/src/main/java/fr/hashtek/spigot/breakffa/cosmetics/CosmeticManager.java b/src/main/java/fr/hashtek/spigot/breakffa/cosmetics/CosmeticManager.java
@@ -46,7 +46,7 @@ public interface CurrentCosmeticGetter
     }
 
 
-    private static final Map<String, Cosmetic<? extends AbstractCosmetic>> COSMETIC_REGISTRY =
+    public static final Map<String, Cosmetic<? extends AbstractCosmetic>> COSMETIC_REGISTRY =
         getCosmetics().stream().collect(Collectors.toMap(Cosmetic::getRawName, cosmetic -> cosmetic));
 
     private final Set<Cosmetic<? extends AbstractCosmetic>> ownedCosmetics;