From 1e0ffdc08b053c7a2bd102c10318c3ff1d9054e3 Mon Sep 17 00:00:00 2001
From: LoJoSho <LoJoShogaming@gmail.com>
Date: Wed, 24 May 2023 16:41:54 -0500
Subject: [PATCH] clean: summer cleaning of CosmeticUser.java

---
 .../hmccosmetics/user/CosmeticUser.java       | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

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 25f73ecc..96a96f6d 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
@@ -6,7 +6,6 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.api.*;
 import com.hibiscusmc.hmccosmetics.config.Settings;
 import com.hibiscusmc.hmccosmetics.config.Wardrobe;
-import com.hibiscusmc.hmccosmetics.config.WardrobeLocation;
 import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
@@ -32,7 +31,7 @@ import java.util.logging.Level;
 
 public class CosmeticUser {
 
-    private UUID uniqueId;
+    private final UUID uniqueId;
     private int taskId;
     private HashMap<CosmeticSlot, Cosmetic> playerCosmetics = new HashMap<>();
     private UserWardrobeManager userWardrobeManager;
@@ -160,10 +159,7 @@ public class CosmeticUser {
 
     public boolean hasCosmeticInSlot(Cosmetic cosmetic) {
         if (getCosmetic(cosmetic.getSlot()) == null) return false;
-        if (cosmetic.getId() == getCosmetic(cosmetic.getSlot()).getId()) {
-            return true;
-        }
-        return false;
+        return Objects.equals(cosmetic.getId(), getCosmetic(cosmetic.getSlot()).getId());
     }
 
     public Set<CosmeticSlot> getSlotsWithCosmetics() {
@@ -300,8 +296,7 @@ public class CosmeticUser {
     }
 
     public boolean isInWardrobe() {
-        if (userWardrobeManager == null) return false;
-        return true;
+        return userWardrobeManager != null;
     }
 
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
@@ -317,8 +312,7 @@ public class CosmeticUser {
     }
 
     public boolean isBackpackSpawned() {
-        if (this.userBackpackManager == null) return false;
-        return true;
+        return this.userBackpackManager != null;
     }
 
     public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) {
@@ -369,7 +363,7 @@ public class CosmeticUser {
     }
 
     public List<CosmeticSlot> getDyeableSlots() {
-        ArrayList<CosmeticSlot> dyableSlots = new ArrayList();
+        ArrayList<CosmeticSlot> dyableSlots = new ArrayList<>();
 
         for (Cosmetic cosmetic : getCosmetics()) {
             if (cosmetic.isDyable()) dyableSlots.add(cosmetic.getSlot());
@@ -381,8 +375,7 @@ public class CosmeticUser {
     public boolean canEquipCosmetic(Cosmetic cosmetic) {
         if (!cosmetic.requiresPermission()) return true;
         if (isInWardrobe() && WardrobeSettings.isTryCosmeticsInWardrobe()) return true;
-        if (getPlayer().hasPermission(cosmetic.getPermission())) return true;
-        return false;
+        return getPlayer().hasPermission(cosmetic.getPermission());
     }
 
     public void hidePlayer() {
@@ -404,7 +397,7 @@ public class CosmeticUser {
     }
 
     public void hideCosmetics(HiddenReason reason) {
-        if (hideCosmetics == true) return;
+        if (hideCosmetics) return;
         PlayerCosmeticHideEvent event = new PlayerCosmeticHideEvent(this, reason);
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled()) {