From 1ae3788327b05c2a23c92eab55fe90ec3575e59c Mon Sep 17 00:00:00 2001
From: lanzhi6 <lan_zhi@outlook.com>
Date: Thu, 5 May 2022 14:38:03 +0800
Subject: [PATCH] =?UTF-8?q?[3.0.1]=E4=B8=80=E4=BA=9B=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +-
 .../bluestargame/BluestarGamePlugin.java      | 30 +++++++----
 .../bluestargame/Type/CompressedCoal.java     | 50 +++++++++----------
 .../lanzhi/bluestargame/Type/SuperSponge.java | 11 ----
 .../bluestargame/api/BluestarGameApi.java     |  2 +-
 .../lanzhi/bluestargame/api/xiaoMoBank.java   |  2 +-
 .../commands/BluestarGameCommand.java         |  3 +-
 .../commands/BluestarGameListCommand.java     |  4 +-
 .../commands/BluestarItemCommand.java         | 23 +++++----
 .../bluestargame/commands/ChatCommand.java    |  4 +-
 .../bluestargame/commands/CmdBagCommand.java  |  2 +-
 .../commands/ElevatorCommand.java             |  2 +-
 .../bluestargame/commands/MutedCommand.java   |  3 +-
 .../commands/XiaoMoBankCommand.java           |  4 +-
 .../listener/HealthFixListener.java           |  3 +-
 .../bluestargame/listener/arrowListener.java  | 17 ++++---
 .../listener/breakBedrockListener.java        | 43 ++++++++--------
 .../listener/elevatorListener.java            |  4 +-
 .../bluestargame/listener/muteListener.java   |  2 +-
 .../listener/opSwordListener.java             | 11 ++--
 .../listener/randoms/moreMineralListener.java |  4 +-
 .../randoms/randChatColorListener.java        |  4 +-
 .../listener/randoms/randDamageListener.java  |  4 +-
 .../randoms/randSheepColorListener.java       |  3 +-
 .../listener/randoms/respawnListener.java     |  3 +-
 .../listener/randoms/the24PointListener.java  |  3 +-
 .../listener/superSpongeListener.java         |  4 +-
 .../managers/BluestarGameManager.java         |  9 ++--
 .../managers/RandomEventManger.java           |  3 +-
 .../managers/RandomEventsChange.java          |  6 ++-
 .../managers/SuperSpongeManager.java          | 27 +++++-----
 .../register/CommandRegister.java             |  4 +-
 .../register/ListenersRegister.java           |  4 +-
 .../bluestargame/register/RecipeRegister.java | 11 ++--
 34 files changed, 174 insertions(+), 139 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8a6be1..983d101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.lanzhi</groupId>
     <artifactId>BluestarGame</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <packaging>jar</packaging>
 
     <name>BluestarGame</name>
@@ -133,6 +133,7 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/purpur-1.18.2.jar</systemPath>
         </dependency>
+        <!--
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BluestarTpsControl</artifactId>
@@ -140,7 +141,6 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/BluestarTpsControl-spigotPlugin-1.5.jar</systemPath>
         </dependency>
-        <!--
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BlggguestaasdrTpsControl</artifactId>
diff --git a/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java b/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java
index 34b5f6b..87298ca 100644
--- a/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java
+++ b/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java
@@ -31,17 +31,18 @@ public final class BluestarGamePlugin extends JavaPlugin implements BluestarGame
     private final File PlayerData;
     private final YamlFile PlayerMap;
     private final YamlFile Data;
-    private final Economy econ;
+    private Economy econ;
     private final String messageHead=ChatColor.GOLD+"["+ChatColor.DARK_AQUA+"BluestarGame"+ChatColor.GOLD+"]";
     private final String errorMessageHead=messageHead+ChatColor.RED;
     private final SimpleDateFormat BluestarDateFormat;
     private final NumberFormat BluestarNF;
-    private final BluestarGameManager bluestarGameManager;
-    private final CommandRegister commandRegister;
-    private final ListenersRegister listenersRegister;
-    private final RecipeRegister recipeRegister;
+    private BluestarGameManager bluestarGameManager;
+    private CommandRegister commandRegister;
+    private ListenersRegister listenersRegister;
+    private RecipeRegister recipeRegister;
     private BukkitTask spongeTask;
     private BukkitTask bedrockTask;
