feat: 個人在庫

pino223-72 · pino223-72 · commit 1a246e4e1d8a · 2025-12-29T18:55:45.000+09:00
diff --git a/Readme.md b/Readme.md
@@ -51,7 +51,7 @@
 
 ### 報酬設定GUI
 `/spp rewardgui` で開いた画面にアイテムを置くだけで設定開始！
-* **在庫設定**: 有限在庫だけでなく、コンパレーターのボタンで「無限在庫」に切り替え可能。
+* **在庫設定**: 有限在庫だけでなく、コンパレーターのボタンで「無限在庫」に切り替え可能。サーバー全体・個人のみの在庫の切り替えも可能です。
 * **装飾モード**: 絵画のボタンで「装飾モード」に切り替えると、アイテム名と説明文だけが表示され、価格や在庫などの要素が表示されなくなります（購入も不可）。
 * **コマンド実行**: `rewards/ポイント名.yml` を直接編集することで、購入時にコンソールからコマンド（`%player%` `%point%`）を実行できます。
 ```
diff --git a/src/main/java/net/azisaba/simplepoint/GUIManager.java b/src/main/java/net/azisaba/simplepoint/GUIManager.java
@@ -2,6 +2,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -24,32 +25,66 @@ public GUIManager(SimplePointPlugin plugin) {
 
     private static class SettingSession {
         String pointName; int slot; ItemStack item; int price = 100; int stock = -1;
+        boolean isPersonal = false; // ✨追加
     }
 
     public void openRewardGUI(Player player, String pointName, boolean isAdmin) {
         String title = pointName + (isAdmin ? ":編集" : ":受け取り");
         Inventory gui = Bukkit.createInventory(null, 54, title);
         FileConfiguration config = plugin.getRewardManager().getRewardConfig(pointName);
+
         if (config != null) {
             for (String key : config.getKeys(false)) {
                 try {
                     int slot = Integer.parseInt(key);
                     ItemStack item = config.getItemStack(slot + ".item").clone();
                     int price = config.getInt(slot + ".price");
                     int stock = config.getInt(slot + ".stock", -1);
+                    boolean isPersonal = config.getBoolean(slot + ".is_personal", false);
                     int req = config.getInt(slot + ".requirement", 0);
 
-                    ItemMeta meta = item.getItemMeta();
-                    // ✨ 装飾モード(price: -1)でない場合のみ、SPPの要素を追加表示
+                    // 在庫切れ判定
+                    boolean isSoldOut = false;
+                    if (price != -1) {
+                        if (isPersonal) {
+                            int bought = getPersonalBoughtCount(player, pointName, slot);
+                            if (stock != -1 && bought >= stock) isSoldOut = true;
+                        } else {
+                            if (stock == 0) isSoldOut = true;
+                        }
+                    }
+
+                    // --- 編集モード時のみの特別処理 ---
+                    // 編集モードならバリアに変えず、かつ在庫情報をそのまま出す
+                    if (isAdmin) isSoldOut = false;
+
+                    ItemMeta meta = item.getItemMeta(); // 元の名前・説明文を保持したメタを取得
+
                     if (price != -1) {
                         List<String> lore = meta.hasLore() ? meta.getLore() : new ArrayList<>();
                         lore.add("§8----------");
-                        lore.add("§e価格: §f" + price + " pt");
-                        lore.add("§b在庫: §f" + (stock == -1 ? "無限" : stock));
+
+                        if (isSoldOut) {
+                            // 在庫切れ時の演出
+                            item.setType(Material.BARRIER); // ✨ 見た目だけをバリアに変更
+                            lore.add("§c§l在庫切れ / 購入不可");
+                        } else {
+                            lore.add("§e価格: §f" + price + " pt");
+                        }
+
+                        // 在庫状況の表示
+                        if (isPersonal) {
+                            int bought = getPersonalBoughtCount(player, pointName, slot);
+                            lore.add("§b個人在庫: §f" + (stock == -1 ? "なし" : bought + " / " + stock));
+                        } else {
+                            lore.add("§b共有在庫: §f" + (stock == -1 ? "無限" : stock));
+                        }
+
                         if (req > 0) lore.add("§6必要解放pt: §f" + req);
-                        meta.setLore(lore);
+                        meta.setLore(lore); // SPPの情報を追加したLoreをセット
                     }
-                    item.setItemMeta(meta);
+
+                    item.setItemMeta(meta); // バリアになったアイテムに元のメタを上書き
                     gui.setItem(slot, item);
                 } catch (Exception ignored) {}
             }
@@ -70,7 +105,6 @@ public void onInventoryClick(InventoryClickEvent event) {
         else if (title.contains(":編集")) {
             if (event.getRawSlot() < 0 || event.getRawSlot() >= 54) return;
             event.setCancelled(true);
-
             String pName = title.split(":")[0];
             ItemStack cursor = event.getCursor();
             ItemStack clicked = event.getCurrentItem();
@@ -96,6 +130,7 @@ private void startSetting(Player player, String pName, int slot, ItemStack item)
         if (config.contains(String.valueOf(slot))) {
             s.price = config.getInt(slot + ".price");
             s.stock = config.getInt(slot + ".stock", -1);
+            s.isPersonal = config.getBoolean(slot + ".is_personal", false); // ✨追加
         }
         sessions.put(player.getUniqueId(), s);
         openSettingGUI(player);
@@ -106,20 +141,19 @@ public void openSettingGUI(Player player) {
         Inventory inv = Bukkit.createInventory(null, 27, "報酬設定: " + s.pointName);
         inv.setItem(4, s.item);
 
-        // ボタン配置
         inv.setItem(10, createGuiItem(Material.RED_STAINED_GLASS_PANE, "§c価格 -100", "§7現在: " + (s.price == -1 ? "装飾中" : s.price)));
         inv.setItem(16, createGuiItem(Material.LIME_STAINED_GLASS_PANE, "§a価格 +100", "§7現在: " + (s.price == -1 ? "装飾中" : s.price)));
 
         String stockDisplay = (s.stock == -1) ? "§b無限" : "§f" + s.stock;
         inv.setItem(11, createGuiItem(Material.PINK_STAINED_GLASS_PANE, "§c在庫 -1", "§7現在: " + stockDisplay));
         inv.setItem(15, createGuiItem(Material.LIGHT_BLUE_STAINED_GLASS_PANE, "§b在庫 +1", "§7現在: " + stockDisplay));
 
-        // 在庫トグルボタン (無限/有限切り替え)
         inv.setItem(12, createGuiItem(Material.COMPARATOR, "§f在庫設定切替", "§7クリックで §b無限 §7と §e数値 §7を切り替え"));
+        inv.setItem(18, createGuiItem(Material.PAINTING, "§d§l装飾モード切替", "§7現在: " + (s.price == -1 ? "§aON" : "§cOFF")));
 
-        // ✨ 装飾モードトグルボタン
-        inv.setItem(18, createGuiItem(Material.PAINTING, "§d§l装飾モード切替",
-                "§7現在: " + (s.price == -1 ? "§aON (表示のみ)" : "§cOFF (販売用)") + "\n§8ONにすると価格・在庫が表示されません"));
+        // ✨在庫モード切替ボタン
+        inv.setItem(19, createGuiItem(Material.PLAYER_HEAD, "§6§l在庫モード切替",
+                "§7現在: " + (s.isPersonal ? "§a個人制限" : "§e共有在庫") + "\n§8クリックで切り替え"));
 
         inv.setItem(13, createGuiItem(Material.GOLD_BLOCK, "§e§l保存", "§7スロット: " + s.slot));
         inv.setItem(22, createGuiItem(Material.BARRIER, "§4§l削除", ""));
@@ -145,20 +179,18 @@ else if (slot == 15) {
             if (s.stock == -1) s.stock = 1;
             else s.stock += (click.isRightClick() ? 10 : 1);
         }
-        else if (slot == 12) { // 在庫トグル
-            s.stock = (s.stock == -1) ? 1 : -1;
-        }
-        else if (slot == 18) { // ✨ 装飾モードトグル
-            s.price = (s.price == -1) ? 100 : -1;
-        }
+        else if (slot == 12) s.stock = (s.stock == -1) ? 1 : -1;
+        else if (slot == 18) s.price = (s.price == -1) ? 100 : -1;
+        else if (slot == 19) s.isPersonal = !s.isPersonal; // ✨追加
         else if (slot == 22) {
             plugin.getRewardManager().deleteReward(s.pointName, s.slot);
             player.closeInventory();
             return;
         }
         else if (slot == 13) {
-            plugin.getRewardManager().saveReward(s.pointName, s.slot, s.item, s.price, s.stock);
-            player.playSound(player.getLocation(), org.bukkit.Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1.0f, 1.0f);
+            // ✨引数に s.isPersonal を追加
+            plugin.getRewardManager().saveReward(s.pointName, s.slot, s.item, s.price, s.stock, s.isPersonal);
+            player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1.0f, 1.0f);
             player.closeInventory();
             return;
         }
@@ -170,25 +202,44 @@ private void handlePurchase(Player player, String pointName, int slot) {
         if (config == null || !config.contains(String.valueOf(slot))) return;
 
         int price = config.getInt(slot + ".price");
-
-        // ✨ 装飾用アイテムなら購入処理を中断
         if (price == -1) return;
 
         int stock = config.getInt(slot + ".stock", -1);
+        boolean isPersonal = config.getBoolean(slot + ".is_personal", false); // ✨追加
         int req = config.getInt(slot + ".requirement", 0);
 
+        // ✨解放条件チェック
         int total = pointName.startsWith("TEAMREWARD_") ?
                 plugin.getTeamManager().getTeamPoints(pointName.replace("TEAMREWARD_", "")) :
                 plugin.getPointManager().getTotalPoint(pointName, player.getUniqueId());
-
         if (total < req) { player.sendMessage("§c解放条件未達成 (" + total + "/" + req + ")"); return; }
-        if (stock == 0) { player.sendMessage("§c在庫切れ"); return; }
+
+        // ✨在庫チェックの分岐
+        if (isPersonal) {
+            if (stock != -1 && getPersonalBoughtCount(player, pointName, slot) >= stock) {
+                player.sendMessage("§cこれ以上購入できません");
+                player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1.0f, 1.0f);
+                return;
+            }
+        } else {
+            if (stock == 0) {
+                player.sendMessage("§c在庫切れ");
+                player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1.0f, 1.0f);
+                return;
+            }
+        }
 
         String pKey = pointName.startsWith("TEAMREWARD_") ? pointName.replace("TEAMREWARD_", "") : pointName;
         int balance = plugin.getPointManager().getPoint(pKey, player.getUniqueId());
 
         if (balance >= price) {
-            if (stock > 0) plugin.getRewardManager().updateStock(pointName, slot, stock - 1);
+            // ✨減算処理の分岐
+            if (isPersonal) {
+                addPersonalBoughtCount(player, pointName, slot);
+            } else if (stock > 0) {
+                plugin.getRewardManager().updateStock(pointName, slot, stock - 1);
+            }
+
             plugin.getPointManager().addPoint(pKey, player.getUniqueId(), -price);
             player.getInventory().addItem(config.getItemStack(slot + ".item").clone());
 
@@ -200,15 +251,27 @@ private void handlePurchase(Player player, String pointName, int slot) {
 
             plugin.getLogManager().logPurchase(player.getName(), pointName, price, slot);
             player.sendMessage("§a購入完了！");
-            player.playSound(player.getLocation(), org.bukkit.Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 1.2f);
+            player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 1.2f);
             openRewardGUI(player, pointName, false);
         } else {
             player.sendMessage("§cポイント不足");
-
-            player.playSound(player.getLocation(), org.bukkit.Sound.ENTITY_VILLAGER_NO, 1.0f, 1.0f);
+            player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1.0f, 1.0f);
         }
     }
 
+    // ✨個人データの管理用ヘルパー
+    private int getPersonalBoughtCount(Player p, String pointName, int slot) {
+        FileConfiguration cfg = plugin.getPointManager().getPointConfig(pointName);
+        return cfg.getInt(p.getUniqueId() + ".purchased." + slot, 0);
+    }
+
+    private void addPersonalBoughtCount(Player p, String pointName, int slot) {
+        FileConfiguration cfg = plugin.getPointManager().getPointConfig(pointName);
+        int current = cfg.getInt(p.getUniqueId() + ".purchased." + slot, 0);
+        cfg.set(p.getUniqueId() + ".purchased." + slot, current + 1);
+        plugin.getPointManager().savePointConfig(pointName);
+    }
+
     private ItemStack createGuiItem(Material m, String name, String lore) {
         ItemStack item = new ItemStack(m); ItemMeta meta = item.getItemMeta();
         meta.setDisplayName(name); meta.setLore(Collections.singletonList(lore));
diff --git a/src/main/java/net/azisaba/simplepoint/PointManager.java b/src/main/java/net/azisaba/simplepoint/PointManager.java
@@ -88,4 +88,13 @@ public List<String> getPointNames() {
         }
         return names;
     }
+
+    public void savePointConfig(String pointName) {
+        FileConfiguration config = getPointConfig(pointName);
+        try {
+            config.save(new File(pointFolder, pointName + ".yml"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/src/main/java/net/azisaba/simplepoint/RewardManager.java b/src/main/java/net/azisaba/simplepoint/RewardManager.java
@@ -16,16 +16,12 @@ public class RewardManager {
 
     public RewardManager(SimplePointPlugin plugin) {
         this.plugin = plugin;
-        // rewards フォルダを作成
         this.rewardFolder = new File(plugin.getDataFolder(), "rewards");
         if (!rewardFolder.exists()) {
             rewardFolder.mkdirs();
         }
     }
 
-    /**
-     * ポイント名に対応する報酬設定ファイルを取得またはロードします
-     */
     public FileConfiguration getRewardConfig(String pointName) {
         if (configs.containsKey(pointName)) {
             return configs.get(pointName);
@@ -46,40 +42,32 @@ public FileConfiguration getRewardConfig(String pointName) {
     }
 
     /**
-     * 報酬アイテムを保存します
+     * 報酬アイテムを保存します (isPersonal 引数を追加)
      */
-    public void saveReward(String pointName, int slot, ItemStack item, int price, int stock) {
+    public void saveReward(String pointName, int slot, ItemStack item, int price, int stock, boolean isPersonal) {
         FileConfiguration config = getRewardConfig(pointName);
         String path = String.valueOf(slot);
 
         config.set(path + ".item", item);
         config.set(path + ".price", price);
         config.set(path + ".stock", stock);
+        config.set(path + ".is_personal", isPersonal); // ✨ ここで保存
 
         saveFile(pointName, config);
     }
 
-    /**
-     * 在庫数のみを更新します
-     */
     public void updateStock(String pointName, int slot, int newStock) {
         FileConfiguration config = getRewardConfig(pointName);
         config.set(slot + ".stock", newStock);
         saveFile(pointName, config);
     }
 
-    /**
-     * 指定スロットの報酬を削除します
-     */
     public void deleteReward(String pointName, int slot) {
         FileConfiguration config = getRewardConfig(pointName);
         config.set(String.valueOf(slot), null);
         saveFile(pointName, config);
     }
 
-    /**
-     * ファイルに物理保存します
-     */
     private void saveFile(String pointName, FileConfiguration config) {
         try {
             config.save(new File(rewardFolder, pointName + ".yml"));
@@ -89,9 +77,6 @@ private void saveFile(String pointName, FileConfiguration config) {
         }
     }
 
-    /**
-     * メモリ上のキャッシュをクリア（リロード用）
-     */
     public void reload() {
         configs.clear();
     }
diff --git a/src/main/java/net/azisaba/simplepoint/SPPCommand.java b/src/main/java/net/azisaba/simplepoint/SPPCommand.java
@@ -92,18 +92,30 @@ else if (sub.equals("set")) {
                 break;
 
             case "setreq":
-                if (args.length < 4) return false;
+                // ... 前後の引数チェックなどは既存通り ...
                 String pName = args[1];
                 int slot = Integer.parseInt(args[2]);
                 int req = Integer.parseInt(args[3]);
+
                 FileConfiguration config = plugin.getRewardManager().getRewardConfig(pName);
-                config.set(slot + ".requirement", req);
-                // 既存のデータを維持して保存
-                plugin.getRewardManager().saveReward(pName, slot,
-                        config.getItemStack(slot + ".item"),
-                        config.getInt(slot + ".price", 100),
-                        config.getInt(slot + ".stock", -1));
-                sender.sendMessage("§a" + pName + " " + slot + "番に解放条件 " + req + " pt を設定しました。");
+                if (config.contains(String.valueOf(slot))) {
+                    // 解放条件(requirement)だけをセット
+                    config.set(slot + ".requirement", req);
+
+                    // ✨ saveReward の引数に config から読み取った is_personal を追加して呼び出す
+                    plugin.getRewardManager().saveReward(
+                            pName,
+                            slot,
+                            config.getItemStack(slot + ".item"),
+                            config.getInt(slot + ".price", 100),
+                            config.getInt(slot + ".stock", -1),
+                            config.getBoolean(slot + ".is_personal", false) // ← ここを追加！
+                    );
+
+                    sender.sendMessage("§a" + pName + " " + slot + "番に解放条件 " + req + " pt を設定しました。");
+                } else {
+                    sender.sendMessage("§c指定されたスロットに報酬が存在しません。");
+                }
                 break;
 
             case "ranking":

Original file line number	Diff line number	Diff line change
`@@ -88,4 +88,13 @@ public List<String> getPointNames() {`
`88`	`88`	`}`
`89`	`89`	`return names;`
`90`	`90`	`}`
	`91`	`+`
	`92`	`+ public void savePointConfig(String pointName) {`
	`93`	`+ FileConfiguration config = getPointConfig(pointName);`
	`94`	`+ try {`
	`95`	`+ config.save(new File(pointFolder, pointName + ".yml"));`
	`96`	`+ } catch (IOException e) {`
	`97`	`+ e.printStackTrace();`
	`98`	`+ }`
	`99`	`+ }`
`91`	`100`	`}`