[update] WIP

Author: howard12721

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

@@ -6,6 +6,7 @@
 import com.github.elic0de.thejpspit.item.PitItem;
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.github.elic0de.thejpspit.player.PitPlayerManager;
+import de.themoep.inventorygui.DynamicGuiElement;
 import de.themoep.inventorygui.InventoryGui;
 import de.themoep.inventorygui.StaticGuiElement;
 import org.bukkit.entity.Player;
@@ -35,31 +36,35 @@ public static ShopMenu create(TheJpsPit plugin, String title) {
         return new ShopMenu(plugin, title);
     }
 
-    private StaticGuiElement getItemElement(char slotChar, PitItem pitItem) {
-        return new StaticGuiElement(slotChar, pitItem.getShopItem(), click -> {
-            if (click.getWhoClicked() instanceof Player) return true;
-            if (TheJpsPit.getInstance().getEconomyHook().isEmpty()) return true;
+    private DynamicGuiElement getItemElement(char slotChar, PitItem pitItem) {
+        return new DynamicGuiElement(slotChar, (viewer) -> {
+            final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer((Player) viewer);
+            return new StaticGuiElement(slotChar, pitItem.getShopItem(), click -> {
+                if (TheJpsPit.getInstance().getEconomyHook().isEmpty()) {
+                    TheJpsPit.getInstance().getLogger().warning("経済プラグインが見つかりませんでした");
+                    return true;
+                }
 
-            final Player player = (Player) click.getWhoClicked();
-            final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(player);
-            final Inventory inventory = player.getInventory();
-            final EconomyHook economyHook = TheJpsPit.getInstance().getEconomyHook().get();
+                final Player player = pitPlayer.getPlayer();
+                final Inventory inventory = player.getInventory();
+                final EconomyHook economyHook = TheJpsPit.getInstance().getEconomyHook().get();
 
-            if (!economyHook.hasMoney(pitPlayer, BigDecimal.valueOf(pitItem.getPrice()))) {
-                player.sendMessage("&c【PIT】所持金が足りません！");
-                return true;
-            }
+                if (!economyHook.hasMoney(pitPlayer, BigDecimal.valueOf(pitItem.getPrice()))) {
+                    pitPlayer.sendMessage("&c【PIT】所持金が足りません！");
+                    return true;
+                }
 
-            if (inventory.firstEmpty() == -1) {
-                player.sendMessage("&c【PIT】インベントリが満杯で購入できません！");
-                return true;
-            }
+                if (inventory.firstEmpty() == -1) {
+                    pitPlayer.sendMessage("&c【PIT】インベントリが満杯で購入できません！");
+                    return true;
+                }
 
-            economyHook.takeMoney(pitPlayer, BigDecimal.valueOf(pitItem.getPrice()));
-            inventory.addItem(pitItem.getItemStack());
-            player.updateInventory();
+                economyHook.takeMoney(pitPlayer, BigDecimal.valueOf(pitItem.getPrice()));
+                inventory.addItem(pitItem.getItemStack());
+                player.updateInventory();
 
-            return true;
+                return true;
+            }, pitItem.getLore());
         });
     }
 

src/main/java/com/github/elic0de/thejpspit/item/PitItem.java

@@ -1,9 +1,9 @@
 package com.github.elic0de.thejpspit.item;
 
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.util.Arrays;
 import java.util.Objects;
 
 public abstract class PitItem {
@@ -16,14 +16,23 @@ public abstract class PitItem {
 
     public abstract int getRequiredLevel();
 
+    public abstract String getName();
+
     public ItemStack getShopItem() {
         ItemStack item = getItemStack().clone();
         ItemMeta itemMeta = Objects.requireNonNull(item.getItemMeta());
-        itemMeta.setLore(Arrays.asList(
-                String.format("必要レベル: §e%d", getRequiredLevel()),
-                String.format("値段: §e%d", getPrice())
-        ));
+        itemMeta.addItemFlags(ItemFlag.HIDE_UNBREAKABLE);
+        itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
+        itemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
         item.setItemMeta(itemMeta);
         return item;
     }
+
+    public String[] getLore() {
+        return new String[]{
+                getName(),
+                String.format("§f必要レベル: §e%d", getRequiredLevel()),
+                String.format("§f値段: §e%d", getPrice())
+        };
+    }
 }

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

@@ -25,4 +25,9 @@ public int getPrice() {
     public int getRequiredLevel() {
         return 0;
     }
+
+    @Override
+    public String getName() {
+        return "§aダイヤモンドの靴";
+    }
 }

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

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

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

@@ -26,4 +26,9 @@ public int getPrice() {
     public int getRequiredLevel() {
         return 0;
     }
+
+    @Override
+    public String getName() {
+        return "§aダイヤ剣";
+    }
 }

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

@@ -25,4 +25,9 @@ public int getPrice() {
     public int getRequiredLevel() {
         return 0;
     }
+
+    @Override
+    public String getName() {
+        return "§a黒曜石 §fx10";
+    }
 }

src/main/java/com/github/elic0de/thejpspit/villager/VillagerNPC.java

@@ -29,6 +29,8 @@ public Villager spawnAt(World world, Location location) {
         villager.setCustomNameVisible(true);
         villager.setCustomName(getName());
         villager.getPersistentDataContainer().set(npcIdKey, PersistentDataType.STRING, getId());
+        villager.setAI(false);
+        villager.setInvulnerable(true);
         return villager;
     }
 

src/main/java/com/github/elic0de/thejpspit/villager/villagers/ShopVillager.java

@@ -14,7 +14,7 @@ public String getId() {
 
     @Override
     public String getName() {
-        return "&e&lショップ";
+        return "§e§lショップ";
     }
 
     @Override