From 77ba55d00d99ee12cb67f2dfc3c45ecf2c05192a Mon Sep 17 00:00:00 2001
From: lanzhi6 <lan_zhi@outlook.com>
Date: Fri, 29 Apr 2022 00:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=97=E5=A4=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   9 +-
 .../me/lanzhi/bluestargame/BluestarGame.java  |  66 ++++----
 .../lanzhi/bluestargame/Ctrls/CtrlSponge.java |  18 +-
 .../bluestargame/Type/CompressedCoal.java     | 156 ++++++++++++++++++
 .../me/lanzhi/bluestargame/Type/Elevator.java |  12 +-
 .../{superSponge.java => SuperSponge.java}    |   6 +-
 .../lanzhi/bluestargame/api/xiaoMoBank.java   | 145 ++++++++++++++++
 .../bluestargame/commands/bluestaritem.java   | 120 ++++++++++++--
 .../bluestargame/commands/maincommand.java    |  34 +++-
 .../bluestargame/commands/mutedCommand.java   |  10 --
 ...XiaoMoBank.java => xiaoMoBankCommand.java} | 103 ++++--------
 ...{HealthFix.java => HealthFixListener.java} |   2 +-
 .../bluestargame/listener/arrowListener.java  |  57 +++++++
 .../listener/breakBedrockListener.java        |  72 ++++++++
 ...torListener.java => elevatorListener.java} |   2 +-
 .../{DoMute.java => muteListener.java}        |   2 +-
 .../{Sword.java => opSwordListener.java}      |   2 +-
 ...eMineral.java => moreMineralListener.java} |   2 +-
 ...tColor.java => randChatColorListener.java} |   2 +-
 ...andDamage.java => randDamageListener.java} |  18 +-
 ...Color.java => randSheepColorListener.java} |   2 +-
 .../{Respawn.java => respawnListener.java}    |   2 +-
 ...he24Point.java => the24PointListener.java} |   2 +-
 ...ceSponge.java => superSpongeListener.java} |  10 +-
 .../bluestargame/papi/BluestarGamePapi.java   |  53 ------
 .../register/RegisterListeners.java           |  36 ----
 .../bluestargame/register/RegisterRecipe.java |  60 -------
 .../register/registerCommand.java             |  20 +++
 .../registerConfigurationSection.java         |  19 +++
 .../register/registerListeners.java           |  38 +++++
 .../bluestargame/register/registerRecipe.java | 102 ++++++++++++
 src/main/resources/plugin.yml                 |   4 +-
 32 files changed, 859 insertions(+), 327 deletions(-)
 create mode 100644 src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
 rename src/main/java/me/lanzhi/bluestargame/Type/{superSponge.java => SuperSponge.java} (97%)
 create mode 100644 src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java
 rename src/main/java/me/lanzhi/bluestargame/commands/{XiaoMoBank.java => xiaoMoBankCommand.java} (79%)
 rename src/main/java/me/lanzhi/bluestargame/listener/{HealthFix.java => HealthFixListener.java} (97%)
 create mode 100644 src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
 rename src/main/java/me/lanzhi/bluestargame/listener/{ElevatorListener.java => elevatorListener.java} (98%)
 rename src/main/java/me/lanzhi/bluestargame/listener/{DoMute.java => muteListener.java} (97%)
 rename src/main/java/me/lanzhi/bluestargame/listener/{Sword.java => opSwordListener.java} (98%)
 rename src/main/java/me/lanzhi/bluestargame/listener/randoms/{MoreMineral.java => moreMineralListener.java} (99%)
 rename src/main/java/me/lanzhi/bluestargame/listener/randoms/{RandChatColor.java => randChatColorListener.java} (95%)
 rename src/main/java/me/lanzhi/bluestargame/listener/randoms/{RandDamage.java => randDamageListener.java} (73%)
 rename src/main/java/me/lanzhi/bluestargame/listener/randoms/{RandSheepColor.java => randSheepColorListener.java} (97%)
 rename src/main/java/me/lanzhi/bluestargame/listener/randoms/{Respawn.java => respawnListener.java} (93%)
 rename src/main/java/me/lanzhi/bluestargame/listener/randoms/{The24Point.java => the24PointListener.java} (98%)
 rename src/main/java/me/lanzhi/bluestargame/listener/{PlaceSponge.java => superSpongeListener.java} (82%)
 delete mode 100644 src/main/java/me/lanzhi/bluestargame/papi/BluestarGamePapi.java
 delete mode 100644 src/main/java/me/lanzhi/bluestargame/register/RegisterListeners.java
 delete mode 100644 src/main/java/me/lanzhi/bluestargame/register/RegisterRecipe.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/register/registerCommand.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/register/registerConfigurationSection.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/register/registerListeners.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/register/registerRecipe.java

diff --git a/pom.xml b/pom.xml
index ed04cbf..71f8cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.lanzhi</groupId>
     <artifactId>BluestarGame</artifactId>
-    <version>2.7.0</version>
+    <version>2.8.0</version>
     <packaging>jar</packaging>
 
     <name>BluestarGame</name>
@@ -134,6 +134,13 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/BluestarTpsControl-spigotPlugin-1.5.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.spigot</groupId>
+            <artifactId>Citizens2</artifactId>
+            <version>2.0.29</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/Citizens-2.0.29-b2493.jar</systemPath>
+        </dependency>
         <!--
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
diff --git a/src/main/java/me/lanzhi/bluestargame/BluestarGame.java b/src/main/java/me/lanzhi/bluestargame/BluestarGame.java
index 04d7528..ce8df14 100644
--- a/src/main/java/me/lanzhi/bluestargame/BluestarGame.java
+++ b/src/main/java/me/lanzhi/bluestargame/BluestarGame.java
@@ -1,76 +1,73 @@
 package me.lanzhi.bluestargame;
 
+import me.lanzhi.bluestarapi.Api.YamlFile;
 import me.lanzhi.bluestargame.Ctrls.CTRL;
 import me.lanzhi.bluestargame.Ctrls.CtrlSponge;
+import me.lanzhi.bluestargame.Type.CompressedCoal;
 import me.lanzhi.bluestargame.Type.Elevator;
