From df6bd465b8acc4e4e8c0c1100db603158a9cb043 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Fri, 17 Dec 2021 15:58:28 +0000
Subject: [PATCH] More refactoring

---
 .../com/willfp/ecoarmor/upgrades/Tier.kt       | 18 ++++++++++++------
 .../willfp/ecoarmor/upgrades/TierProperties.kt | 11 -----------
 .../com/willfp/ecoarmor/upgrades/Tiers.kt      |  1 +
 3 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/TierProperties.kt

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tier.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tier.kt
index 4a1db23..ad4243a 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tier.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tier.kt
@@ -1,7 +1,6 @@
 package com.willfp.ecoarmor.upgrades
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.PluginDependent
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.items.CustomItem
@@ -18,7 +17,7 @@ import java.util.*
 class Tier(
     private val config: Config,
     plugin: EcoPlugin
-) : PluginDependent<EcoPlugin?>(plugin) {
+) {
     /**
      * The tier name.
      */
@@ -135,9 +134,6 @@ class Tier(
     }
 
     override fun equals(other: Any?): Boolean {
-        if (this === other) {
-            return true
-        }
         if (other !is Tier) {
             return false
         }
@@ -147,4 +143,14 @@ class Tier(
     override fun hashCode(): Int {
         return Objects.hash(this.id)
     }
-}
\ No newline at end of file
+}
+
+data class TierProperties(
+    val armor: Int,
+    val toughness: Int,
+    val knockback: Int,
+    val speed: Int,
+    val attackSpeed: Int,
+    val attackDamage: Int,
+    val attackKnockback: Int
+)
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/TierProperties.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/TierProperties.kt
deleted file mode 100644
index 2bf2218..0000000
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/TierProperties.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.willfp.ecoarmor.upgrades
-
-data class TierProperties(
-    val armor: Int,
-    val toughness: Int,
-    val knockback: Int,
-    val speed: Int,
-    val attackSpeed: Int,
-    val attackDamage: Int,
-    val attackKnockback: Int
-)
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tiers.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tiers.kt
index 96c98c6..1ef5c73 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tiers.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/upgrades/Tiers.kt
@@ -16,6 +16,7 @@ object Tiers {
     /**
      * Default tier.
      */
+    @JvmStatic
     lateinit var defaultTier: Tier
 
     /**