Moved all warp icons to a dedicated class

BG-Software-LLC · Sep 22, 2023 · 0007d3b · 0007d3b
1 parent 5d6446b
commit 0007d3b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 22 deletions.
diff --git a/...main/java/com/bgsoftware/superiorskyblock/core/menu/button/impl/WarpManageIconButton.java b/...main/java/com/bgsoftware/superiorskyblock/core/menu/button/impl/WarpManageIconButton.java
@@ -8,7 +8,7 @@
 import com.bgsoftware.superiorskyblock.core.menu.button.MenuTemplateButtonImpl;
 import com.bgsoftware.superiorskyblock.core.menu.impl.MenuWarpManage;
 import com.bgsoftware.superiorskyblock.core.menu.view.MenuViewWrapper;
-import com.bgsoftware.superiorskyblock.island.warp.SIslandWarp;
+import com.bgsoftware.superiorskyblock.island.warp.WarpIcons;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -24,7 +24,7 @@ public ItemStack createViewItem() {
         IslandWarp islandWarp = menuView.getIslandWarp();
 
         ItemBuilder itemBuilder = islandWarp.getRawIcon() == null ?
-                SIslandWarp.DEFAULT_WARP_ICON.getBuilder() : new ItemBuilder(islandWarp.getRawIcon());
+                WarpIcons.DEFAULT_WARP_ICON.getBuilder() : new ItemBuilder(islandWarp.getRawIcon());
 
         ItemStack buttonItem = super.createViewItem();
 

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/menu/impl/MenuWarpIconEdit.java b/src/main/java/com/bgsoftware/superiorskyblock/core/menu/impl/MenuWarpIconEdit.java
@@ -20,7 +20,7 @@
 import com.bgsoftware.superiorskyblock.core.menu.button.impl.WarpIconEditConfirmButton;
 import com.bgsoftware.superiorskyblock.core.menu.view.AbstractIconProviderMenu;
 import com.bgsoftware.superiorskyblock.core.messages.Message;
-import com.bgsoftware.superiorskyblock.island.warp.SIslandWarp;
+import com.bgsoftware.superiorskyblock.island.warp.WarpIcons;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 public class MenuWarpIconEdit extends AbstractMenu<AbstractIconProviderMenu.View<IslandWarp>, AbstractIconProviderMenu.Args<IslandWarp>> {
@@ -66,7 +66,7 @@ public static class Args extends AbstractIconProviderMenu.Args<IslandWarp> {
 
         public Args(IslandWarp islandWarp) {
             super(islandWarp, islandWarp == null ? null : islandWarp.getRawIcon() == null ?
-                    SIslandWarp.DEFAULT_WARP_ICON : new TemplateItem(new ItemBuilder(islandWarp.getRawIcon())));
+                    WarpIcons.DEFAULT_WARP_ICON : new TemplateItem(new ItemBuilder(islandWarp.getRawIcon())));
         }
 
     }

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/menu/impl/MenuWarps.java b/src/main/java/com/bgsoftware/superiorskyblock/core/menu/impl/MenuWarps.java
@@ -25,7 +25,7 @@
 import com.bgsoftware.superiorskyblock.core.messages.Message;
 import com.bgsoftware.superiorskyblock.core.threads.BukkitExecutor;
 import com.bgsoftware.superiorskyblock.island.privilege.IslandPrivileges;
-import com.bgsoftware.superiorskyblock.island.warp.SIslandWarp;
+import com.bgsoftware.superiorskyblock.island.warp.WarpIcons;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -119,15 +119,11 @@ public static MenuWarps createInstance() {
 
         List<String> editLore = cfg.getStringList("edit-lore");
 
-        if (SIslandWarp.DEFAULT_WARP_ICON == null) {
-            ItemStack defaultWarpIcon = menuParseResult.getLayoutBuilder().build().getButtons().stream()
-                    .filter(button -> button.getViewButtonType().equals(WarpPagedObjectButton.class))
-                    .findFirst().map(MenuTemplateButton::getButtonItem)
-                    .orElse(null);
-
-            SIslandWarp.DEFAULT_WARP_ICON = new TemplateItem(defaultWarpIcon == null ? new ItemBuilder(Material.AIR) :
-                    new ItemBuilder(defaultWarpIcon));
-        }
+        ItemStack defaultWarpIcon = menuParseResult.getLayoutBuilder().build().getButtons().stream()
+                .filter(button -> button.getViewButtonType().equals(WarpPagedObjectButton.class))
+                .findFirst().map(MenuTemplateButton::getButtonItem)
+                .orElse(null);
+        WarpIcons.DEFAULT_WARP_ICON = new TemplateItem(defaultWarpIcon == null ? new ItemBuilder(Material.AIR) : new ItemBuilder(defaultWarpIcon));
 
         return new MenuWarps(menuParseResult, editLore);
     }

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/warp/SIslandWarp.java b/src/main/java/com/bgsoftware/superiorskyblock/island/warp/SIslandWarp.java
@@ -9,7 +9,6 @@
 import com.bgsoftware.superiorskyblock.core.itemstack.ItemBuilder;
 import com.bgsoftware.superiorskyblock.core.logging.Debug;
 import com.bgsoftware.superiorskyblock.core.logging.Log;
-import com.bgsoftware.superiorskyblock.core.menu.TemplateItem;
 import com.google.common.base.Preconditions;
 import org.bukkit.Location;
 import org.bukkit.inventory.ItemStack;
@@ -18,8 +17,6 @@
 
 public class SIslandWarp implements IslandWarp {
 
-    public static TemplateItem DEFAULT_WARP_ICON;
-
     private final WarpCategory warpCategory;
 
     private String name;

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/warp/SWarpCategory.java b/src/main/java/com/bgsoftware/superiorskyblock/island/warp/SWarpCategory.java
@@ -11,7 +11,6 @@
 import com.bgsoftware.superiorskyblock.core.logging.Debug;
 import com.bgsoftware.superiorskyblock.core.logging.Log;
 import com.google.common.base.Preconditions;
-import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.LinkedList;
@@ -22,8 +21,6 @@ public class SWarpCategory implements WarpCategory {
 
     private static final SuperiorSkyblockPlugin plugin = SuperiorSkyblockPlugin.getPlugin();
 
-    public static final ItemStack DEFAULT_WARP_ICON = new ItemBuilder(Material.BOOK)
-            .withName("&6{0}").build();
 
     private final List<IslandWarp> islandWarps = new LinkedList<>();
     private final UUID islandUUID;
@@ -37,7 +34,7 @@ public SWarpCategory(UUID islandUUID, String name, int slot, @Nullable ItemStack
         this.islandUUID = islandUUID;
         this.name = name;
         this.slot = slot;
-        this.icon = icon == null ? DEFAULT_WARP_ICON.clone() : icon;
+        this.icon = icon == null ? WarpIcons.DEFAULT_WARP_CATEGORY_ICON.build() : icon;
     }
 
     @Override
@@ -100,7 +97,7 @@ public ItemStack getIcon(@Nullable SuperiorPlayer superiorPlayer) {
     public void setIcon(@Nullable ItemStack icon) {
         Log.debug(Debug.SET_WARP_CATEGORY_ICON, getOwnerName(), this.name, icon);
 
-        this.icon = icon == null ? DEFAULT_WARP_ICON.clone() : icon.clone();
+        this.icon = icon == null ? WarpIcons.DEFAULT_WARP_CATEGORY_ICON.build() : icon.clone();
 
         IslandsDatabaseBridge.updateWarpCategoryIcon(getIsland(), this);
     }

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/warp/WarpIcons.java b/src/main/java/com/bgsoftware/superiorskyblock/island/warp/WarpIcons.java
@@ -0,0 +1,17 @@
+package com.bgsoftware.superiorskyblock.island.warp;
+
+import com.bgsoftware.superiorskyblock.core.itemstack.ItemBuilder;
+import com.bgsoftware.superiorskyblock.core.menu.TemplateItem;
+import org.bukkit.Material;
+
+public class WarpIcons {
+
+    public static final TemplateItem DEFAULT_WARP_CATEGORY_ICON = new TemplateItem(new ItemBuilder(Material.BOOK)
+            .withName("&6{0}"));
+    public static TemplateItem DEFAULT_WARP_ICON;
+
+    private WarpIcons() {
+
+    }
+
+}