From cc5758facae5f646ebe57ffc369359230eef479c Mon Sep 17 00:00:00 2001
From: yaohunya <31456652@qq.com>
Date: Wed, 21 Aug 2024 12:17:54 +0800
Subject: [PATCH] 1.1Bate

---
 .../io/yutian/boxsimulate/BoxSimulate.java    |  3 ++-
 .../boxsimulate/gui/BoxSimulateGui.java       | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/io/yutian/boxsimulate/BoxSimulate.java b/src/main/java/com/io/yutian/boxsimulate/BoxSimulate.java
index 72b2494..23a1102 100644
--- a/src/main/java/com/io/yutian/boxsimulate/BoxSimulate.java
+++ b/src/main/java/com/io/yutian/boxsimulate/BoxSimulate.java
@@ -32,7 +32,8 @@ public final class BoxSimulate extends JavaPlugin {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (args.length == 1 && args[0].equalsIgnoreCase("reload")) {
             reloadConfig();
-            sender.sendMessage("Config reloaded.");
+            reload();
+            sender.sendMessage("模拟开箱配置文件已重载.");
             return true;
         }
         if (sender instanceof Player) {
diff --git a/src/main/java/com/io/yutian/boxsimulate/gui/BoxSimulateGui.java b/src/main/java/com/io/yutian/boxsimulate/gui/BoxSimulateGui.java
index 4eabf2f..fe8571b 100644
--- a/src/main/java/com/io/yutian/boxsimulate/gui/BoxSimulateGui.java
+++ b/src/main/java/com/io/yutian/boxsimulate/gui/BoxSimulateGui.java
@@ -7,6 +7,7 @@ import com.praya.myitems.MyItems;
 import com.yaohun.itemlibrary.api.ItemKuAPI;
 import me.Demon.DemonPlugin.DemonAPI;
 import org.bukkit.Bukkit;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
@@ -27,7 +28,7 @@ public class BoxSimulateGui implements InventoryHolder, GuiHolder {
     private Map<Integer, String> cacheItems = new HashMap<>();
 
     public BoxSimulateGui(Player player) {
-        this.inventory = Bukkit.createInventory(this, 54, "开箱模拟器");
+        this.inventory = Bukkit.createInventory(this, 27, "装备武器箱 - 模拟开箱");
         this.player = player;
         init();
     }
@@ -38,9 +39,6 @@ public class BoxSimulateGui implements InventoryHolder, GuiHolder {
         int i = 0;
         for (Map.Entry<String, BoxData> entry : boxDatas.entrySet()) {
             BoxData boxData = boxDataList.get(i);
-            if (!DemonAPI.hasPoints(player, boxData.getNeed())) {
-                continue;
-            }
             ItemStack itemStack = getBoxItem(boxData.getItem());
             inventory.setItem(i, itemStack);
             cacheItems.put(i, entry.getKey());
@@ -68,12 +66,23 @@ public class BoxSimulateGui implements InventoryHolder, GuiHolder {
             return;
         }
         String id = cacheItems.get(slot);
-        if (CDTimeAPI.isCD(player.getUniqueId(), "box_simulate_box_"+id)) {
-            player.sendMessage("§8§l[§c§l!§8§l] §7该箱子冷却中...");
-            return;
+        long time = CDTimeAPI.getCD(player.getUniqueId(),"box_simulate_box_"+id) / 1000;
+        String timeShow = String.format("%.1f",(double) time);
+        if(!player.isOp()) {
+            if (CDTimeAPI.isCD(player.getUniqueId(), "box_simulate_box_" + id)) {
+                player.sendMessage("§7[§6帝国战争§7] §f你需要等待 §e" + timeShow + "秒 §f后才能再次打开.");
+                player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1.6F, 1.8F);
+                return;
+            }
         }
         BoxData boxData = BoxSimulate.getBoxDatas().get(id);
+        if (!DemonAPI.hasPoints(player, boxData.getNeed())) {
+            player.sendMessage("§7[§6帝国战争§7] §f你需要拥有§d"+DemonAPI.MoneyFormat(boxData.getNeed())+"点券§f才能模拟打开.");
+            player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO,1.6F,1.8F);
+            return;
+        }
         inventory.setItem(slot, generateItem(boxData.getItem()));
+        player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP,1.6F,1.8F);
         CDTimeAPI.setPlayerCD(player.getUniqueId(), "box_simulate_box_"+id, 1000 * 60 * 60);
     }