+    private boolean isEnable=false;
 
     public BluestarGamePlugin()
     {
@@ -53,14 +54,9 @@ public BluestarGamePlugin()
         Data=new YamlFile(new File(this.getDataFolder(),"data.yml"));
         PlayerData=new File(this.getDataFolder(),"PlayerData");
         PlayerData.mkdirs();
-        econ=getServer().getServicesManager().load(Economy.class);
         BluestarDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         BluestarNF=NumberFormat.getInstance();
         BluestarNF.setGroupingUsed(false);
-        bluestarGameManager=new BluestarGameManager(this);
-        commandRegister=new CommandRegister(this);
-        listenersRegister=new ListenersRegister(this);
-        recipeRegister=new RecipeRegister(this);
     }
 
     @Override
@@ -69,6 +65,11 @@ public void onEnable()
         config.reload();
         PlayerMap.reload();
         Data.reload();
+        bluestarGameManager=new BluestarGameManager(this);
+        commandRegister=new CommandRegister(this);
+        listenersRegister=new ListenersRegister(this);
+        recipeRegister=new RecipeRegister(this);
+        econ=getServer().getServicesManager().load(Economy.class);
 
         new Metrics(this,14294);
 
@@ -87,6 +88,7 @@ public void onEnable()
 
         Bukkit.getServicesManager().register(BluestarGamePluginInterface.class,this,this,ServicePriority.Normal);
 
+        isEnable=true;
         System.out.println("BluestarGame已加载");
     }
 
@@ -98,11 +100,12 @@ public void onDisable()
         getBluestarGameManager().getRandomEventManger().end();
         getBluestarGameManager().getRandomEventManger().all(false);
         recipeRegister.cancellationRecipes();
-        Data.set("superSponges",getBluestarGameManager().getSuperSpongeManager());
+        Data.set("superSponges",getBluestarGameManager().getSuperSpongeManager().getSponges());
         Data.save();
         PlayerMap.save();
         config.save();
         Bukkit.getServicesManager().unregisterAll(this);
+        isEnable=false;
         System.out.println("BluestarGame已卸载");
     }
 
@@ -193,6 +196,11 @@ public BluestarGamePlugin getPlugin()
     {
         return this;
     }
+
+    public boolean isEnable()
+    {
+        return this.isEnable;
+    }
 }
 
 
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java b/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
index fbec66b..3394628 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
@@ -80,26 +80,6 @@ public enum CompressedCoal implements ConfigurationSerializable
         }
     }
 
-    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)
@@ -139,6 +119,31 @@ public static CompressedCoal getFromNbtItem(@Nullable NBTItem item)
         return compound==null?null:getFromId(compound.getInteger("coal"));
     }
 
+    public static CompressedCoal deserialize(Map<String, Object> map)
+    {
+        return getFromId((int) map.get("id"));
+    }
+
+    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);
+    }
+
     @NotNull
     @Override
     public Map<String, Object> serialize()
@@ -147,9 +152,4 @@ public Map<String, Object> serialize()
         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/SuperSponge.java b/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
index 089a27b..8e4335d 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
@@ -1,19 +1,8 @@
 package me.lanzhi.bluestargame.Type;
 
-import de.tr7zw.nbtapi.NBTCompound;
-import de.tr7zw.nbtapi.NBTItem;
 import me.lanzhi.bluestarapi.Api.config.AutoSerializeInterface;
 import me.lanzhi.bluestarapi.Api.config.SerializeAs;
-import me.lanzhi.bluestarapi.Api.config.SpecialSerialize;
-import me.lanzhi.bluestargame.BluestarGamePlugin;
-import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @SerializeAs("BluestarGame.SuperSponge")
 public final class SuperSponge implements AutoSerializeInterface
diff --git a/src/main/java/me/lanzhi/bluestargame/api/BluestarGameApi.java b/src/main/java/me/lanzhi/bluestargame/api/BluestarGameApi.java
index 9ec26dd..fc73d95 100644
--- a/src/main/java/me/lanzhi/bluestargame/api/BluestarGameApi.java
+++ b/src/main/java/me/lanzhi/bluestargame/api/BluestarGameApi.java
@@ -3,7 +3,7 @@
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import me.lanzhi.bluestargameapi.api.PluginApiInterface;
 