-import me.lanzhi.bluestargame.Type.superSponge;
-import me.lanzhi.bluestargame.commands.*;
-import me.lanzhi.bluestargame.papi.BluestarGamePapi;
-import me.lanzhi.bluestargame.register.RegisterListeners;
-import me.lanzhi.bluestargame.register.RegisterRecipe;
+import me.lanzhi.bluestargame.Type.SuperSponge;
+import me.lanzhi.bluestargame.register.*;
+import me.lanzhi.bluestargame.listener.breakBedrockListener;
+import net.milkbowl.vault.economy.Economy;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
-import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
-import me.lanzhi.bluestarapi.Api.YamlFile;
-import net.milkbowl.vault.economy.Economy;
 
 import java.io.File;
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
 
 public final class BluestarGame extends org.bukkit.plugin.java.JavaPlugin
 {
-    public static Plugin plugin;
+    public static JavaPlugin plugin;
     public static YamlFile config;
     public static File PlayerData;
     public static YamlFile PlayerMap;
     public static YamlFile Data;
     public static Economy econ=null;
     public static String messageHead=ChatColor.GOLD+"["+ChatColor.DARK_AQUA+"BluestarGame"+ChatColor.GOLD+"]";
+    public static String errorMessageHead=messageHead+ChatColor.RED;
     public static SimpleDateFormat BluestarDataFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public static NumberFormat BluestarNF=NumberFormat.getInstance();
 
-    private BukkitTask task;
+    private BukkitTask spongeTask;
+    private BukkitTask bedrockTask;
 
     @Override
     public void onEnable()
     {
-        plugin = this;
-        ConfigurationSerialization.registerClass(superSponge.class);
+        BluestarNF.setGroupingUsed(false);
+        plugin=this;
+        ConfigurationSerialization.registerClass(SuperSponge.class);
         ConfigurationSerialization.registerClass(Elevator.class);
+        ConfigurationSerialization.registerClass(CompressedCoal.class);
 
         saveDefaultConfig();
 
-        config = new YamlFile(new File(plugin.getDataFolder(),"config.yml"));
-        PlayerMap = new YamlFile(new File(plugin.getDataFolder(),"playerMap.yml"));
-        Data = new YamlFile(new File(plugin.getDataFolder(),"data.yml"));
-        PlayerData = new File(plugin.getDataFolder(),"PlayerData");
+        config=new YamlFile(new File(plugin.getDataFolder(),"config.yml"));
+        PlayerMap=new YamlFile(new File(plugin.getDataFolder(),"playerMap.yml"));
+        Data=new YamlFile(new File(plugin.getDataFolder(),"data.yml"));
+        PlayerData=new File(plugin.getDataFolder(),"PlayerData");
         PlayerData.mkdirs();
 
-        int pluginId = 14294;
-        new Metrics(this, pluginId);
-
-        RegisterListeners.registerListeners();
-        RegisterRecipe.registerRecipes();
+        new Metrics(this,14294);
 
-        getCommand("bluestargame").setExecutor(new me.lanzhi.bluestargame.commands.maincommand());
-        getCommand("bluestargamelist").setExecutor(new bsgamelist());
-        getCommand("muted").setExecutor(new mutedCommand());
-        getCommand("chat").setExecutor(new chat());
-        getCommand("bluestaritem").setExecutor(new bluestaritem());
-        getCommand("elevator").setExecutor(new elevatorCommand());
-        getCommand("xiaomobank").setExecutor(new XiaoMoBank());
-        getCommand("cmdbag").setExecutor(new commandBag());
+        registerListeners.registerListeners();
+        registerRecipe.registerRecipes();
+        registerCommand.registerCommands();
+        registerConfigurationSection.registerConfigurationSections();
 
         if (config.getBoolean("auto"))
         {
             CTRL.runAuto(true);
         }
 
-        CtrlSponge.set((List<superSponge>) Data.getList("superSponges"));
-        this.task = CtrlSponge.ctrlsponge.runTaskTimer(plugin, 0L, 2L);
+        CtrlSponge.set((List<SuperSponge>) Data.getList("superSponges"));
+        this.spongeTask=CtrlSponge.ctrlsponge.runTaskTimer(plugin,0L,2L);
+        this.bedrockTask=breakBedrockListener.breakBedrock.runTaskTimer(plugin,0L,20L);
         econ=getServer().getServicesManager().getRegistration(Economy.class).getProvider();
-        new BluestarGamePapi();
 
         System.out.println("BluestarGame已加载");
     }
@@ -78,10 +75,11 @@ public void onEnable()
     @Override
     public void onDisable()
     {
-        this.task.cancel();
+        this.spongeTask.cancel();
+        this.bedrockTask.cancel();
         CTRL.theend();
         CTRL.all(false);
-        RegisterRecipe.cancellationRecipes();
+        registerRecipe.cancellationRecipes();
         Data.set("superSponges",CtrlSponge.get());
         Data.save();
         PlayerMap.save();
diff --git a/src/main/java/me/lanzhi/bluestargame/Ctrls/CtrlSponge.java b/src/main/java/me/lanzhi/bluestargame/Ctrls/CtrlSponge.java
index e745547..054a79a 100644
--- a/src/main/java/me/lanzhi/bluestargame/Ctrls/CtrlSponge.java
+++ b/src/main/java/me/lanzhi/bluestargame/Ctrls/CtrlSponge.java
@@ -1,7 +1,7 @@
 package me.lanzhi.bluestargame.Ctrls;
 
 import me.lanzhi.bluestarapi.Api.Bluestar;
-import me.lanzhi.bluestargame.Type.superSponge;
+import me.lanzhi.bluestargame.Type.SuperSponge;
 import org.bukkit.Location;
 import org.bukkit.Material;
 
@@ -10,8 +10,8 @@
 
 public class CtrlSponge
 {
-    private static List<superSponge> nextSponges = new ArrayList<>();
-    private static List<superSponge> sponges = new ArrayList<>();
+    private static List<SuperSponge> nextSponges = new ArrayList<>();
+    private static List<SuperSponge> sponges = new ArrayList<>();
     public static org.bukkit.scheduler.BukkitRunnable ctrlsponge = new org.bukkit.scheduler.BukkitRunnable()
     {
         @Override
@@ -22,7 +22,7 @@ public void run()
                 return;
             }
             nextSponges = new ArrayList();
-            for (superSponge sponge : sponges)
+            for (SuperSponge sponge : sponges)
             {
                 Location loc = sponge.getLocation();
                 int age = sponge.getAge();
@@ -43,7 +43,7 @@ public void run()
         }
     };
 
-    public static void add(superSponge sponge)
+    public static void add(SuperSponge sponge)
     {
         if (sponges==null)
         {
@@ -51,20 +51,20 @@ public static void add(superSponge sponge)
         }
         sponges.add(sponge);
     }
-    public static void set(List<superSponge> spongess){sponges=spongess;}
-    public static List<superSponge> get(){return sponges;}
+    public static void set(List<SuperSponge> spongess){sponges=spongess;}
+    public static List<SuperSponge> get(){return sponges;}
 
     private static void decide(Location loc, int age, String player,boolean iswater,boolean islava)
     {
         if (loc.getBlock().getType()==Material.WATER&&iswater)
         {
             Bluestar.setBlock(loc, Material.END_STONE, player);
-            nextSponges.add(new superSponge(age-1,loc,player,islava,true));
+            nextSponges.add(new SuperSponge(age-1,loc,player,islava,true));
         }
         if(loc.getBlock().getType()==Material.LAVA&&islava)
         {
             Bluestar.setBlock(loc, Material.OBSIDIAN, player);
-            nextSponges.add(new superSponge(age-1,loc,player,true,iswater));
+            nextSponges.add(new SuperSponge(age-1,loc,player,true,iswater));
         }
     }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java b/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
new file mode 100644
index 0000000..ffed72b
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
@@ -0,0 +1,156 @@
+package me.lanzhi.bluestargame.Type;
+
+import de.tr7zw.nbtapi.NBTCompound;
+import de.tr7zw.nbtapi.NBTItem;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.configuration.serialization.ConfigurationSerializable;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static me.lanzhi.bluestargame.BluestarGame.plugin;
+
+public enum CompressedCoal implements ConfigurationSerializable
+{
+    /**
+     * 烧制过的煤炭块
+     */
+    FIRED_COAL_BLOCK(1),
+    /**
+     * 压缩煤炭
+     */
+    COMPRESSED_COAL(2),
+    /**
+     * 烧制过的压缩煤炭
+     */
+    FIRED_COMPRESSED_COAL(3);
+    private final NBTItem item;
+    private final int id;
+    private final List<NamespacedKey> allowRecipe;
+
+    CompressedCoal(int id)
+    {
+        ItemStack itemm=new ItemStack(Material.COAL_BLOCK);
+        ItemMeta meta=itemm.getItemMeta();
+        switch (id)
+        {
+            case 1:
+            {
+                meta.setDisplayName(ChatColor.GOLD+"烧制煤炭");
+                allowRecipe=Collections.singletonList(new NamespacedKey(plugin,"compressed_coal"));
+                itemm.setItemMeta(meta);
+                item=new NBTItem(itemm);
+                item.addCompound("BluestarGame").setInteger("coal",id);
+                this.id=id;
+                break;
+            }
+            case 2:
+            {
+                meta.setDisplayName(ChatColor.GOLD+"压缩煤炭");
+                allowRecipe=Collections.singletonList(new NamespacedKey(plugin,"fired_compressed_coal"));
+                itemm.setItemMeta(meta);
+                item=new NBTItem(itemm);
+                item.addCompound("BluestarGame").setInteger("coal",id);
+                this.id=id;
+                break;
+            }
+            case 3:
+            {
+                meta.setDisplayName(ChatColor.GOLD+"烧制压缩煤炭");
+                allowRecipe=Collections.singletonList(new NamespacedKey(plugin,"coal_diamond"));
+                itemm.setItemMeta(meta);
+                item=new NBTItem(itemm);
+                item.addCompound("BluestarGame").setInteger("coal",id);
+                this.id=id;
+                break;
+            }
+            default:
+            {
+                this.allowRecipe=null;
+                this.id=0;
+                this.item=null;
+            }
+        }
+    }
+
+    public NBTItem getNbtItem()
+    {
+        return item;
+    }
+
+    public ItemStack getItem()
+    {
+        return item.getItem();
+    }
+
+    public int getId()
+    {
+        return id;
+    }
+
+    public boolean canUseInRecipe(NamespacedKey key)
+    {
+        return allowRecipe.contains(key);
+    }
+
+    public static CompressedCoal getFromId(int id)
+    {
+        switch (id)
+        {
+            case 1:
+            {
+                return FIRED_COAL_BLOCK;
+            }
+            case 2:
+            {
+                return COMPRESSED_COAL;
+            }
+            case 3:
+            {
+                return FIRED_COMPRESSED_COAL;
+            }
+            default:
+            {
+                return null;
+            }
+        }
+    }
+
+    public static CompressedCoal getFromItemStack(@Nullable ItemStack itemStack)
+    {
+        return itemStack==null?null:getFromNbtItem(new NBTItem(itemStack));
+    }
+
+    @Nullable
+    public static CompressedCoal getFromNbtItem(@Nullable NBTItem item)
+    {
+        if (item==null)
+        {
+            return null;
+        }
+        NBTCompound compound=item.getCompound("BluestarGame");
+        return compound==null?null:getFromId(compound.getInteger("coal"));
+    }
+
+    @NotNull
+    @Override
+    public Map<String, Object> serialize()
+    {
+        Map<String, Object> map=new HashMap<>();
+        map.put("id",getId());
+        return map;
+    }
+
+    public static CompressedCoal deserialize(Map<String, Object> map)
+    {
+        return getFromId((int) map.get("id"));
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java b/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java
index 1223f94..a023559 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java
@@ -10,19 +10,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import static me.lanzhi.bluestargame.BluestarGame.Data;
-
 public class Elevator implements ConfigurationSerializable
 {
-    public static ConfigurationSection elevators=Data.getConfigurationSection("elevators");
-    static
-    {
-        if (elevators==null)
-        {
-            Data.set("elevators",new HashMap<>());
-            elevators=Data.getConfigurationSection("elevators");
-        }
-    }
+    public static ConfigurationSection elevators;
     private final long minX, maxX, minZ, maxZ, maxY, minY;
 
     public Elevator(long minX,long maxX,long minZ,long maxZ,long minY,long maxY)
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/superSponge.java b/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
similarity index 97%
rename from src/main/java/me/lanzhi/bluestargame/Type/superSponge.java
rename to src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
index 727d7f5..38db4bb 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/superSponge.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-public final class superSponge implements ConfigurationSerializable
+public final class SuperSponge implements ConfigurationSerializable
 {
     private static NBTItem lavaSponge=null;
     private static NBTItem usedLavaSponge=null;
@@ -28,7 +28,7 @@ public final class superSponge implements ConfigurationSerializable
     private boolean islava=false;
     private boolean iswater=false;
 
-    public superSponge(Map<String, Object> map)
+    public SuperSponge(Map<String, Object> map)
     {
         this.age=(int) map.get("age");
         this.location=((Location) map.get("location"));
@@ -37,7 +37,7 @@ public superSponge(Map<String, Object> map)
         this.iswater=(boolean) map.get("iswater");
     }
 
-    public superSponge(int age,Location loc,String player,boolean islava,boolean iswater)
+    public SuperSponge(int age,Location loc,String player,boolean islava,boolean iswater)
     {
         this.age=age;
         this.location=loc;
diff --git a/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java b/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java
new file mode 100644
index 0000000..2921df5
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java
@@ -0,0 +1,145 @@
+package me.lanzhi.bluestargame.api;
+
+import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.UUID;
+
+import static me.lanzhi.bluestargame.BluestarGame.BluestarDataFormat;
+import static me.lanzhi.bluestargame.BluestarGame.Data;
+
+public class xiaoMoBank
+{
+    public static long getBorrow(@NotNull OfflinePlayer player)
+    {
+        return getBorrow(player.getUniqueId());
+    }
+
+    public static long getBorrow(@NotNull UUID uuid)
+    {
+        return Data.getLong("bank.borrow."+uuid+".money");
+    }
+
+    public static long getSave(@NotNull OfflinePlayer player)
+    {
+        return getSave(player.getUniqueId());
+    }
+
+    public static long getSave(@NotNull UUID uuid)
+    {
+        return Data.getLong("bank.save."+uuid+".money");
+    }
+
+    public static Date getBorrowTime(@NotNull OfflinePlayer player)
+    {
+        return getBorrowTime(player.getUniqueId());
+    }
+
+    public static Date getSaveTime(@NotNull OfflinePlayer player)
+    {
+        return getSaveTime(player.getUniqueId());
+    }
+
+    public static @Nullable Date getBorrowTime(@NotNull UUID uuid)
+    {
+        try
+        {
+            return BluestarDataFormat.parse(Data.getString("bank.borrow."+uuid+".time"));
+        }
+        catch (Throwable e)
+        {
+            return null;
+        }
+    }
+
+    public static @Nullable Date getSaveTime(@NotNull UUID uuid)
+    {
+        try
+        {
+            return BluestarDataFormat.parse(Data.getString("bank.save."+uuid+".time"));
+        }
+        catch (Throwable e)
+        {
+            return null;
+        }
+    }
+
+    public static double getShoutRepay(@NotNull OfflinePlayer player)
+    {
+        return getShoutRepay(player.getUniqueId());
+    }
+
+    public static double getShoutRepay(@NotNull OfflinePlayer player,@NotNull Date to)
+    {
+        return getShoutRepay(player.getUniqueId(),to);
+    }
+
+    public static double getShoutRepay(@NotNull UUID uuid)
+    {
+        Date date=getBorrowTime(uuid);
+        if (date==null)
+        {
+            return 0D;
+        }
+        return getShoutRepay(uuid,date);
+    }
+
+    public static double getShoutRepay(@NotNull UUID uuid,@NotNull Date to)
+    {
+        return getShoutRepay(getBorrow(uuid),to);
+    }
+
+    public static double getShoutGet(@NotNull OfflinePlayer player)
+    {
+        return getShoutGet(player.getUniqueId());
+    }
+
+    public static double getShoutGet(@NotNull OfflinePlayer player,@NotNull Date to)
+    {
+        return getShoutGet(player.getUniqueId(),to);
+    }
+
+    public static double getShoutGet(@NotNull UUID uuid)
+    {
+        Date date=getSaveTime(uuid);
+        if (date==null)
+        {
+            return 0D;
+        }
+        return getShoutGet(uuid,date);
+    }
+
+    public static double getShoutGet(@NotNull UUID uuid,@NotNull Date to)
+    {
+        return getShoutGet(getSave(uuid),to);
+    }
+
+    public static double getShoutRepay(long money,@NotNull Date borrowDate,@NotNull Date to)
+    {
+        double borrowTimeMs=borrowDate.getTime();
+        double toMs=to.getTime();
+        double days=Math.ceil((toMs-borrowTimeMs)/86400000);
+        return 0.01*days*money+money;
+    }
+
+    public static double getShoutRepay(long money,@NotNull Date borrowDate)
+    {
+        return getShoutRepay(money,borrowDate,Calendar.getInstance().getTime());
+    }
+
+    public static double getShoutGet(long money,@NotNull Date saveDate,@NotNull Date to)
+    {
+        double saveTimeMs=saveDate.getTime();
+        double toMs=to.getTime();
+        double days=Math.floor((toMs-saveTimeMs)/86400000);
+        return 0.01*days*money+money;
+    }
+
+    public static double getShoutGet(long money,@NotNull Date saveDate)
+    {
+        return getShoutGet(money,saveDate,Calendar.getInstance().getTime());
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/bluestaritem.java b/src/main/java/me/lanzhi/bluestargame/commands/bluestaritem.java
index 975ec3b..6f4c00e 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/bluestaritem.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/bluestaritem.java
@@ -1,24 +1,49 @@
 package me.lanzhi.bluestargame.commands;
 
+import de.tr7zw.nbtapi.NBTCompound;
 import de.tr7zw.nbtapi.NBTItem;
-import me.lanzhi.bluestargame.Type.superSponge;
+import me.lanzhi.bluestargame.Type.SuperSponge;
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import static me.lanzhi.bluestargame.BluestarGame.errorMessageHead;
 import static me.lanzhi.bluestargame.BluestarGame.messageHead;
 
 public class bluestaritem implements CommandExecutor, TabExecutor
 {
+    private static List<String>entityType=new ArrayList<>();
+    static
+    {
+        try
+        {
+            for (EntityType i:EntityType.values())
+            {
+                if (i.getName()==null)
+                {
+                    continue;
+                }
+                entityType.add(i.getName());
+            }
+        }catch (Throwable e)
+        {
+            System.out.println("错误在初始化");
+        }
+    }
     @Override
     public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,@NotNull String label,@NotNull String[] args)
     {
@@ -46,7 +71,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                 {
                 }
             }
-            ItemStack itemStack=superSponge.getWaterSponge().getItem().clone();
+            ItemStack itemStack=SuperSponge.getWaterSponge().getItem().clone();
             itemStack.setAmount(cnt);
             player.getInventory().addItem(itemStack);
             player.sendMessage(messageHead+ChatColor.GREEN+"已为给予您 \"超级海绵\" ×"+cnt);
@@ -65,7 +90,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                 {
                 }
             }
-            ItemStack itemStack=superSponge.getlavaSponge().getItem().clone();
+            ItemStack itemStack=SuperSponge.getlavaSponge().getItem().clone();
             itemStack.setAmount(cnt);
             player.getInventory().addItem(itemStack);
             player.sendMessage(messageHead+ChatColor.GREEN+"已为给予您 \"岩浆海绵\" ×"+cnt);
@@ -84,7 +109,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                 {
                 }
             }
-            ItemStack itemStack=superSponge.getUsedWaterSponge().getItem().clone();
+            ItemStack itemStack=SuperSponge.getUsedWaterSponge().getItem().clone();
             itemStack.setAmount(cnt);
             player.getInventory().addItem(itemStack);
             player.sendMessage(messageHead+ChatColor.GREEN+"已为给予您 \"湿超级海绵\" ×"+cnt);
@@ -103,7 +128,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                 {
                 }
             }
-            ItemStack itemStack=superSponge.getUsedLavaSponge().getItem().clone();
+            ItemStack itemStack=SuperSponge.getUsedLavaSponge().getItem().clone();
             itemStack.setAmount(cnt);
             player.getInventory().addItem(itemStack);
             player.sendMessage(messageHead+ChatColor.GREEN+"已为给予您 \"湿岩浆海绵\" ×"+cnt);
@@ -122,6 +147,59 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
             player.sendMessage(messageHead+ChatColor.GREEN+"已为您手持的物品添加\"op剑\"属性");
             return true;
         }
+        if ("bow".equals(args[0]))
+        {
+            if (args.length<2)
+            {
+                sender.sendMessage(messageHead+ChatColor.RED+"请输入生物类型");
+            }
+            int cnt=1;
+            double v=1;
+            if (args.length>=3)
+            {
+                try
+                {
+                    v=Double.parseDouble(args[2]);
+                }
+                catch (NumberFormatException e)
+                {
+                    sender.sendMessage(errorMessageHead+"错误,力量不合法");
+                    return true;
+                }
+                if (v<=0)
+                {
+                    sender.sendMessage(errorMessageHead+"错误,力量不合法");
+                    return true;
+                }
+                if (args.length>=4)
+                {
+                    try
+                    {
+                        cnt=Integer.parseInt(args[3]);
+                    }
+                    catch (NumberFormatException e)
+                    {
+                        sender.sendMessage(errorMessageHead+"错误,数量不合法");
+                        return true;
+                    }
+                    if (cnt<=0)
+                    {
+                        sender.sendMessage(errorMessageHead+"错误,数量不合法");
+                        return true;
+                    }
+                }
+            }
+            ItemStack boww=new ItemStack(Material.BOW,cnt);
+            ItemMeta itemMeta=boww.getItemMeta();
+            itemMeta.setLore(Arrays.asList(ChatColor.AQUA+"箭: "+args[1],ChatColor.LIGHT_PURPLE+"力量: "+args[2]));
+            boww.setItemMeta(itemMeta);
+            NBTItem bow=new NBTItem(boww);
+            NBTCompound bluestarGame=bow.addCompound("BluestarGame");
+            bluestarGame.setString("arrow",args[1]);
+            bluestarGame.setDouble("arrowSpeed",v);
+            player.getInventory().addItem(bow.getItem());
+            return true;
+        }
         sender.sendMessage(ChatColor.RED+"格式错误!");
         return false;
     }
@@ -130,12 +208,30 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender,@NotNull Command command,@NotNull String label,@NotNull String[] args)
     {
-        List<String> tablist=new ArrayList<>();
-        tablist.add("watersponge");
-        tablist.add("lavasponge");
-        tablist.add("usedwatersponge");
-        tablist.add("usedlavasponge");
-        tablist.add("sword");
-        return tablist;
+        if (args.length==1)
+        {
+            return Arrays.asList("watersponge","lavasponge","usedwatersponge","usedlavasponge","sword","bow");
+        }
+        if ("bow".equals(args[0]))
+        {
+            if (args.length==2)
+            {
+                return entityType;
+            }
+            if (args.length==3)
+            {
+                return Arrays.asList("力量","发射速度=原速度*力量");
+            }
+            if (args.length==4)
+            {
+                return Collections.singletonList("数量");
+            }
+            return Collections.emptyList();
+        }
+        if (args.length==2)
+        {
+            return Collections.singletonList("数量");
+        }
+        return Collections.emptyList();
     }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/maincommand.java b/src/main/java/me/lanzhi/bluestargame/commands/maincommand.java
index 0602d2c..1b724a4 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/maincommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/maincommand.java
@@ -3,7 +3,7 @@
 import me.lanzhi.bluestargame.BluestarGame;
 import me.lanzhi.bluestargame.Ctrls.CTRL;
 import me.lanzhi.bluestargame.Ctrls.CtrlSponge;
-import me.lanzhi.bluestargame.Type.superSponge;
+import me.lanzhi.bluestargame.Type.SuperSponge;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static me.lanzhi.bluestargame.BluestarGame.errorMessageHead;
 import static me.lanzhi.bluestargame.BluestarGame.messageHead;
 
 public class maincommand implements CommandExecutor, TabExecutor
@@ -55,6 +56,34 @@ else if (args.length==2&&sender instanceof Player)
             sender.sendMessage("设置成功");
             return true;
         }
+        if ("break".equals(args[0]))
+        {
+            if (!(sender instanceof Player))
+            {
+                sender.sendMessage(errorMessageHead+"此指令仅允许玩家输入");
+                return true;
+            }
+            if (args.length!=4)
+            {
+                sender.sendMessage(errorMessageHead+"格式错误");
+                return true;
+            }
+            long x,y,z;
+            try
+            {
+                x=Long.parseLong(args[1]);
+                y=Long.parseLong(args[2]);
+                z=Long.parseLong(args[3]);
+            }
+            catch (NumberFormatException e)
+            {
+                sender.sendMessage(errorMessageHead+"坐标无效");
+                return true;
+            }
+            Location location=new Location(((Player)sender).getLocation().getWorld(),x,y,z);
+            ((Player) sender).breakBlock(location.getBlock());
+            return true;
+        }
         if (args.length!=2)
         {
             sender.sendMessage(messageHead+ChatColor.RED+"格式错误!");
@@ -288,7 +317,7 @@ else if (args.length==2&&sender instanceof Player)
             r=Integer.parseInt(args[1]);
             Location locc=((Player) (sender)).getLocation();
             Location loc=new Location(locc.getWorld(),locc.getBlockX(),locc.getBlockY(),locc.getBlockZ());
-            CtrlSponge.add(new superSponge(r,loc,sender.getName(),true,true));
+            CtrlSponge.add(new SuperSponge(r,loc,sender.getName(),true,true));
             return true;
         }
         if ("makeboom".equals(args[0]))
@@ -369,6 +398,7 @@ public List<String> onTabComplete(CommandSender sender,Command command,String al
                 tablist.add("newsponge");
                 tablist.add("maxhealth");
                 tablist.add("reload");
+                tablist.add("break");
             }
             return tablist;
         }
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/mutedCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/mutedCommand.java
index 63aae9e..4e412a0 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/mutedCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/mutedCommand.java
@@ -17,16 +17,6 @@ public class mutedCommand implements CommandExecutor, TabExecutor
 {
     public static ConfigurationSection muted;
 
-    static
-    {
-        muted=Data.getConfigurationSection("muted");
-        if (muted==null)
-        {
-            Data.set("muted",new HashMap<>());
-            muted=Data.getConfigurationSection("muted");
-        }
-    }
-
     @Override
     public boolean onCommand(CommandSender sender,Command command,String label,String[] args)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBank.java b/src/main/java/me/lanzhi/bluestargame/commands/xiaoMoBankCommand.java
similarity index 79%
rename from src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBank.java
rename to src/main/java/me/lanzhi/bluestargame/commands/xiaoMoBankCommand.java
index 4776605..e4cd3d9 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBank.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/xiaoMoBankCommand.java
@@ -1,5 +1,6 @@
 package me.lanzhi.bluestargame.commands;
 
+import me.dreamvoid.miraimc.api.MiraiMC;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -21,8 +22,9 @@
 import java.util.*;
 
 import static me.lanzhi.bluestargame.BluestarGame.*;
+import static me.lanzhi.bluestargame.api.xiaoMoBank.*;
 
-public class XiaoMoBank implements CommandExecutor, TabExecutor
+public class xiaoMoBankCommand implements CommandExecutor, TabExecutor
 {
     private static final BaseComponent borrowGui;
     private static final BaseComponent saveGui;
@@ -86,7 +88,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
             sender.sendMessage(messageHead+"---------------------");
             sender.sendMessage(messageHead);
             sender.sendMessage(messageHead);
-            sender.sendMessage(messageHead+"你拥有的钱: "+econ.getBalance(player));
+            sender.sendMessage(messageHead+"你拥有的钱: "+BluestarNF.format(econ.getBalance(player)));
             sender.sendMessage(messageHead+"小末银行的业务:");
             sender.sendMessage(messageHead);
             sender.spigot().sendMessage(saveGui);
@@ -115,6 +117,12 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                     sender.sendMessage(messageHead+ChatColor.RED+"请输入正确的贷款金额");
                     return true;
                 }
+                if (MiraiMC.getBinding(player.getUniqueId().toString())==0)
+                {
+                    player.sendMessage(errorMessageHead+"贷款必须绑定qq");
+                    player.sendMessage(errorMessageHead+"使用/bindqq绑定qq");
+                    return true;
+                }
                 if (Data.getLong("bank.borrow."+player.getUniqueId()+".money")!=0)
                 {
                     sender.sendMessage(messageHead+ChatColor.RED+"您似乎有一笔金额为"+Data.getLong("bank.borrow."+player.getUniqueId()+".money")+"的贷款还未偿还,请向偿还再尝试贷款");
@@ -134,26 +142,12 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
             }
             case "repay":
             {
-                long money=Data.getLong("bank.borrow."+player.getUniqueId()+".money");
-                if (money==0)
+                if (getBorrow(player)==0)
                 {
                     sender.sendMessage(messageHead+ChatColor.RED+"你没有需要偿还的贷款");
                     return true;
                 }
-                Date borrowTime;
-                try
-                {
-                    borrowTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(Data.getString("bank.borrow."+player.getUniqueId()+".time"));
-                }
-                catch (ParseException e)
-                {
-                    sender.sendMessage(messageHead+ChatColor.RED+"出现错误,请重试或联系腐竹");
-                    return true;
-                }
-                double borrowTimeMs=borrowTime.getTime();
-                double nowTimeMs=Calendar.getInstance().getTime().getTime();
-                double days=Math.ceil((nowTimeMs-borrowTimeMs)/86400000);
-                double repayMoney=money+0.01*days*money;
+                double repayMoney=getShoutRepay(player);
                 if (!econ.has(player,repayMoney))
                 {
                     sender.sendMessage(messageHead+ChatColor.RED+"您没有钱偿还贷款,快去赚钱吧");
@@ -161,7 +155,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                 }
                 econ.withdrawPlayer(player,repayMoney);
                 Data.set("bank.borrow."+player.getUniqueId(),null);
-                player.spigot().sendMessage(ChatMessageType.ACTION_BAR,new TextComponent(ChatColor.GREEN+"你成功还款: "+repayMoney));
+                player.spigot().sendMessage(ChatMessageType.ACTION_BAR,new TextComponent(ChatColor.GREEN+"你成功还款: "+BluestarNF.format(repayMoney)));
                 player.playSound(player.getLocation(),Sound.ENTITY_PLAYER_LEVELUP,1,1);
                 break;
             }
@@ -201,53 +195,26 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
             }
             case "get":
             {
-                if (Data.getLong("bank.save."+player.getUniqueId()+".money")==0)
+                if (getSave(player)==0)
                 {
                     sender.sendMessage(messageHead+ChatColor.RED+"您还没有存款哦,去努力赚钱吧");
                     return true;
                 }
-                Date saveTime;
-                try
-                {
-                    saveTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(Data.getString("bank.save."+player.getUniqueId()+".time"));
-                }
-                catch (ParseException e)
-                {
-                    sender.sendMessage(messageHead+ChatColor.RED+"出现错误,请重试或联系腐竹");
-                    return true;
-                }
-                double money=Data.getLong("bank.save."+player.getUniqueId()+".money");
-                double saveTimeMs=saveTime.getTime();
-                double nowTimeMs=Calendar.getInstance().getTime().getTime();
-                double days=Math.floor((nowTimeMs-saveTimeMs)/86400000);
-                double getMoney=money+0.01*days*money;
+                double getMoney=getShoutGet(player);
                 econ.depositPlayer(player,getMoney);
                 Data.set("bank.save."+player.getUniqueId(),null);
-                player.spigot().sendMessage(ChatMessageType.ACTION_BAR,new TextComponent(ChatColor.GREEN+"你成功取出存款: "+getMoney));
+                player.spigot().sendMessage(ChatMessageType.ACTION_BAR,new TextComponent(ChatColor.GREEN+"你成功取出存款: "+BluestarNF.format(getMoney)));
                 player.playSound(player.getLocation(),Sound.ENTITY_PLAYER_LEVELUP,1,1);
                 break;
             }
             case "borrowgui":
             {
-                if (Data.getLong("bank.borrow."+player.getUniqueId()+".money")!=0)
+                if (getBorrow(player)!=0)
                 {
-                    long money=Data.getLong("bank.borrow."+player.getUniqueId()+".money");
-                    Date borrowTime;
-                    try
-                    {
-                        borrowTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(Data.getString("bank.borrow."+player.getUniqueId()+".time"));
-                    }
-                    catch (ParseException e)
-                    {
-                        sender.sendMessage(messageHead+ChatColor.RED+"出现错误,请重试或联系腐竹");
-                        return true;
-                    }
-                    double borrowTimeMs=borrowTime.getTime();
-                    double nowTimeMs=Calendar.getInstance().getTime().getTime();
-                    double days=Math.ceil((nowTimeMs-borrowTimeMs)/86400000);
-                    double repayMoney=money+0.01*days*money;
+                    long money=getBorrow(player);
+                    double repayMoney=getShoutRepay(player);
                     BaseComponent cmp=new TextComponent(ChatColor.DARK_GRAY+"["+ChatColor.RED+"还款"+ChatColor.DARK_GRAY+"]");
-                    cmp.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,new Text("您需要还款"+repayMoney)));
+                    cmp.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,new Text("您需要还款"+BluestarNF.format(repayMoney))));
                     cmp.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND,"/cmdbag repay&gui"));
                     BaseComponent repay=new TextComponent(messageHead+"      ");
                     repay.addExtra(cmp);
