[3.0.1]一些微调

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,14 +133,14 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/purpur-1.18.2.jar</systemPath>
         </dependency>
+        <!--
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BluestarTpsControl</artifactId>
             <version>1.5</version>
             <scope>system</scope>
             <systemPath>${project.basedir}/lib/BluestarTpsControl-spigotPlugin-1.5.jar</systemPath>
         </dependency>
-        <!--
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BlggguestaasdrTpsControl</artifactId>

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;
+    }
 }
 
 

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"));
-    }
 }

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

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;

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;
 

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;

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)
     {

src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java

@@ -21,31 +21,36 @@
 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)
                 {
                     continue;
                 }
                 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)
     {

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)
     {

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

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;
 

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;

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();
     }
 

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)
     {