-public class BluestarGameApi implements PluginApiInterface
+public final class BluestarGameApi implements PluginApiInterface
 {
     private final xiaoMoBank xmBank;
     private final BluestarGamePlugin plugin;
diff --git a/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java b/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java
index 7dd1ab0..0f9bdef 100644
--- a/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java
+++ b/src/main/java/me/lanzhi/bluestargame/api/xiaoMoBank.java
@@ -10,7 +10,7 @@
 import java.util.Date;
 import java.util.UUID;
 
-public class xiaoMoBank implements XiaoMoBankInterface
+public final class xiaoMoBank implements XiaoMoBankInterface
 {
     private final BluestarGamePlugin plugin;
 
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java
index d7bc81c..c880237 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java
@@ -21,7 +21,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-public class BluestarGameCommand implements CommandExecutor, TabExecutor
+
+public final class BluestarGameCommand implements CommandExecutor, TabExecutor
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameListCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameListCommand.java
index a2bc2f6..023b34f 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameListCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameListCommand.java
@@ -7,15 +7,17 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
-public class BluestarGameListCommand implements CommandExecutor
+public final class BluestarGameListCommand implements CommandExecutor
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
+
     public BluestarGameListCommand(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @Override
     public boolean onCommand(CommandSender sender,Command command,String label,String[] args)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java
index 1496e9a..abcf9d0 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java
@@ -21,19 +21,15 @@
 import java.util.Collections;
 import java.util.List;
 
-public class BluestarItemCommand implements CommandExecutor, TabExecutor
+public final class BluestarItemCommand implements CommandExecutor, TabExecutor
 {
-    private final BluestarGamePlugin plugin;
-    public BluestarItemCommand(BluestarGamePlugin plugin)
-    {
-        this.plugin=plugin;
-    }
-    private static List<String>entityType=new ArrayList<>();
+    private static List<String> entityType=new ArrayList<>();
+
     static
     {
         try
         {
-            for (EntityType i:EntityType.values())
+            for (EntityType i: EntityType.values())
             {
                 if (i.getName()==null)
                 {
@@ -41,11 +37,20 @@ public BluestarItemCommand(BluestarGamePlugin plugin)
                 }
                 entityType.add(i.getName());
             }
-        }catch (Throwable e)
+        }
+        catch (Throwable e)
         {
             System.out.println("错误在初始化");
         }
     }
+
+    private final BluestarGamePlugin plugin;
+
+    public BluestarItemCommand(BluestarGamePlugin plugin)
+    {
+        this.plugin=plugin;
+    }
+
     @Override
     public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,@NotNull String label,@NotNull String[] args)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/ChatCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/ChatCommand.java
index 7e7f1b9..810d04a 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/ChatCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/ChatCommand.java
@@ -13,13 +13,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ChatCommand implements CommandExecutor, TabExecutor
+public final class ChatCommand implements CommandExecutor, TabExecutor
 {
     private final BluestarGamePlugin plugin;
+
     public ChatCommand(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
     }
+
     @Override
     public boolean onCommand(CommandSender sender,Command command,String label,String[] args)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/CmdBagCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/CmdBagCommand.java
index 68d3f82..d139ec7 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/CmdBagCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/CmdBagCommand.java
@@ -6,7 +6,7 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-public class CmdBagCommand implements CommandExecutor
+public final class CmdBagCommand implements CommandExecutor
 {
 
     @Override
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/ElevatorCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/ElevatorCommand.java
index c434b3b..d962490 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/ElevatorCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/ElevatorCommand.java
@@ -15,7 +15,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class ElevatorCommand implements CommandExecutor, TabExecutor
+public final class ElevatorCommand implements CommandExecutor, TabExecutor
 {
     private final BluestarGamePlugin plugin;
 
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/MutedCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/MutedCommand.java
index 7302e41..538b868 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/MutedCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/MutedCommand.java
@@ -12,10 +12,11 @@
 
 import java.util.*;
 
-public class MutedCommand implements CommandExecutor, TabExecutor
+public final class MutedCommand implements CommandExecutor, TabExecutor
 {
     private final ConfigurationSection muted;
     private final BluestarGamePlugin plugin;
+
     public MutedCommand(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBankCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBankCommand.java
index 72a0c50..eaa643b 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBankCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/XiaoMoBankCommand.java
@@ -25,7 +25,7 @@
 import java.util.Calendar;
 import java.util.List;
 
-public class XiaoMoBankCommand implements CommandExecutor, TabExecutor
+public final class XiaoMoBankCommand implements CommandExecutor, TabExecutor
 {
     private final BaseComponent borrowGui;
     private final BaseComponent saveGui;
@@ -67,7 +67,7 @@ public XiaoMoBankCommand(BluestarGamePlugin plugin)
         cmp.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND,"/xmbank save "));
         save=new TextComponent(plugin.getMessageHead()+"      ");
         save.addExtra(cmp);
-        
+
         bank=plugin.getBluestarGameManager().getApi().getXiaoMoBank();
     }
 
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java b/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
index 00fc503..edbbddd 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-public class HealthFixListener implements Listener
+public final class HealthFixListener implements Listener
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
@@ -24,6 +24,7 @@ public HealthFixListener(BluestarGamePlugin plugin)
         this.plugin=plugin;
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @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
index e9994a3..e8e6f97 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
@@ -9,8 +9,16 @@
 import org.bukkit.event.entity.EntityShootBowEvent;
 import org.bukkit.util.Vector;
 
-public class arrowListener implements Listener
+public final class arrowListener implements Listener
 {
+    public static double decide(double x,double y,double z)
+    {
+        x=Math.abs(x);
+        y=Math.abs(y);
+        z=Math.abs(z);
+        return Math.min(10D/x,Math.min(10D/y,10D/z));
+    }
+
     @EventHandler
     public void entityArrow(EntityShootBowEvent event)
     {
@@ -46,11 +54,4 @@ public void entityArrow(EntityShootBowEvent event)
         vector.setX(vector.getX()*vv).setY(vector.getY()*vv).setZ(vector.getZ()*vv);
         event.getProjectile().setVelocity(vector);
     }
-    public static double decide(double x,double y,double z)
-    {
-        x=Math.abs(x);
-        y=Math.abs(y);
-        z=Math.abs(z);
-        return Math.min(10D/x,Math.min(10D/y,10D/z));
-    }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java b/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
index 6acb16b..931d8b8 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
@@ -15,32 +15,11 @@
 
 import java.util.*;
 
-public class breakBedrockListener implements Listener
+public final 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
@@ -69,4 +48,24 @@ public void run()
             }
         }
     };
+
+    @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());
+    }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java b/src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java
index 2c11994..85f76ac 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/elevatorListener.java
@@ -13,13 +13,15 @@
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerToggleSneakEvent;
 
-public class elevatorListener implements Listener
+public final class elevatorListener implements Listener
 {
     private final BluestarGamePlugin plugin;
+
     public elevatorListener(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
     }
+
     @EventHandler(priority=EventPriority.MONITOR)
     public void onPlayerMove(PlayerMoveEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/muteListener.java b/src/main/java/me/lanzhi/bluestargame/listener/muteListener.java
index 3e7cfc7..1785b5f 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/muteListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/muteListener.java
@@ -10,7 +10,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
-public class muteListener implements Listener
+public final class muteListener implements Listener
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java b/src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java
index 5455c5c..86b6377 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/opSwordListener.java
@@ -7,7 +7,10 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Damageable;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -17,13 +20,15 @@
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.scheduler.BukkitRunnable;
 
-public class opSwordListener implements Listener
+public final class opSwordListener implements Listener
 {
     private final BluestarGamePlugin plugin;
+
     public opSwordListener(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
     }
+
     @EventHandler(priority=EventPriority.HIGHEST)
     public void onPlayerDamage(EntityDamageEvent event)
     {
@@ -77,7 +82,7 @@ public void onPlayerDamage(EntityDamageEvent event)
             }
             if (event1.getDamager() instanceof Arrow)
             {
-                ((Damageable)Bukkit.getEntity(new NBTEntity(event1.getDamager()).getUUID("Owner"))).damage(Integer.MAX_VALUE,entity);
+                ((Damageable) Bukkit.getEntity(new NBTEntity(event1.getDamager()).getUUID("Owner"))).damage(Integer.MAX_VALUE,entity);
                 return;
             }
             System.out.println(event1.getDamager().getType().toString());
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
index fdac4fd..7b8257d 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
@@ -12,13 +12,15 @@
 
 import java.util.List;
 
-public class moreMineralListener implements Listener
+public final class moreMineralListener implements Listener
 {
     private final RandomEventManger randomEventManger;
+
     public moreMineralListener(BluestarGamePlugin plugin)
     {
         this.randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @EventHandler(priority=EventPriority.MONITOR)
     public void onBlockDropItem(BlockDropItemEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
index 51961b8..9176bf9 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
@@ -8,13 +8,15 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
-public class randChatColorListener implements Listener
+public final class randChatColorListener implements Listener
 {
     private RandomEventManger randomEventManger;
+
     public randChatColorListener(BluestarGamePlugin plugin)
     {
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @EventHandler(priority=EventPriority.LOW)
     public void onChatForRand(AsyncPlayerChatEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
index b6cf2f7..b608fcb 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
@@ -13,10 +13,11 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
 
-public class randDamageListener implements Listener
+public final class randDamageListener implements Listener
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
+    EntityDamageEvent lastEvent=null;
 
     public randDamageListener(BluestarGamePlugin plugin)
     {
@@ -24,7 +25,6 @@ public randDamageListener(BluestarGamePlugin plugin)
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
 
-    EntityDamageEvent lastEvent=null;
     @EventHandler(priority=EventPriority.HIGHEST)
     synchronized public void onEntityDamage(EntityDamageEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
index 85925fa..ad70ebe 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
@@ -12,7 +12,7 @@
 import org.bukkit.event.entity.SheepDyeWoolEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class randSheepColorListener implements Listener
+public final class randSheepColorListener implements Listener
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
@@ -22,6 +22,7 @@ public randSheepColorListener(BluestarGamePlugin plugin)
         this.plugin=plugin;
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @EventHandler(priority=EventPriority.HIGH)
     public void onSheepDyeWool(SheepDyeWoolEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java
index 4947ce0..b551af5 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/respawnListener.java
@@ -8,7 +8,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDeathEvent;
 
-public class respawnListener implements Listener
+public final class respawnListener implements Listener
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
@@ -18,6 +18,7 @@ public respawnListener(BluestarGamePlugin plugin)
         this.plugin=plugin;
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @EventHandler(priority=EventPriority.MONITOR)
     public void onEntiyDie(EntityDeathEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
index c53c015..40d1466 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
@@ -13,7 +13,7 @@
 
 import java.util.UUID;
 
-public class the24PointListener implements Listener
+public final class the24PointListener implements Listener
 {
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
@@ -23,6 +23,7 @@ public the24PointListener(BluestarGamePlugin plugin)
         this.plugin=plugin;
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @EventHandler
     public void onChatFor24(AsyncPlayerChatEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java b/src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java
index 5c2862b..9b1734b 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/superSpongeListener.java
@@ -10,13 +10,15 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class superSpongeListener implements Listener
+public final class superSpongeListener implements Listener
 {
     private final BluestarGamePlugin plugin;
+
     public superSpongeListener(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
     }
+
     @EventHandler(priority=EventPriority.HIGHEST)
     public void onPlayerPlaceBlock(BlockPlaceEvent event)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java b/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java
index 87255a4..81127a8 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java
@@ -22,10 +22,10 @@ public final class BluestarGameManager implements BluestarGameManagerInterface
     public BluestarGameManager(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
-        ConfigurationSection s=plugin.getConfig().getConfigurationSection("muted");
-        muted=s==null?plugin.getConfig().createSection("muted"):s;
-        s=plugin.getConfig().getConfigurationSection("elevators");
-        elevators=s==null?plugin.getConfig().createSection("elevators"):s;
+        ConfigurationSection s=plugin.getData().getConfigurationSection("muted");
+        muted=s==null?plugin.getData().createSection("muted"):s;
+        s=plugin.getData().getConfigurationSection("elevators");
+        elevators=s==null?plugin.getData().createSection("elevators"):s;
         this.api=new BluestarGameApi(plugin);
         this.randomEventManger=new RandomEventManger(plugin);
         this.superSpongeManager=new SuperSpongeManager(plugin);
@@ -48,6 +48,7 @@ public ConfigurationSection getElevators()
     {
         return elevators;
     }
+
     @Nullable
     public Elevator getElevator(Location loc)
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/RandomEventManger.java b/src/main/java/me/lanzhi/bluestargame/managers/RandomEventManger.java
index 878af9a..b2cc54e 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/RandomEventManger.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/RandomEventManger.java
@@ -10,10 +10,11 @@
 
 public final class RandomEventManger implements RandomEventMangerInterface
 {
-    public int[] fourNum=new int[4];
     private final BluestarGamePlugin plugin;
+    public int[] fourNum=new int[4];
     public BukkitTask task=null;
     public RandomEventsChange randomEvents;
+
     public RandomEventManger(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java b/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java
index e772177..0700ce7 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java
@@ -6,15 +6,17 @@
 
 public final class RandomEventsChange extends BukkitRunnable
 {
-    private int on;
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
+    private int on;
+
     public RandomEventsChange(BluestarGamePlugin plugin,int on)
     {
         this.plugin=plugin;
         this.on=on;
         this.randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
+
     @Override
     public void run()
     {
@@ -48,6 +50,7 @@ public void run()
             randomEventManger.task=randomEventManger.randomEvents.runTaskLaterAsynchronously(plugin,24000);
         }
     }
+
     public void stop()
     {
         if (on!=0)
@@ -55,6 +58,7 @@ public void stop()
             change(false);
         }
     }
+
     public synchronized void change(boolean b)
     {
         if (on==1)
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java b/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java
index c7bea39..52e407a 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java
@@ -3,7 +3,6 @@
 import de.tr7zw.nbtapi.NBTCompound;
 import de.tr7zw.nbtapi.NBTItem;
 import me.lanzhi.bluestarapi.Api.Bluestar;
-import me.lanzhi.bluestarapi.Api.config.SpecialSerialize;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import me.lanzhi.bluestargame.Type.SuperSponge;
 import me.lanzhi.bluestargameapi.managers.SuperSpongeManagerInterface;
@@ -19,13 +18,9 @@
 
 public final class SuperSpongeManager implements SuperSpongeManagerInterface
 {
+    private final BluestarGamePlugin plugin;
     private List<SuperSponge> nextSponges=new ArrayList<>();
     private List<SuperSponge> sponges=new ArrayList<>();
-    private final BluestarGamePlugin plugin;
-    public SuperSpongeManager(BluestarGamePlugin plugin)
-    {
-        this.plugin=plugin;
-    }
     public BukkitRunnable ctrlsponge=new BukkitRunnable()
     {
         @Override
@@ -56,6 +51,15 @@ public void run()
             sponges=nextSponges;
         }
     };
+    private NBTItem lavaSponge=null;
+    private NBTItem usedLavaSponge=null;
+    private NBTItem waterSponge=null;
+    private NBTItem usedWaterSponge=null;
+
+    public SuperSpongeManager(BluestarGamePlugin plugin)
+    {
+        this.plugin=plugin;
+    }
 
     public void set(List<SuperSponge> spongess)
     {
@@ -89,11 +93,6 @@ public void add(SuperSponge sponge)
         }
         sponges.add(sponge);
     }
-    
-    private NBTItem lavaSponge=null;
-    private NBTItem usedLavaSponge=null;
-    private NBTItem waterSponge=null;
-    private NBTItem usedWaterSponge=null;
 
     @Override
     public NBTItem getWaterSponge()
@@ -180,7 +179,11 @@ public NBTItem getUsedLavaSponge()
         }
         return usedLavaSponge;
     }
-    
+
+    public List<SuperSponge> getSponges()
+    {
+        return sponges;
+    }
 }
 
 
diff --git a/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java b/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java
index 65a5fd5..417f4b5 100644
--- a/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java
+++ b/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java
@@ -3,13 +3,15 @@
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import me.lanzhi.bluestargame.commands.*;
 
-public class CommandRegister
+public final class CommandRegister
 {
     private final BluestarGamePlugin plugin;
+
     public CommandRegister(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
     }
+
     public void registerCommands()
     {
         plugin.getCommand("bluestargame").setExecutor(new BluestarGameCommand(plugin));
diff --git a/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java b/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java
index 6152169..4a9a07b 100644
--- a/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java
+++ b/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java
@@ -7,15 +7,17 @@
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.PluginManager;
 
-public class ListenersRegister
+public final class ListenersRegister
 {
     private final PluginManager pluginManager;
     private final BluestarGamePlugin plugin;
+
     public ListenersRegister(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
         this.pluginManager=Bukkit.getPluginManager();
     }
+
     public void registerListeners()
     {
         registerlistener(new muteListener(plugin));
diff --git a/src/main/java/me/lanzhi/bluestargame/register/RecipeRegister.java b/src/main/java/me/lanzhi/bluestargame/register/RecipeRegister.java
index 2136424..546b26d 100644
--- a/src/main/java/me/lanzhi/bluestargame/register/RecipeRegister.java
+++ b/src/main/java/me/lanzhi/bluestargame/register/RecipeRegister.java
@@ -10,14 +10,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class RecipeRegister
+public final class RecipeRegister
 {
     private final List<NamespacedKey> recipes=new ArrayList<>();
     private final BluestarGamePlugin plugin;
+
     public RecipeRegister(BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
     }
+
     public void registerRecipes()
     {
         /* 9海绵->超级海绵 */
@@ -72,12 +74,7 @@ public void registerRecipes()
         /*烧制压缩煤炭*/
         NamespacedKey fired_compressed_coal_key=new NamespacedKey(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
-        );
+        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);
 
         /*合成钻石*/