@@ -262,7 +229,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                     sender.sendMessage(messageHead+ChatColor.RED+"       [小末银行]");
                     sender.sendMessage(messageHead+"---------------------");
                     sender.spigot().sendMessage(back);
-                    sender.sendMessage(messageHead+"你拥有的钱: "+econ.getBalance(player));
+                    sender.sendMessage(messageHead+"你拥有的钱: "+BluestarNF.format(econ.getBalance(player)));
                     sender.sendMessage(messageHead);
                     sender.sendMessage(messageHead+"你在银行的贷款: "+money);
                     sender.sendMessage(messageHead);
@@ -285,7 +252,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                     sender.sendMessage(messageHead+ChatColor.RED+"       [小末银行]");
                     sender.sendMessage(messageHead+"---------------------");
                     sender.spigot().sendMessage(back);
-                    sender.sendMessage(messageHead+"你拥有的钱: "+econ.getBalance(player));
+                    sender.sendMessage(messageHead+"你拥有的钱: "+BluestarNF.format(econ.getBalance(player)));
                     sender.sendMessage(messageHead);
                     sender.sendMessage(messageHead+"你目前没有贷款(人生赢家)");
                     sender.sendMessage(messageHead);
@@ -299,25 +266,12 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
             }
             case "savegui":
             {
-                if (Data.getLong("bank.save."+player.getUniqueId()+".money")!=0)
+                if (getSave(player)!=0)
                 {
-                    Date saveTime;
-                    try
-                    {
-                        saveTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(Data.getString("bank.save."+player.getUniqueId()+".time"));
-                    }
-                    catch (ParseException e)
-                    {
-                        sender.sendMessage(messageHead+ChatColor.RED+"出现错误,请重试或联系腐竹");
-                        return true;
-                    }
-                    double money=Data.getLong("bank.save."+player.getUniqueId()+".money");
-                    double saveTimeMs=saveTime.getTime();
-                    double nowTimeMs=Calendar.getInstance().getTime().getTime();
-                    double days=Math.floor((nowTimeMs-saveTimeMs)/86400000);
-                    double getMoney=money+0.01*days*money;
+                    long money=getSave(player);
+                    double getMoney=getShoutGet(player);
                     BaseComponent cmp=new TextComponent(ChatColor.DARK_GRAY+"["+ChatColor.GREEN+"取款"+ChatColor.DARK_GRAY+"]");
-                    cmp.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,new Text("您将会取出"+getMoney)));
+                    cmp.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,new Text("您将会取出"+BluestarNF.format(getMoney))));
                     cmp.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND,"/cmdbag get&gui"));
                     BaseComponent get=new TextComponent(messageHead+"      ");
                     get.addExtra(cmp);
