From 98934536be6b0e2e2926051d9adc150e372eafa4 Mon Sep 17 00:00:00 2001
From: Craftinators <craftinatorssx@gmail.com>
Date: Tue, 28 Feb 2023 01:02:52 -0500
Subject: [PATCH] clean: make `Cosmetic` abstract

---
 .../hmccosmetics/cosmetic/Cosmetic.java       | 25 +++++++++----------
 .../cosmetic/types/CosmeticArmorType.java     |  2 --
 .../cosmetic/types/CosmeticBalloonType.java   | 19 ++------------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java
index 95632523..44e74a92 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java
@@ -12,7 +12,7 @@ import org.spongepowered.configurate.serialize.SerializationException;
 
 import java.util.logging.Level;
 
-public class Cosmetic {
+public abstract class Cosmetic {
 
     private String id;
     private String permission;
@@ -22,6 +22,7 @@ public class Cosmetic {
 
     protected Cosmetic(String id, @NotNull ConfigurationNode config) {
         this.id = id;
+
         if (!config.node("permission").virtual()) {
             this.permission = config.node("permission").getString();
         } else {
@@ -31,20 +32,20 @@ public class Cosmetic {
         if (!config.node("item").virtual()) this.item = generateItemStack(config.node("item"));
 
         MessagesUtil.sendDebugMessages("Slot: " + config.node("slot").getString());
-        setSlot(CosmeticSlot.valueOf(config.node("slot").getString()));
 
+        setSlot(CosmeticSlot.valueOf(config.node("slot").getString()));
         setDyable(config.node("dyeable").getBoolean(false));
 
         MessagesUtil.sendDebugMessages("Dyeable " + dyable);
-
         Cosmetics.addCosmetic(this);
     }
 
     public String getId() {
         return this.id;
     }
-    public String getPermission() {
-        return this.permission;
+
+    public void setId(String id) {
+        this.id = id;
     }
 
     public CosmeticSlot getSlot() {
@@ -54,6 +55,11 @@ public class Cosmetic {
     public void setSlot(CosmeticSlot slot) {
         this.slot = slot;
     }
+
+    public String getPermission() {
+        return this.permission;
+    }
+
     public void setPermission(String permission) {
         this.permission = permission;
     }
@@ -62,10 +68,6 @@ public class Cosmetic {
         return permission != null;
     }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public void setDyable(boolean dyable) {
         this.dyable = dyable;
     }
@@ -74,10 +76,7 @@ public class Cosmetic {
         return this.dyable;
     }
 
-
-    public void update(CosmeticUser user) {
-        // Override
-    }
+    public abstract void update(CosmeticUser user);
 
     @Nullable
     public ItemStack getItem() {
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java
index 84e7eb55..ec9cc150 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java
@@ -33,6 +33,4 @@ public class CosmeticArmorType extends Cosmetic {
     public EquipmentSlot getEquipSlot() {
         return this.equipSlot;
     }
-
-
 }
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java
index b6238b05..3487f45a 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java
@@ -19,7 +19,6 @@ public class CosmeticBalloonType extends Cosmetic {
 
     private final String modelName;
     private List<String> dyableParts;
-    //private HashMap<Animations, String> animationBalloons;
 
     public CosmeticBalloonType(String id, ConfigurationNode config) {
         super(id, config);
@@ -27,17 +26,9 @@ public class CosmeticBalloonType extends Cosmetic {
         String modelId = config.node("model").getString();
 
         try {
-            if (!config.node("dyable-parts").virtual()) dyableParts = config.node("dyable-parts").getList(String.class);
-
-            /*
-            if (!config.node("animations").virtual()) {
-                for (ConfigurationNode animationNode : config.node("animations").childrenMap().values()) {
-                    if (EnumUtils.isValidEnum(Animations.class, animationNode.key().toString().toUpperCase())) continue;
-                    animationBalloons.put(Animations.valueOf(animationNode.key().toString().toUpperCase()), animationNode.getString());
-                }
+            if (!config.node("dyable-parts").virtual()) {
+                dyableParts = config.node("dyable-parts").getList(String.class);
             }
-             */
-
         } catch (SerializationException e) {
             // Seriously?
             throw new RuntimeException(e);
@@ -89,10 +80,4 @@ public class CosmeticBalloonType extends Cosmetic {
         if (dyableParts.isEmpty()) return true;
         return dyableParts.contains(name);
     }
-
-    /*
-    public String getAnimation(Animations animation) {
-        return animationBalloons.get(animation);
-    }
-     */
 }