diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java
new file mode 100644
index 0000000..ded3dcf
--- /dev/null
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java
@@ -0,0 +1,106 @@
+package com.willfp.ecoarmor.display;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.display.DisplayModule;
+import com.willfp.eco.core.display.DisplayPriority;
+import com.willfp.eco.core.fast.FastItemStack;
+import com.willfp.eco.util.SkullUtils;
+import com.willfp.ecoarmor.sets.ArmorSet;
+import com.willfp.ecoarmor.sets.meta.ArmorSlot;
+import com.willfp.ecoarmor.sets.util.ArmorUtils;
+import com.willfp.ecoarmor.upgrades.Tier;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArmorDisplay extends DisplayModule {
+    /**
+     * Create armor display.
+     *
+     * @param plugin Instance of EcoArmor.
+     */
+    public ArmorDisplay(@NotNull final EcoPlugin plugin) {
+        super(plugin, DisplayPriority.LOWEST);
+    }
+
+    @Override
+    public void display(@NotNull final ItemStack itemStack,
+                        @NotNull final Object... args) {
+        ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return;
+        }
+        FastItemStack fis = FastItemStack.wrap(itemStack);
+
+        ArmorSet set = ArmorUtils.getSetOnItem(meta);
+
+        if (set == null) {
+            Tier crystalTier = ArmorUtils.getCrystalTier(meta);
+
+            if (crystalTier != null) {
+                List<String> lore = fis.getLore();
+                lore.addAll(FastItemStack.wrap(crystalTier.getCrystal()).getLore());
+                fis.setLore(lore);
+            }
+
+            ArmorSet shardSet = ArmorUtils.getShardSet(meta);
+
+            if (shardSet != null) {
+                List<String> lore = fis.getLore();
+                lore.addAll(FastItemStack.wrap(shardSet.getAdvancementShardItem()).getLore());
+
+                itemStack.setItemMeta(shardSet.getAdvancementShardItem().getItemMeta());
+                FastItemStack.wrap(itemStack).setLore(lore);
+            }
+
+            return;
+        }
+
+        ArmorSlot slot = ArmorSlot.getSlot(itemStack);
+        if (slot == null) {
+            return;
+        }
+
+        ItemStack slotStack;
+
+        if (ArmorUtils.isAdvanced(meta)) {
+            slotStack = set.getAdvancedItemStack(slot);
+        } else {
+            slotStack = set.getItemStack(slot);
+        }
+        ItemMeta slotMeta = slotStack.getItemMeta();
+        assert slotMeta != null;
+
+        Tier tier = ArmorUtils.getTier(meta);
+
+        List<String> lore = new ArrayList<>();
+
+        for (String s : FastItemStack.wrap(slotStack).getLore()) {
+            s = s.replace("%tier%", tier.getDisplayName());
+            lore.add(s);
+        }
+
+        if (meta.hasLore()) {
+            lore.addAll(fis.getLore());
+        }
+        meta.setDisplayName(slotMeta.getDisplayName());
+
+        if (meta instanceof SkullMeta && slotMeta instanceof SkullMeta) {
+            if (set.getSkullBase64() != null) {
+                SkullUtils.setSkullTexture((SkullMeta) meta, set.getSkullBase64());
+            }
+        }
+
+        if (meta instanceof LeatherArmorMeta && slotMeta instanceof LeatherArmorMeta) {
+            ((LeatherArmorMeta) meta).setColor(((LeatherArmorMeta) slotMeta).getColor());
+        }
+
+        itemStack.setItemMeta(meta);
+        FastItemStack.wrap(itemStack).setLore(lore);
+    }
+}
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt
deleted file mode 100644
index c6d3f27..0000000
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/display/ArmorDisplay.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.willfp.ecoarmor.display
-
-import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.display.DisplayModule
-import com.willfp.eco.core.display.DisplayPriority
-import com.willfp.eco.core.fast.FastItemStack
-import com.willfp.eco.util.SkullUtils
-import com.willfp.ecoarmor.sets.meta.ArmorSlot
-import com.willfp.ecoarmor.sets.util.ArmorUtils
-import org.bukkit.inventory.ItemStack
-import org.bukkit.inventory.meta.LeatherArmorMeta
-import org.bukkit.inventory.meta.SkullMeta
-
-class ArmorDisplay(plugin: EcoPlugin) : DisplayModule(plugin, DisplayPriority.LOWEST) {
-    override fun display(
-        itemStack: ItemStack,
-        vararg args: Any
-    ) {
-        val meta = itemStack.itemMeta ?: return
-
-        val fis = FastItemStack.wrap(itemStack)
-
-        val set = ArmorUtils.getSetOnItem(meta)
-
-        if (set == null) {
-            val crystalTier = ArmorUtils.getCrystalTier(meta)
-            if (crystalTier != null) {
-                val lore = fis.lore
-                lore.addAll(FastItemStack.wrap(crystalTier.crystal).lore)
-                fis.setLore(lore)
-            }
-
-            val shardSet = ArmorUtils.getShardSet(meta)
-            if (shardSet != null) {
-                val lore = fis.lore
-                lore.addAll(FastItemStack.wrap(shardSet.advancementShardItem).lore)
-                itemStack.itemMeta = shardSet.advancementShardItem.itemMeta
-                FastItemStack.wrap(itemStack).setLore(lore)
-            }
-
-            return
-        }
-
-        val slot = ArmorSlot.getSlot(itemStack) ?: return
-
-        val slotStack: ItemStack = if (ArmorUtils.isAdvanced(meta)) {
-            set.getAdvancedItemStack(slot)
-        } else {
-            set.getItemStack(slot)
-        }
-
-        val slotMeta = slotStack.itemMeta ?: return
-
-        val tier = ArmorUtils.getTier(meta)!!
-
-        val lore = (FastItemStack.wrap(slotStack).lore).map { it.replace("%tier%", tier.displayName) }.toMutableList()
-
-        if (meta.hasLore()) {
-            lore.addAll(fis.lore)
-        }
-
-        meta.setDisplayName(slotMeta.displayName)
-        if (meta is SkullMeta && slotMeta is SkullMeta) {
-            if (set.skullBase64 != null) {
-                SkullUtils.setSkullTexture(meta, set.skullBase64!!)
-            }
-        }
-
-        if (meta is LeatherArmorMeta && slotMeta is LeatherArmorMeta) {
-            meta.setColor(slotMeta.color)
-        }
-
-        itemStack.itemMeta = meta
-        FastItemStack.wrap(itemStack).lore = lore
-    }
-}
\ No newline at end of file