@@ -332,7 +286,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                     sender.sendMessage(messageHead+ChatColor.RED+"       [小末银行]");
                     sender.sendMessage(messageHead+"---------------------");
                     sender.spigot().sendMessage(back);
-                    sender.sendMessage(messageHead+"你拥有的钱: "+econ.getBalance(player));
+                    sender.sendMessage(messageHead+"你拥有的钱: "+BluestarNF.format(econ.getBalance(player)));
                     sender.sendMessage(messageHead);
                     sender.sendMessage(messageHead+"你在银行的存款: "+money);
                     sender.sendMessage(messageHead);
@@ -355,7 +309,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                     sender.sendMessage(messageHead+ChatColor.RED+"       [小末银行]");
                     sender.sendMessage(messageHead+"---------------------");
                     sender.spigot().sendMessage(back);
-                    sender.sendMessage(messageHead+"你拥有的钱: "+econ.getBalance(player));
+                    sender.sendMessage(messageHead+"你拥有的钱: "+BluestarNF.format(econ.getBalance(player)));
                     sender.sendMessage(messageHead);
                     sender.sendMessage(messageHead+"你目前没有存款(好穷qwq)");
                     sender.sendMessage(messageHead);
@@ -372,7 +326,6 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
         }
         return false;
     }
-
     @Nullable
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender,@NotNull Command command,@NotNull String label,@NotNull String[] args)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/HealthFix.java b/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
similarity index 97%
rename from src/main/java/me/lanzhi/bluestargame/listener/HealthFix.java
rename to src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
index 78033d2..ec42c2b 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/HealthFix.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
@@ -16,7 +16,7 @@
 import static me.lanzhi.bluestargame.BluestarGame.PlayerMap;
 import static me.lanzhi.bluestargame.BluestarGame.plugin;
 
