From 4136d19396ec948df2db7d24c1bb46c48315ec48 Mon Sep 17 00:00:00 2001
From: yusshu <andreroldan.me@gmail.com>
Date: Mon, 3 Mar 2025 00:05:19 -0500
Subject: [PATCH] *: go back to 2.7.7, add @NotNull and @Nullable annotations
 for CosmeticHolder interface

---
 build.gradle.kts                               |  2 +-
 .../hmccosmetics/cosmetic/CosmeticHolder.java  | 18 +++++++++---------
 .../hmccosmetics/user/CosmeticUser.java        | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 82d46ea9..8757c67a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.hibiscusmc"
-version = "2.8.0${getGitCommitHash()}"
+version = "2.7.7${getGitCommitHash()}"
 
 allprojects {
     apply(plugin = "java")
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticHolder.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticHolder.java
index 2b4e8c8a..8f41ee4f 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticHolder.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/CosmeticHolder.java
@@ -15,9 +15,9 @@ import java.util.Objects;
  * users, for example.
  */
 public interface CosmeticHolder {
-    @Nullable Cosmetic getCosmetic(CosmeticSlot slot);
+    @Nullable Cosmetic getCosmetic(@NotNull CosmeticSlot slot);
 
-    ImmutableCollection<Cosmetic> getCosmetics();
+    @NotNull ImmutableCollection<Cosmetic> getCosmetics();
 
     void addCosmetic(@NotNull Cosmetic cosmetic, @Nullable Color color);
 
@@ -32,29 +32,29 @@ public interface CosmeticHolder {
         }
     }
 
-    void removeCosmeticSlot(CosmeticSlot slot);
+    void removeCosmeticSlot(@NotNull CosmeticSlot slot);
 
-    default void removeCosmeticSlot(Cosmetic cosmetic) {
+    default void removeCosmeticSlot(@NotNull Cosmetic cosmetic) {
         removeCosmeticSlot(cosmetic.getSlot());
     }
 
-    default boolean hasCosmeticInSlot(CosmeticSlot slot) {
+    default boolean hasCosmeticInSlot(@NotNull CosmeticSlot slot) {
         return getCosmetic(slot) != null;
     }
 
-    default boolean hasCosmeticInSlot(Cosmetic cosmetic) {
+    default boolean hasCosmeticInSlot(@NotNull Cosmetic cosmetic) {
         final var existingCosmetic = getCosmetic(cosmetic.getSlot());
         if (existingCosmetic == null) return false;
         return Objects.equals(cosmetic.getId(), existingCosmetic.getId());
     }
 
-    default boolean canEquipCosmetic(Cosmetic cosmetic) {
+    default boolean canEquipCosmetic(@NotNull Cosmetic cosmetic) {
         return canEquipCosmetic(cosmetic, false);
     }
 
-    boolean canEquipCosmetic(Cosmetic cosmetic, boolean ignoreWardrobe);
+    boolean canEquipCosmetic(@NotNull Cosmetic cosmetic, boolean ignoreWardrobe);
 
-    void updateCosmetic(CosmeticSlot slot);
+    void updateCosmetic(@NotNull CosmeticSlot slot);
 
     /**
      * Just for backwards compatibility, ensures that the given viewer and the given cosmetic holder
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
index f5904d67..70f78d0a 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
@@ -209,12 +209,12 @@ public class CosmeticUser implements CosmeticHolder {
     }
 
     @Override
-    public Cosmetic getCosmetic(CosmeticSlot slot) {
+    public Cosmetic getCosmetic(@NotNull CosmeticSlot slot) {
         return playerCosmetics.get(slot);
     }
 
     @Override
-    public ImmutableCollection<Cosmetic> getCosmetics() {
+    public @NotNull ImmutableCollection<Cosmetic> getCosmetics() {
         return ImmutableList.copyOf(playerCosmetics.values());
     }
 
@@ -268,7 +268,7 @@ public class CosmeticUser implements CosmeticHolder {
     }
 
     @Override
-    public void removeCosmeticSlot(CosmeticSlot slot) {
+    public void removeCosmeticSlot(@NotNull CosmeticSlot slot) {
         // API
         PlayerCosmeticRemoveEvent event = new PlayerCosmeticRemoveEvent(this, getCosmetic(slot));
         Bukkit.getPluginManager().callEvent(event);
@@ -291,7 +291,7 @@ public class CosmeticUser implements CosmeticHolder {
     }
 
     @Override
-    public boolean hasCosmeticInSlot(CosmeticSlot slot) {
+    public boolean hasCosmeticInSlot(@NotNull CosmeticSlot slot) {
         return playerCosmetics.containsKey(slot);
     }
 
@@ -300,7 +300,7 @@ public class CosmeticUser implements CosmeticHolder {
     }
 
     @Override
-    public void updateCosmetic(CosmeticSlot slot) {
+    public void updateCosmetic(@NotNull CosmeticSlot slot) {
         if (getCosmetic(slot) == null) {
             return;
         }
@@ -641,7 +641,7 @@ public class CosmeticUser implements CosmeticHolder {
     }
 
     @Override
-    public boolean canEquipCosmetic(Cosmetic cosmetic, boolean ignoreWardrobe) {
+    public boolean canEquipCosmetic(@NotNull Cosmetic cosmetic, boolean ignoreWardrobe) {
         if (!cosmetic.requiresPermission()) return true;
         if (isInWardrobe() && !ignoreWardrobe) {
             if (WardrobeSettings.isTryCosmeticsInWardrobe() && userWardrobeManager.getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return true;