[update] アイテムの追加とリファクタ

Author: howard12721

src/main/java/com/github/elic0de/thejpspit/spigot/TheJpsPit.java

@@ -184,6 +184,10 @@ private void createItems() {
         ItemManager.register(new ItemDiamondBoots());
         ItemManager.register(new ItemObsidian());
         ItemManager.register(new ItemVividSword());
+        ItemManager.register(new ItemCobweb());
+        ItemManager.register(new ItemFishingRod());
+        ItemManager.register(new ItemTurtleShell());
+        ItemManager.register(new ItemUltimateSword());
     }
 
     private void createNPCs() {

src/main/java/com/github/elic0de/thejpspit/spigot/gui/ShopMenu.java

@@ -18,28 +18,26 @@ public class ShopMenu {
 
     private static final String[] MENU_LAYOUT = {
             "         ",
-            "  1234   ",
-            "         ",
+            " SCBoftc ",
+            " vu      ",
+            "         "
     };
 
     private final InventoryGui menu;
 
     private ShopMenu(TheJpsPit plugin, String title) {
         this.menu = new InventoryGui(plugin, title, MENU_LAYOUT);
-        this.menu.addElement(getItemElement('1', ItemManager.getPitItemEntry("diamond_sword")));
-        this.menu.addElement(getItemElement('2', ItemManager.getPitItemEntry("diamond_chestplate")));
-        this.menu.addElement(getItemElement('3', ItemManager.getPitItemEntry("diamond_boots")));
-        this.menu.addElement(getItemElement('4', ItemManager.getPitItemEntry("obsidian")));
+        ItemManager.getAllEntry().stream().map(this::getItemElement).forEach(this.menu::addElement);
     }
 
     public static ShopMenu create(TheJpsPit plugin, String title) {
         return new ShopMenu(plugin, title);
     }
 
-    private DynamicGuiElement getItemElement(char slotChar, PitItemEntry pitItemEntry) {
-        return new DynamicGuiElement(slotChar, (viewer) -> {
+    private DynamicGuiElement getItemElement(PitItemEntry pitItemEntry) {
+        return new DynamicGuiElement(pitItemEntry.getSlotChar(), (viewer) -> {
             final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer((Player) viewer);
-            return new StaticGuiElement(slotChar, pitItemEntry.getItemStack(), click -> {
+            return new StaticGuiElement(pitItemEntry.getSlotChar(), pitItemEntry.getItemStack(), click -> {
                 if (TheJpsPit.getInstance().getEconomyHook().isEmpty()) {
                     TheJpsPit.getInstance().getLogger().warning("経済プラグインが見つかりませんでした");
                     return true;

src/main/java/com/github/elic0de/thejpspit/spigot/item/ItemManager.java

@@ -7,6 +7,7 @@
 import org.bukkit.persistence.PersistentDataType;
 
 import javax.annotation.Nullable;
+import java.util.Collection;
 import java.util.HashMap;
 
 public class ItemManager {
@@ -34,6 +35,10 @@ public static PitItemEntry getPitItemEntry(ItemStack itemStack) {
         return itemMeta == null ? null : getPitItemEntry(itemMeta.getPersistentDataContainer().get(PitItemEntry.itemIdKey, PersistentDataType.STRING));
     }
 
+    public static Collection<PitItemEntry> getAllEntry() {
+        return pitItemMap.values();
+    }
+
     public static boolean isPitItem(ItemStack itemStack) {
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta == null) {

src/main/java/com/github/elic0de/thejpspit/spigot/item/PitItemEntry.java

@@ -7,6 +7,8 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 public abstract class PitItemEntry {
@@ -23,6 +25,12 @@ public abstract class PitItemEntry {
 
     public abstract String getName();
 
+    public abstract char getSlotChar();
+
+    public List<String> getRawLore() {
+        return new ArrayList<>();
+    }
+
     public final ItemStack getItemStack() {
         ItemStack itemStack = this.getRawItemStack().clone();
         ItemMeta itemMeta = itemStack.getItemMeta();
@@ -36,11 +44,14 @@ public final ItemStack getItemStack() {
     }
 
     public String[] getLore() {
-        return new String[]{
-                getName(),
-                String.format("必要レベル: §e%d", this.getRequiredLevel()),
-                String.format("値段: §e%d", this.getPrice())
-        };
+        return new ArrayList<String>() {
+            {
+                add(getName());
+                addAll(getRawLore());
+                add(String.format("§f必要レベル: §e%d", getRequiredLevel()));
+                add(String.format("§f値段: §e%d", getPrice()));
+            }
+        }.toArray(String[]::new);
     }
 
     protected boolean isEntryOf(ItemStack itemStack) {

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemCobweb.java

@@ -0,0 +1,38 @@
+package com.github.elic0de.thejpspit.spigot.item.items;
+
+import com.github.elic0de.thejpspit.spigot.item.PitItemEntry;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+public class ItemCobweb extends PitItemEntry {
+
+    @Override
+    public String getId() {
+        return "cobweb";
+    }
+
+    @Override
+    public ItemStack getRawItemStack() {
+        return new ItemStack(Material.COBWEB, 5);
+    }
+
+    @Override
+    public int getPrice() {
+        return 200;
+    }
+
+    @Override
+    public int getRequiredLevel() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return "§aクモの巣";
+    }
+
+    @Override
+    public char getSlotChar() {
+        return 'c';
+    }
+}

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemDiamondBoots.java

@@ -31,4 +31,9 @@ public int getRequiredLevel() {
     public String getName() {
         return "§aダイヤモンドの靴";
     }
+
+    @Override
+    public char getSlotChar() {
+        return 'B';
+    }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemDiamondChestPlate.java

@@ -31,4 +31,9 @@ public int getRequiredLevel() {
     public String getName() {
         return "§aダイヤのチェストプレート";
     }
+
+    @Override
+    public char getSlotChar() {
+        return 'C';
+    }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemDiamondSword.java

@@ -31,4 +31,9 @@ public int getRequiredLevel() {
     public String getName() {
         return "§aダイヤ剣";
     }
+
+    @Override
+    public char getSlotChar() {
+        return 'S';
+    }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemFishingRod.java

@@ -0,0 +1,39 @@
+package com.github.elic0de.thejpspit.spigot.item.items;
+
+import com.github.elic0de.thejpspit.spigot.item.PitItemEntry;
+import com.github.elic0de.thejpspit.spigot.util.ItemUtil;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+public class ItemFishingRod extends PitItemEntry {
+
+    @Override
+    public String getId() {
+        return "fishing_rod";
+    }
+
+    @Override
+    public ItemStack getRawItemStack() {
+        return ItemUtil.withUnbreakable(new ItemStack(Material.FISHING_ROD));
+    }
+
+    @Override
+    public int getPrice() {
+        return 200;
+    }
+
+    @Override
+    public int getRequiredLevel() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return "§a釣り竿";
+    }
+
+    @Override
+    public char getSlotChar() {
+        return 'f';
+    }
+}

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemObsidian.java

@@ -18,7 +18,7 @@ public ItemStack getRawItemStack() {
 
     @Override
     public int getPrice() {
-        return 3000;
+        return 50;
     }
 
     @Override
@@ -30,4 +30,9 @@ public int getRequiredLevel() {
     public String getName() {
         return "§a黒曜石 §fx10";
     }
+
+    @Override
+    public char getSlotChar() {
+        return 'o';
+    }
 }