-public class HealthFix implements Listener
+public class HealthFixListener implements Listener
 {
     @EventHandler(priority=EventPriority.HIGHEST)
     public void onPlayerJoin(PlayerLoginEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java b/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
new file mode 100644
index 0000000..862eb81
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
@@ -0,0 +1,57 @@
+package me.lanzhi.bluestargame.listener;
+
+import de.tr7zw.nbtapi.NBTCompound;
+import de.tr7zw.nbtapi.NBTEntity;
+import de.tr7zw.nbtapi.NBTItem;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityShootBowEvent;
+import org.bukkit.util.Vector;
+
+public class arrowListener implements Listener
+{
+    @EventHandler
+    public void entityArrow(EntityShootBowEvent event)
+    {
+        System.out.println(new NBTEntity(event.getProjectile()).getUUID("archer"));
+        if (event.getBow()==null)
+        {
+            return;
+        }
+        NBTItem bow=new NBTItem(event.getBow());
+        NBTCompound bluestarGame=bow.getCompound("BluestarGame");
+        if (bluestarGame==null)
+        {
+            return;
+        }
+        String arrow=bluestarGame.getString("arrow");
+        double v=bluestarGame.getDouble("arrowSpeed");
+        v=(v!=0)?v:1;
+        if (arrow==null)
+        {
+            return;
+        }
+        EntityType type=EntityType.fromName(arrow);
+        if (type==null)
+        {
+            return;
+        }
+        Entity entity=event.getEntity().getWorld().spawnEntity(event.getProjectile().getLocation(),type,true);
+        Vector vector=event.getProjectile().getVelocity().clone();
+        vector.setX(vector.getX()*v).setY(vector.getY()*v).setZ(vector.getZ()*v);
+        entity.setVelocity(vector);
+        event.setProjectile(entity);
+    }
+
+    @EventHandler(priority=EventPriority.MONITOR)
+    public void setArcher(EntityShootBowEvent event)
+    {
+        System.out.println(event.getProjectile().getUniqueId());
+        NBTEntity entity=new NBTEntity(event.getProjectile());
+        entity.setUUID("archer",event.getEntity().getUniqueId());
+        System.out.println(event.getProjectile().getUniqueId());
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java b/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
new file mode 100644
index 0000000..6acb16b
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
@@ -0,0 +1,72 @@
+package me.lanzhi.bluestargame.listener;
+
+import me.lanzhi.bluestarapi.Api.Bluestar;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDamageAbortEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.*;
+
+public class breakBedrockListener implements Listener
+{
+    private static final ItemStack bedrock=new ItemStack(Material.BEDROCK);
+    public static Map<Player, AbstractMap.SimpleEntry<Date, Block>> playerList=new HashMap<>();
+    public static Set<Player> playerSet=new HashSet<>();
+
+    @EventHandler
+    public void onPlayerDamageBlock(BlockDamageEvent event)
+    {
+        if (!event.getBlock().getType().equals(Material.BEDROCK))
+        {
+            return;
+        }
+        if (!event.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.NETHERITE_PICKAXE))
+        {
+            return;
+        }
+        playerList.put(event.getPlayer(),new AbstractMap.SimpleEntry<>(Calendar.getInstance().getTime(),event.getBlock()));
+    }
+
+    @EventHandler
+    public void onPlayerDamageBlock(BlockDamageAbortEvent event)
+    {
+        playerList.remove(event.getPlayer());
+    }
+
+    public static BukkitRunnable breakBedrock=new BukkitRunnable()
+    {
+        @Override
+        public void run()
+        {
+            playerSet=new HashSet<>();
+            for (Player i: playerList.keySet())
+            {
+                AbstractMap.SimpleEntry<Date, Block> value=playerList.get(i);
+                if (Calendar.getInstance().getTime().getTime()-value.getKey().getTime()>=30000)
+                {
+                    playerSet.add(i);
+                    BlockBreakEvent event=new BlockBreakEvent(value.getValue(),i);
+                    Bukkit.getPluginManager().callEvent(event);
+                    if (event.isCancelled())
+                    {
+                        continue;
+                    }
+                    Bluestar.setBlock(value.getValue().getLocation(),Material.AIR,i.getName());
+                    value.getValue().getWorld().dropItem(value.getValue().getLocation(),bedrock);
+                }
+            }
+            for (Player i: playerSet)
+            {
+                playerList.remove(i);
+            }
+        }
+    };
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/ElevatorListener.java b/src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java
similarity index 98%
rename from src/main/java/me/lanzhi/bluestargame/listener/ElevatorListener.java
rename to src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java
index 05bdbcf..6284317 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/ElevatorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java
@@ -12,7 +12,7 @@
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerToggleSneakEvent;
 
-public class ElevatorListener implements Listener
+public class elevatorListener implements Listener
 {
     @EventHandler(priority=EventPriority.MONITOR)
     public void onPlayerMove(PlayerMoveEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/DoMute.java b/src/main/java/me/lanzhi/bluestargame/listener/muteListener.java
similarity index 97%
rename from src/main/java/me/lanzhi/bluestargame/listener/DoMute.java
rename to src/main/java/me/lanzhi/bluestargame/listener/muteListener.java
index d4a1e31..af7a65b 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/DoMute.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/muteListener.java
@@ -12,7 +12,7 @@
 import static me.lanzhi.bluestargame.BluestarGame.BluestarDataFormat;
 import static me.lanzhi.bluestargame.BluestarGame.messageHead;
 
-public class DoMute implements Listener
+public class muteListener implements Listener
 {
     @EventHandler
     public void onChatForMuted(AsyncPlayerChatEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/Sword.java b/src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java
similarity index 98%
rename from src/main/java/me/lanzhi/bluestargame/listener/Sword.java
rename to src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java
index 21f2e01..1b01e97 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/Sword.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java
@@ -17,7 +17,7 @@
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.scheduler.BukkitRunnable;
 
-public class Sword implements Listener
+public class opSwordListener implements Listener
 {
     @EventHandler(priority=EventPriority.HIGHEST)
     public void onPlayerDamage(EntityDamageEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/MoreMineral.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
similarity index 99%
rename from src/main/java/me/lanzhi/bluestargame/listener/randoms/MoreMineral.java
rename to src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
index 2072fdc..e4e2799 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/MoreMineral.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
@@ -11,7 +11,7 @@
 
 import java.util.List;
 
-public class MoreMineral implements Listener
+public class moreMineralListener implements Listener
 {
     @EventHandler(priority=EventPriority.MONITOR)
     public void onBlockDropItem(BlockDropItemEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/RandChatColor.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
similarity index 95%
rename from src/main/java/me/lanzhi/bluestargame/listener/randoms/RandChatColor.java
rename to src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
index d54943d..29d1a11 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/RandChatColor.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
@@ -7,7 +7,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
-public class RandChatColor implements Listener
+public class randChatColorListener implements Listener
 {
 
     @EventHandler(priority=EventPriority.LOW)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/RandDamage.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
similarity index 73%
rename from src/main/java/me/lanzhi/bluestargame/listener/randoms/RandDamage.java
rename to src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
index 26c4ce2..ece9465 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/RandDamage.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
@@ -12,19 +12,27 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
 
-public class RandDamage implements Listener
-{
+import static me.lanzhi.bluestargame.BluestarGame.*;
 
+public class randDamageListener implements Listener
+{
+    EntityDamageEvent lastEvent=null;
     @EventHandler(priority=EventPriority.HIGHEST)
-    public void onEntityDamage(EntityDamageEvent event)
+    synchronized public void onEntityDamage(EntityDamageEvent event)
     {
-        if (!CTRL.randdamage()||event.isCancelled())
+        if (event.equals(lastEvent))
+        {
+            System.out.println("yes");
+            return;
+        }
+        lastEvent=event;
+        if (!CTRL.randdamage())
         {
             return;
         }
         Entity entity=event.getEntity();
         double hurt=(Math.random()-0.3D)*event.getDamage()*5.0D;
-        entity.sendMessage(ChatColor.GREEN+"[BluestarGame]随机伤害");
+        entity.sendMessage(messageHead+"随机伤害");
         entity.sendMessage(ChatColor.YELLOW+"原伤害:"+event.getDamage()+",随机伤害:"+hurt);
         if (hurt>0.0D)
         {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/RandSheepColor.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
similarity index 97%
rename from src/main/java/me/lanzhi/bluestargame/listener/randoms/RandSheepColor.java
rename to src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
index 0d04cf7..6c3a423 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/RandSheepColor.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
@@ -11,7 +11,7 @@
 import org.bukkit.event.entity.SheepDyeWoolEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class RandSheepColor implements Listener
+public class randSheepColorListener implements Listener
 {
     @EventHandler(priority=EventPriority.HIGH)
     public void onSheepDyeWool(SheepDyeWoolEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/Respawn.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java
similarity index 93%
rename from src/main/java/me/lanzhi/bluestargame/listener/randoms/Respawn.java
rename to src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java
index 2b376e6..9fd92cd 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/Respawn.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java
@@ -7,7 +7,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
 
-public class Respawn implements Listener
+public class respawnListener implements Listener
 {
     @EventHandler(priority=EventPriority.MONITOR)
     public void onEntiyDie(EntityDeathEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/The24Point.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
similarity index 98%
rename from src/main/java/me/lanzhi/bluestargame/listener/randoms/The24Point.java
rename to src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
index da31e01..51f0c3d 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/The24Point.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
@@ -15,7 +15,7 @@
 
 import static me.lanzhi.bluestargame.BluestarGame.messageHead;
 
-public class The24Point implements Listener
+public class the24PointListener implements Listener
 {
     @EventHandler
     public void onChatFor24(AsyncPlayerChatEvent event)
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/PlaceSponge.java b/src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java
similarity index 82%
rename from src/main/java/me/lanzhi/bluestargame/listener/PlaceSponge.java
rename to src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java
index 8d3c758..00e4d49 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/PlaceSponge.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java
@@ -4,14 +4,14 @@
 import de.tr7zw.nbtapi.NBTItem;
 import me.lanzhi.bluestargame.BluestarGame;
 import me.lanzhi.bluestargame.Ctrls.CtrlSponge;
-import me.lanzhi.bluestargame.Type.superSponge;
+import me.lanzhi.bluestargame.Type.SuperSponge;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class PlaceSponge implements Listener
+public class superSpongeListener implements Listener
 {
     @EventHandler(priority=EventPriority.HIGHEST)
     public void onPlayerPlaceBlock(BlockPlaceEvent event)
@@ -35,14 +35,14 @@ public void onPlayerPlaceBlock(BlockPlaceEvent event)
         {
             return;
         }
-        CtrlSponge.add(new superSponge(BluestarGame.config.getInt("spongeR"),event.getBlock().getLocation(),event.getPlayer().getName(),bluestar.getInteger("lavaSponge")==1,bluestar.getInteger("waterSponge")==1));
+        CtrlSponge.add(new SuperSponge(BluestarGame.config.getInt("spongeR"),event.getBlock().getLocation(),event.getPlayer().getName(),bluestar.getInteger("lavaSponge")==1,bluestar.getInteger("waterSponge")==1));
         if (bluestar.getInteger("lavaSponge")==1)
         {
-            event.getPlayer().getInventory().addItem(superSponge.getUsedLavaSponge().getItem());
+            event.getPlayer().getInventory().addItem(SuperSponge.getUsedLavaSponge().getItem());
         }
         else
         {
-            event.getPlayer().getInventory().addItem(superSponge.getUsedWaterSponge().getItem());
+            event.getPlayer().getInventory().addItem(SuperSponge.getUsedWaterSponge().getItem());
         }
     }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/papi/BluestarGamePapi.java b/src/main/java/me/lanzhi/bluestargame/papi/BluestarGamePapi.java
deleted file mode 100644
index 2f07480..0000000
--- a/src/main/java/me/lanzhi/bluestargame/papi/BluestarGamePapi.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package me.lanzhi.bluestargame.papi;
-
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.lanzhi.bluestartpscontrol.BluestarTpsControlApi;
-import net.minecraft.server.MinecraftServer;
-import org.bukkit.OfflinePlayer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class BluestarGamePapi extends PlaceholderExpansion
-{
-    public BluestarGamePapi()
-    {
-        this.register();
-    }
-
-    @Override
-    public @NotNull String getIdentifier()
-    {
-        return "BluestarGame";
-    }
-
-    @Override
-    public @NotNull String getName()
-    {
-        return "BluestarGame-Papi";
-    }
-
-    @Override
-    public @NotNull String getAuthor()
-    {
-        return "lanzhi";
-    }
-
-    @Override
-    public @NotNull String getVersion()
-    {
-        return "2.5.1";
-    }
-
-    @Override
-    public boolean persist()
-    {
-        return true;
-    }
-
-    @Override
-    @NotNull
-    public String onRequest(@Nullable OfflinePlayer player,@Nullable String params)
-    {
-        return BluestarTpsControlApi.tpsFormat(MinecraftServer.getServer().recentTps[0]);
-    }
-}
diff --git a/src/main/java/me/lanzhi/bluestargame/register/RegisterListeners.java b/src/main/java/me/lanzhi/bluestargame/register/RegisterListeners.java
deleted file mode 100644
index 5b6b663..0000000
--- a/src/main/java/me/lanzhi/bluestargame/register/RegisterListeners.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package me.lanzhi.bluestargame.register;
-
-import me.lanzhi.bluestargame.listener.*;
-import me.lanzhi.bluestargame.listener.randoms.*;
-import org.bukkit.Bukkit;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.PluginManager;
-
-import static me.lanzhi.bluestargame.BluestarGame.plugin;
-
-public class RegisterListeners
-{
-    private static PluginManager pluginManager;
-
-    public static void registerListeners()
-    {
-        pluginManager=Bukkit.getPluginManager();
-        registerlistener(new DoMute());
-        registerlistener(new HealthFix());
-        registerlistener(new PlaceSponge());
-        registerlistener(new Sword());
-
-        registerlistener(new MoreMineral());
-        registerlistener(new RandChatColor());
-        registerlistener(new RandDamage());
-        registerlistener(new RandSheepColor());
-        registerlistener(new Respawn());
-        registerlistener(new The24Point());
-        registerlistener(new ElevatorListener());
-    }
-
-    private static void registerlistener(Listener listener)
-    {
-        pluginManager.registerEvents(listener,plugin);
-    }
-}
diff --git a/src/main/java/me/lanzhi/bluestargame/register/RegisterRecipe.java b/src/main/java/me/lanzhi/bluestargame/register/RegisterRecipe.java
deleted file mode 100644
index 7f2fabb..0000000
--- a/src/main/java/me/lanzhi/bluestargame/register/RegisterRecipe.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package me.lanzhi.bluestargame.register;
-
-import me.lanzhi.bluestargame.BluestarGame;
-import me.lanzhi.bluestargame.Type.superSponge;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.inventory.FurnaceRecipe;
-import org.bukkit.inventory.RecipeChoice;
-import org.bukkit.inventory.ShapedRecipe;
-import org.bukkit.inventory.ShapelessRecipe;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RegisterRecipe
-{
-    final private static List<NamespacedKey> recipes=new ArrayList<>();
-
-    public static void registerRecipes()
-    {
-        /* 9海绵->超级海绵 */
-        recipes.add(new NamespacedKey(BluestarGame.plugin,"supersponge"));
-        ShapelessRecipe bluestarsponge=new ShapelessRecipe(new NamespacedKey(BluestarGame.plugin,"supersponge"),superSponge.getWaterSponge().getItem());
-        bluestarsponge=bluestarsponge.addIngredient(9,Material.SPONGE);
-        Bukkit.addRecipe(bluestarsponge);
-
-        /* 岩浆海绵->水海绵 */
-        recipes.add(new NamespacedKey(BluestarGame.plugin,"watersponge"));
-        ShapedRecipe supersponge=new ShapedRecipe(new NamespacedKey(BluestarGame.plugin,"watersponge"),superSponge.getWaterSponge().getItem());
-        supersponge=supersponge.shape("a");
-        supersponge=supersponge.setIngredient('a',new RecipeChoice.ExactChoice(superSponge.getlavaSponge().getItem()));
-        Bukkit.addRecipe(supersponge);
-
-        /* 水海绵->岩浆海绵 */
-        recipes.add(new NamespacedKey(BluestarGame.plugin,"lavasponge"));
-        ShapedRecipe lavasponge=new ShapedRecipe(new NamespacedKey(BluestarGame.plugin,"lavasponge"),superSponge.getlavaSponge().getItem());
-        lavasponge=lavasponge.shape("a");
-        lavasponge=lavasponge.setIngredient('a',new RecipeChoice.ExactChoice(superSponge.getWaterSponge().getItem()));
-        Bukkit.addRecipe(lavasponge);
-
-        /* 使用过的水海绵烧制 */
-        recipes.add(new NamespacedKey(BluestarGame.plugin,"usedwatersponge"));
-        FurnaceRecipe usedWatersponge=new FurnaceRecipe(new NamespacedKey(BluestarGame.plugin,"usedwatersponge"),superSponge.getWaterSponge().getItem(),new RecipeChoice.ExactChoice(superSponge.getUsedWaterSponge().getItem()),5,200);
-        Bukkit.addRecipe(usedWatersponge);
-
-        /* 使用过的岩浆海绵烧制 */
-        recipes.add(new NamespacedKey(BluestarGame.plugin,"usedlavasponge"));
-        FurnaceRecipe usedlavasponge=new FurnaceRecipe(new NamespacedKey(BluestarGame.plugin,"usedlavasponge"),superSponge.getlavaSponge().getItem(),new RecipeChoice.ExactChoice(superSponge.getUsedLavaSponge().getItem()),5,200);
-        Bukkit.addRecipe(usedlavasponge);
-    }
-
-    public static void cancellationRecipes()
-    {
-        for (NamespacedKey i: recipes)
-        {
-            Bukkit.removeRecipe(i);
-        }
-    }
-}
diff --git a/src/main/java/me/lanzhi/bluestargame/register/registerCommand.java b/src/main/java/me/lanzhi/bluestargame/register/registerCommand.java
new file mode 100644
index 0000000..d375432
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/register/registerCommand.java
@@ -0,0 +1,20 @@
+package me.lanzhi.bluestargame.register;
+
+import me.lanzhi.bluestargame.commands.*;
+
+import static me.lanzhi.bluestargame.BluestarGame.plugin;
+
+public class registerCommand
+{
+    public static void registerCommands()
+    {
+        plugin.getCommand("bluestargame").setExecutor(new me.lanzhi.bluestargame.commands.maincommand());
+        plugin.getCommand("bluestargamelist").setExecutor(new bsgamelist());
+        plugin.getCommand("muted").setExecutor(new mutedCommand());
+        plugin.getCommand("chat").setExecutor(new chat());
+        plugin.getCommand("bluestaritem").setExecutor(new bluestaritem());
+        plugin.getCommand("elevator").setExecutor(new elevatorCommand());
+        plugin.getCommand("xiaomobank").setExecutor(new xiaoMoBankCommand());
+        plugin.getCommand("cmdbag").setExecutor(new commandBag());
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/register/registerConfigurationSection.java b/src/main/java/me/lanzhi/bluestargame/register/registerConfigurationSection.java
new file mode 100644
index 0000000..200bca4
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/register/registerConfigurationSection.java
@@ -0,0 +1,19 @@
+package me.lanzhi.bluestargame.register;
+
+import java.util.HashMap;
+
+import static me.lanzhi.bluestargame.BluestarGame.Data;
+import static me.lanzhi.bluestargame.commands.mutedCommand.muted;
+import static me.lanzhi.bluestargame.Type.Elevator.elevators;
+
+public class registerConfigurationSection
+{
+    public static void registerConfigurationSections()
+    {
+        muted=Data.getConfigurationSection("muted");
+        muted=(muted==null)?Data.createSection("muted"):muted;
+
+        elevators=Data.getConfigurationSection("elevators");
+        elevators=(elevators==null)?Data.createSection("elevators"):elevators;
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/register/registerListeners.java b/src/main/java/me/lanzhi/bluestargame/register/registerListeners.java
new file mode 100644
index 0000000..d58b031
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/register/registerListeners.java
@@ -0,0 +1,38 @@
+package me.lanzhi.bluestargame.register;
+
+import me.lanzhi.bluestargame.listener.*;
+import me.lanzhi.bluestargame.listener.randoms.*;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.PluginManager;
+
+import static me.lanzhi.bluestargame.BluestarGame.plugin;
+
+public class registerListeners
+{
+    private static PluginManager pluginManager;
+
+    public static void registerListeners()
+    {
+        pluginManager=Bukkit.getPluginManager();
+        registerlistener(new muteListener());
+        registerlistener(new HealthFixListener());
+        registerlistener(new superSpongeListener());
+        registerlistener(new opSwordListener());
+        registerlistener(new arrowListener());
+        registerlistener(new breakBedrockListener());
+
+        registerlistener(new moreMineralListener());
+        registerlistener(new randChatColorListener());
+        registerlistener(new randDamageListener());
+        registerlistener(new randSheepColorListener());
+        registerlistener(new respawnListener());
+        registerlistener(new the24PointListener());
+        registerlistener(new elevatorListener());
+    }
+
+    private static void registerlistener(Listener listener)
+    {
+        pluginManager.registerEvents(listener,plugin);
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/register/registerRecipe.java b/src/main/java/me/lanzhi/bluestargame/register/registerRecipe.java
new file mode 100644
index 0000000..8ced6fb
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/register/registerRecipe.java
@@ -0,0 +1,102 @@
+package me.lanzhi.bluestargame.register;
+
+import me.lanzhi.bluestargame.BluestarGame;
+import me.lanzhi.bluestargame.Type.CompressedCoal;
+import me.lanzhi.bluestargame.Type.SuperSponge;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class registerRecipe
+{
+    final private static List<NamespacedKey> recipes=new ArrayList<>();
+
+    public static void registerRecipes()
+    {
+        /* 9海绵->超级海绵 */
+        NamespacedKey super_sponge_key=new NamespacedKey(BluestarGame.plugin,"super_sponge");
+        recipes.add(super_sponge_key);
+        ShapelessRecipe super_sponge=new ShapelessRecipe(super_sponge_key,SuperSponge.getWaterSponge().getItem());
+        super_sponge=super_sponge.addIngredient(9,Material.SPONGE);
+        Bukkit.addRecipe(super_sponge);
+
+        /* 岩浆海绵->水海绵 */
+        NamespacedKey water_sponge_key=new NamespacedKey(BluestarGame.plugin,"water_sponge");
+        recipes.add(water_sponge_key);
+        ShapedRecipe water_sponge=new ShapedRecipe(water_sponge_key,SuperSponge.getWaterSponge().getItem());
+        water_sponge=water_sponge.shape("a");
+        water_sponge=water_sponge.setIngredient('a',new RecipeChoice.ExactChoice(SuperSponge.getlavaSponge().getItem()));
+        Bukkit.addRecipe(water_sponge);
+
+        /* 水海绵->岩浆海绵 */
+        NamespacedKey lava_sponge_key=new NamespacedKey(BluestarGame.plugin,"lava_sponge");
+        recipes.add(lava_sponge_key);
+        ShapedRecipe lava_sponge=new ShapedRecipe(lava_sponge_key,SuperSponge.getlavaSponge().getItem());
+        lava_sponge=lava_sponge.shape("a");
+        lava_sponge=lava_sponge.setIngredient('a',new RecipeChoice.ExactChoice(SuperSponge.getWaterSponge().getItem()));
+        Bukkit.addRecipe(lava_sponge);
+
+        /* 使用过的水海绵烧制 */
+        NamespacedKey used_water_sponge_key=new NamespacedKey(BluestarGame.plugin,"used_water_sponge");
+        recipes.add(used_water_sponge_key);
+        FurnaceRecipe used_water_sponge=new FurnaceRecipe(used_water_sponge_key,SuperSponge.getWaterSponge().getItem(),new RecipeChoice.ExactChoice(SuperSponge.getUsedWaterSponge().getItem()),5,200);
+        Bukkit.addRecipe(used_water_sponge);
+
+        /* 使用过的岩浆海绵烧制 */
+        NamespacedKey used_lava_sponge_key=new NamespacedKey(BluestarGame.plugin,"used_lava_sponge");
+        recipes.add(used_lava_sponge_key);
+        FurnaceRecipe used_lava_sponge=new FurnaceRecipe(used_lava_sponge_key,SuperSponge.getlavaSponge().getItem(),new RecipeChoice.ExactChoice(SuperSponge.getUsedLavaSponge().getItem()),5,200);
+        Bukkit.addRecipe(used_lava_sponge);
+
+        /*烧制煤炭块*/
+        NamespacedKey fired_coal_block_key=new NamespacedKey(BluestarGame.plugin,"fired_coal_block");
+        recipes.add(fired_coal_block_key);
+        BlastingRecipe fired_coal_block=new BlastingRecipe(fired_coal_block_key,CompressedCoal.FIRED_COAL_BLOCK.getItem(),new RecipeChoice.ExactChoice(new ItemStack(Material.COAL_BLOCK)),2,200);
+        Bukkit.addRecipe(fired_coal_block);
+
+        /*压缩煤炭*/
+        NamespacedKey compressed_coal_key=new NamespacedKey(BluestarGame.plugin,"compressed_coal");
+        recipes.add(compressed_coal_key);
+        ShapedRecipe compressed_coal=new ShapedRecipe(compressed_coal_key,CompressedCoal.COMPRESSED_COAL.getItem());
+        compressed_coal.shape("aaa","aaa","aaa");
+        compressed_coal.setIngredient('a',new RecipeChoice.ExactChoice(CompressedCoal.FIRED_COAL_BLOCK.getItem()));
+        Bukkit.addRecipe(compressed_coal);
+
+        /*烧制压缩煤炭*/
+        NamespacedKey fired_compressed_coal_key=new NamespacedKey(BluestarGame.plugin,"fired_compressed_coal");
+        recipes.add(fired_compressed_coal_key);
+        BlastingRecipe fired_compressed_coal=new BlastingRecipe(
+                fired_compressed_coal_key,
+                CompressedCoal.FIRED_COMPRESSED_COAL.getItem(),
+                new RecipeChoice.ExactChoice(CompressedCoal.COMPRESSED_COAL.getItem()),
+                2,200
+        );
+        Bukkit.addRecipe(fired_compressed_coal);
+
+        /*合成钻石*/
+        NamespacedKey coal_diamond_key=new NamespacedKey(BluestarGame.plugin,"coal_diamond");
+        recipes.add(coal_diamond_key);
+        ShapedRecipe coal_diamond=new ShapedRecipe(coal_diamond_key,new ItemStack(Material.DIAMOND));
+        coal_diamond.shape("aaa","aaa","aaa");
+        coal_diamond.setIngredient('a',new RecipeChoice.ExactChoice(CompressedCoal.FIRED_COMPRESSED_COAL.getItem()));
+        Bukkit.addRecipe(coal_diamond);
+
+        /*覆盖煤炭块合成煤炭*/
+        Bukkit.removeRecipe(NamespacedKey.minecraft("coal"));
+        ShapedRecipe minecraft_coal=new ShapedRecipe(NamespacedKey.minecraft("coal"),new ItemStack(Material.COAL,9));
+        minecraft_coal.shape("a").setIngredient('a',new RecipeChoice.ExactChoice(new ItemStack(Material.COAL_BLOCK)));
+        Bukkit.addRecipe(minecraft_coal);
+    }
+
+    public static void cancellationRecipes()
+    {
+        for (NamespacedKey i: recipes)
+        {
+            Bukkit.removeRecipe(i);
+        }
+    }
+}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 094157b..72e07fa 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -57,6 +57,6 @@ depend:
   - BluestarAPI
   - NBTAPI
   - PlaceholderAPI
-softdepend:
   - BluestarQQ
-  - MiraiMC
\ No newline at end of file
+  - MiraiMC
+  - Vault
\ No newline at end of file