From 9ae2206248d8fc6d55891c139ee24605aad761cc Mon Sep 17 00:00:00 2001
From: lanzhi6 <lan_zhi@outlook.com>
Date: Wed, 6 Jul 2022 20:46:04 +0800
Subject: [PATCH] =?UTF-8?q?[3.3.0]=E6=97=A9=E5=B0=B1=E8=AF=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 43 ++++++++--
 .../bluestargame/BluestarGamePlugin.java      | 13 ++-
 .../java/me/lanzhi/bluestargame/Metrics.java  |  2 +-
 .../bluestargame/Type/CompressedCoal.java     | 24 +++---
 .../me/lanzhi/bluestargame/Type/Elevator.java |  6 +-
 .../lanzhi/bluestargame/Type/SuperSponge.java |  4 +-
 .../commands/BluestarGameCommand.java         | 31 +++-----
 .../commands/BluestarItemCommand.java         | 30 ++++---
 .../bluestargame/commands/setNickCommand.java | 67 ++++++++++++++++
 .../listener/ChatColorListener.java           | 10 +--
 .../listener/CompostListener.java             | 34 ++++++++
 .../listener/EasterEggListener.java           | 23 ++++++
 .../listener/HealthFixListener.java           |  2 +-
 .../bluestargame/listener/arrowListener.java  |  2 +-
 .../listener/breakBedrockListener.java        |  7 +-
 .../bluestargame/listener/effectListener.java | 62 ++++++++-------
 .../listener/randoms/moreMineralListener.java |  2 +-
 .../listener/randoms/oneHealthListener.java   |  2 +-
 .../randoms/randChatColorListener.java        |  6 +-
 .../listener/randoms/randDamageListener.java  |  2 +-
 .../randoms/randSheepColorListener.java       |  8 +-
 .../listener/randoms/the24PointListener.java  | 30 ++++---
 .../listener/setNickListener.java             | 62 +++++++++++++++
 .../managers/BluestarGameManager.java         |  7 ++
 .../managers/RandomEventsChange.java          | 79 ++++---------------
 .../managers/SuperSpongeManager.java          |  2 +-
 .../register/CommandRegister.java             |  1 +
 .../register/ListenersRegister.java           |  5 +-
 src/main/resources/plugin.yml                 |  4 +
 29 files changed, 382 insertions(+), 188 deletions(-)
 create mode 100644 src/main/java/me/lanzhi/bluestargame/commands/setNickCommand.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/listener/CompostListener.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/listener/EasterEggListener.java
 create mode 100644 src/main/java/me/lanzhi/bluestargame/listener/setNickListener.java

diff --git a/pom.xml b/pom.xml
index 7d2ee4e..1569931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.lanzhi</groupId>
     <artifactId>BluestarGame</artifactId>
-    <version>3.2.0</version>
+    <version>3.3.0</version>
     <packaging>jar</packaging>
 
     <name>BluestarGame</name>
@@ -57,6 +57,14 @@
             <id>spigotmc-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>purpur</id>
+            <url>https://repo.purpurmc.org/snapshots</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
         <repository>
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
@@ -77,12 +85,26 @@
     </repositories>
 
     <dependencies>
+        <!--
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
             <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        -->
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>4.11.0</version>
+        </dependency>
+
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api-plugin</artifactId>
@@ -92,19 +114,19 @@
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BluestarAPI</artifactId>
-            <version>2.1.2</version>
+            <version>2.4.0-pre1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BluestarQQ</artifactId>
-            <version>1.0.4</version>
+            <version>1.1.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
             <artifactId>BluestarGameAPI</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -116,7 +138,7 @@
         <dependency>
             <groupId>com.github.DreamVoid.MiraiMC</groupId>
             <artifactId>MiraiMC-Integration</artifactId>
-            <version>1.6</version>
+            <version>1.7-pre2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -131,15 +153,22 @@
             <artifactId>purpur</artifactId>
             <version>1.18.2</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/purpur-1.18.2.jar</systemPath>
+            <systemPath>${project.basedir}/lib/DeEnchantment-1.3.0-all.jar</systemPath>
         </dependency>
         <!--
+        <dependency>
+            <groupId>org.purpur</groupId>
+            <artifactId>citizens</artifactId>
+            <version>1.18.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/PlayerPoints-3.2.4.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>
+            <systemPath>${project.basedir}/lib/GMusic.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.github.lanzhi6</groupId>
diff --git a/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java b/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java
index 3d1238b..0c41cf1 100644
--- a/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java
+++ b/src/main/java/me/lanzhi/bluestargame/BluestarGamePlugin.java
@@ -1,7 +1,7 @@
 package me.lanzhi.bluestargame;
 
-import me.lanzhi.bluestarapi.Api.config.AutoSerialize;
-import me.lanzhi.bluestarapi.Api.config.YamlFile;
+import me.lanzhi.bluestarapi.api.config.AutoSerialize;
+import me.lanzhi.bluestarapi.api.config.YamlFile;
 import me.lanzhi.bluestargame.Type.CompressedCoal;
 import me.lanzhi.bluestargame.Type.Elevator;
 import me.lanzhi.bluestargame.Type.SuperSponge;
@@ -11,6 +11,7 @@
 import me.lanzhi.bluestargame.register.ListenersRegister;
 import me.lanzhi.bluestargame.register.RecipeRegister;
 import me.lanzhi.bluestargameapi.BluestarGamePluginInterface;
+import net.milkbowl.vault.chat.Chat;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -37,6 +38,7 @@ public final class BluestarGamePlugin extends JavaPlugin implements BluestarGame
     private final SimpleDateFormat BluestarDateFormat;
     private final NumberFormat BluestarNF;
     private Economy econ;
+    private Chat chat;
     private BluestarGameManager bluestarGameManager;
     private CommandRegister commandRegister;
     private ListenersRegister listenersRegister;
@@ -73,6 +75,8 @@ public void onEnable()
         listenersRegister=new ListenersRegister(this);
         recipeRegister=new RecipeRegister(this);
         econ=getServer().getServicesManager().load(Economy.class);
+        System.out.println(econ==null);
+        chat=getServer().getServicesManager().load(Chat.class);
 
         new Metrics(this,14294);
 
@@ -118,6 +122,11 @@ public Economy getEcon()
         return econ;
     }
 
+    public Chat getChat()
+    {
+        return chat;
+    }
+
     @Override
     public File getPlayerData()
     {
diff --git a/src/main/java/me/lanzhi/bluestargame/Metrics.java b/src/main/java/me/lanzhi/bluestargame/Metrics.java
index bb2ec13..56a0dc8 100644
--- a/src/main/java/me/lanzhi/bluestargame/Metrics.java
+++ b/src/main/java/me/lanzhi/bluestargame/Metrics.java
@@ -14,7 +14,7 @@
  */
 package me.lanzhi.bluestargame;
 
-import me.lanzhi.bluestarapi.Api.config.YamlFile;
+import me.lanzhi.bluestarapi.api.config.YamlFile;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java b/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
index 3394628..38cf98c 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/CompressedCoal.java
@@ -41,38 +41,34 @@ public enum CompressedCoal implements ConfigurationSerializable
         ItemMeta meta=itemm.getItemMeta();
         switch (id)
         {
-            case 1:
-            {
+            case 1 -> {
                 meta.setDisplayName(ChatColor.GOLD+"烧制煤炭");
-                allowRecipe=Collections.singletonList(new NamespacedKey(Bukkit.getPluginManager().getPlugin("BluestarGame"),"compressed_coal"));
+                allowRecipe=Collections.singletonList(
+                        new NamespacedKey(Bukkit.getPluginManager().getPlugin("BluestarGame"),"compressed_coal"));
                 itemm.setItemMeta(meta);
                 item=new NBTItem(itemm);
                 item.addCompound("BluestarGame").setInteger("coal",id);
                 this.id=id;
-                break;
             }
-            case 2:
-            {
+            case 2 -> {
                 meta.setDisplayName(ChatColor.GOLD+"压缩煤炭");
-                allowRecipe=Collections.singletonList(new NamespacedKey(Bukkit.getPluginManager().getPlugin("BluestarGame"),"fired_compressed_coal"));
+                allowRecipe=Collections.singletonList(
+                        new NamespacedKey(Bukkit.getPluginManager().getPlugin("BluestarGame"),"fired_compressed_coal"));
                 itemm.setItemMeta(meta);
                 item=new NBTItem(itemm);
                 item.addCompound("BluestarGame").setInteger("coal",id);
                 this.id=id;
-                break;
             }
-            case 3:
-            {
+            case 3 -> {
                 meta.setDisplayName(ChatColor.GOLD+"烧制压缩煤炭");
-                allowRecipe=Collections.singletonList(new NamespacedKey(Bukkit.getPluginManager().getPlugin("BluestarGame"),"coal_diamond"));
+                allowRecipe=Collections.singletonList(
+                        new NamespacedKey(Bukkit.getPluginManager().getPlugin("BluestarGame"),"coal_diamond"));
                 itemm.setItemMeta(meta);
                 item=new NBTItem(itemm);
                 item.addCompound("BluestarGame").setInteger("coal",id);
                 this.id=id;
-                break;
             }
-            default:
-            {
+            default -> {
                 this.allowRecipe=null;
                 this.id=0;
                 this.item=null;
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java b/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java
index 97d1544..c5dd83d 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/Elevator.java
@@ -1,8 +1,8 @@
 package me.lanzhi.bluestargame.Type;
 
-import me.lanzhi.bluestarapi.Api.config.AutoSerializeInterface;
-import me.lanzhi.bluestarapi.Api.config.SerializeAs;
-import me.lanzhi.bluestarapi.Api.config.SpecialSerialize;
+import me.lanzhi.bluestarapi.api.config.AutoSerializeInterface;
+import me.lanzhi.bluestarapi.api.config.SerializeAs;
+import me.lanzhi.bluestarapi.api.config.SpecialSerialize;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
diff --git a/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java b/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
index 8e4335d..a8ab456 100644
--- a/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
+++ b/src/main/java/me/lanzhi/bluestargame/Type/SuperSponge.java
@@ -1,7 +1,7 @@
 package me.lanzhi.bluestargame.Type;
 
-import me.lanzhi.bluestarapi.Api.config.AutoSerializeInterface;
-import me.lanzhi.bluestarapi.Api.config.SerializeAs;
+import me.lanzhi.bluestarapi.api.config.AutoSerializeInterface;
+import me.lanzhi.bluestarapi.api.config.SerializeAs;
 import org.bukkit.Location;
 
 @SerializeAs("BluestarGame.SuperSponge")
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java
index a4636bd..fab4ee4 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/BluestarGameCommand.java
@@ -16,6 +16,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,14 +28,14 @@ public final class BluestarGameCommand implements CommandExecutor, TabExecutor
     private final BluestarGamePlugin plugin;
     private final RandomEventManger randomEventManger;
 
-    public BluestarGameCommand(BluestarGamePlugin plugin)
+    public BluestarGameCommand(@NotNull BluestarGamePlugin plugin)
     {
         this.plugin=plugin;
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
 
     @Override
-    public boolean onCommand(CommandSender sender,Command command,String label,String[] args)
+    public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,@NotNull String label,@NotNull String[] args)
     {
         if ("reload".equals(args[0])&&sender.hasPermission("bluestargame.lanzhi"))
         {
@@ -340,7 +341,8 @@ 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());
-            plugin.getBluestarGameManager().getSuperSpongeManager().add(new SuperSponge(r,loc,sender.getName(),true,true));
+            plugin.getBluestarGameManager().getSuperSpongeManager().add(
+                    new SuperSponge(r,loc,sender.getName(),true,true));
             return true;
         }
         if ("makeboom".equals(args[0]))
@@ -399,24 +401,11 @@ public List<String> onTabComplete(CommandSender sender,Command command,String al
     {
         if (args.length==1)
         {
-            List<String> tablist=new ArrayList<>();
-            tablist.add("randdamage");
-            tablist.add("randchat");
-            tablist.add("randsheep");
-            tablist.add("24");
-            tablist.add("morediamond");
-            tablist.add("morecoal");
-            tablist.add("morecopper");
-            tablist.add("moreiron");
-            tablist.add("moregold");
-            tablist.add("moreemerald");
-            tablist.add("morelapis");
-            tablist.add("respawn");
-            tablist.add("all");
-            tablist.add("auto");
-            tablist.add("spongeR");
-            tablist.add("boom");
-            tablist.add("onehealth");
+            List<String> tablist=new ArrayList<>(
+                    Arrays.asList("randdamage","randchat","randsheep","24","morediamond","morecoal","morecopper",
+                                  "moreiron","moregold","moreemerald","morelapis","respawn","all","auto","spongeR",
+                                  "boom","onehealth"
+                                 ));
             if (sender.hasPermission("bluestargame.lanzhi"))
             {
                 tablist.add("newsponge");
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java
index 34d26b9..246c6a9 100644
--- a/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java
+++ b/src/main/java/me/lanzhi/bluestargame/commands/BluestarItemCommand.java
@@ -2,7 +2,7 @@
 
 import de.tr7zw.nbtapi.NBTCompound;
 import de.tr7zw.nbtapi.NBTItem;
-import me.lanzhi.bluestarapi.Api.RGBChat;
+import me.lanzhi.bluestarapi.api.RGBColor;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -13,22 +13,21 @@
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Sheep;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static me.lanzhi.bluestargame.listener.effectListener.effectEventType;
-
 import java.util.*;
 
+import static me.lanzhi.bluestargame.listener.effectListener.effectEventType;
+
 public final class BluestarItemCommand implements CommandExecutor, TabExecutor
 {
     private final List<String> entityType=new ArrayList<>();
     private final List<String> potionEffectType=new ArrayList<>();
-    private final Map<String,effectEventType> effectEvents=new HashMap<>();
+    private final Map<String, effectEventType> effectEvents=new HashMap<>();
     private final BluestarGamePlugin plugin;
     private ConfigurationSection effectLang;
     private ConfigurationSection entityLang;
@@ -356,7 +355,8 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                 }
                 else
                 {
-                    NBTCompound nbtCompound=item.addCompound("BluestarGame").addCompound(mod.name()).addCompound(type.getName());
+                    NBTCompound nbtCompound=item.addCompound("BluestarGame").addCompound(mod.name()).addCompound(
+                            type.getName());
                     nbtCompound.setInteger("s",l);
                     nbtCompound.setInteger("time",time*20);
                 }
@@ -383,7 +383,7 @@ public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,
                     builder.append(args[i]);
                 }
                 ItemMeta itemMeta=itemStack.getItemMeta();
-                itemMeta.setDisplayName(RGBChat.setColor(builder.toString().replaceAll("\"\""," ")));
+                itemMeta.setDisplayName(RGBColor.setColor(builder.toString().replaceAll("\"\""," ")));
                 itemStack.setItemMeta(itemMeta);
                 player.getInventory().setItemInMainHand(itemStack);
                 return true;
@@ -402,7 +402,8 @@ public List<String> onTabComplete(@NotNull CommandSender sender,@NotNull Command
     {
         if (args.length==1)
         {
-            return Arrays.asList("watersponge","lavasponge","usedwatersponge","usedlavasponge","effect","effectEvent","sword","bow","setname");
+            return Arrays.asList("watersponge","lavasponge","usedwatersponge","usedlavasponge","effect","effectEvent",
+                                 "sword","bow","setname");
         }
         if ("bow".equals(args[0]))
         {
@@ -460,17 +461,18 @@ private ItemStack setLore(ItemStack itemStack)
         {
             return itemStack;
         }
-        String c=RGBChat.toColorCode("888888");
+        String c=RGBColor.toColorCode("888888");
         if (bluestarGame.getCompound("effect")!=null)
         {
-            lore.add(c+"<===--- "+RGBChat.toColorCode("abcdef")+"手持或佩戴时效果"+c+" ---===>");
+            lore.add(c+"<===--- "+RGBColor.toColorCode("abcdef")+"手持或佩戴时效果"+c+" ---===>");
             NBTCompound compound=bluestarGame.getCompound("effect");
             for (String i: compound.getKeys())
             {
-                lore.add(ChatColor.GRAY+effectLang.getString(i.toLowerCase(),i.toLowerCase())+" "+compound.getInteger(i));
+                lore.add(ChatColor.GRAY+effectLang.getString(i.toLowerCase(),i.toLowerCase())+" "+compound.getInteger(
+                        i));
             }
         }
-        for (effectEventType i:effectEventType.values())
+        for (effectEventType i: effectEventType.values())
         {
             if (bluestarGame.getCompound(i.name())!=null)
             {
@@ -478,7 +480,9 @@ private ItemStack setLore(ItemStack itemStack)
                 NBTCompound compound=bluestarGame.getCompound(i.name());
                 for (String j: compound.getKeys())
                 {
-                    lore.add(ChatColor.GRAY+effectLang.getString(j.toLowerCase(),j.toLowerCase())+" "+compound.addCompound(j).getInteger("s")+"  时间: "+(compound.addCompound(j).getInteger("time")/20));
+                    lore.add(ChatColor.GRAY+effectLang.getString(j.toLowerCase(),
+                                                                 j.toLowerCase())+" "+compound.addCompound(
+                            j).getInteger("s")+"  时间: "+(compound.addCompound(j).getInteger("time")/20));
                 }
             }
         }
diff --git a/src/main/java/me/lanzhi/bluestargame/commands/setNickCommand.java b/src/main/java/me/lanzhi/bluestargame/commands/setNickCommand.java
new file mode 100644
index 0000000..27dc844
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/commands/setNickCommand.java
@@ -0,0 +1,67 @@
+package me.lanzhi.bluestargame.commands;
+
+import me.lanzhi.bluestarapi.api.RGBColor;
+import me.lanzhi.bluestargame.BluestarGamePlugin;
+import net.milkbowl.vault.chat.Chat;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+
+public class setNickCommand implements CommandExecutor, TabExecutor
+{
+    private final BluestarGamePlugin plugin;
+    private final Chat chat;
+    private final Economy economy;
+
+    public setNickCommand(BluestarGamePlugin plugin)
+    {
+        this.plugin=plugin;
+        chat=plugin.getChat();
+        economy=plugin.getEcon();
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender,@NotNull Command command,@NotNull String label,@NotNull String[] args)
+    {
+        if (!(sender instanceof Player player))
+        {
+            sender.sendMessage(plugin.getErrorMessageHead()+"此指令仅允许玩家输入!");
+            return true;
+        }
+        List<Player> players=plugin.getBluestarGameManager().getSettingNickPlayer();
+        if (players.remove(player))
+        {
+            player.sendMessage(plugin.getMessageHead()+"已取消设置昵称");
+            return true;
+        }
+        if (!economy.has(player,1000))
+        {
+            player.sendMessage(plugin.getErrorMessageHead()+"错误,你的钱不足1000");
+            return true;
+        }
+        player.sendMessage(plugin.getMessageHead()+"请在聊天区直接发送昵称,支持颜色");
+        player.sendMessage(
+                plugin.getMessageHead()+"支持颜色符号:§1&1§2&2§3&3§4&4§5&5§6&6§7&7§8&8§9&9§0&0§a&a§b&b§c&c§d&d§e&e§f&f"+ChatColor.GOLD+",支持RGB:"+RGBColor.setColor(
+                        "#098765")+"#098765");
+        player.sendMessage(plugin.getErrorMessageHead()+"设置昵称将花费1000,在聊天区发送需要的昵称后立即生效,概不退款。再次设置昵称可以覆盖,需要重新付款");
+        player.sendMessage(plugin.getErrorMessageHead()+"若想取消此操作,请再次输入指令");
+        players.add(player);
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender commandSender,@NotNull Command command,@NotNull String s,@NotNull String[] strings)
+    {
+        return Collections.emptyList();
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/ChatColorListener.java b/src/main/java/me/lanzhi/bluestargame/listener/ChatColorListener.java
index 523c13f..51288af 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/ChatColorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/ChatColorListener.java
@@ -1,19 +1,19 @@
 package me.lanzhi.bluestargame.listener;
 
-import me.lanzhi.bluestarapi.Api.*;
+import me.lanzhi.bluestarapi.api.RGBColor;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public final class ChatColorListener implements Listener
 {
     private Pattern hex=Pattern.compile("#([0-9A-Fa-fK-Ok-oRr]{6})");
-    @EventHandler(priority=EventPriority.LOWEST)
+
+    @EventHandler(ignoreCancelled=true, priority=EventPriority.LOWEST)
     public void onPlyaerChat(AsyncPlayerChatEvent event)
     {
         if (event.isCancelled())
@@ -23,11 +23,11 @@ public void onPlyaerChat(AsyncPlayerChatEvent event)
         boolean canUseColor=event.getPlayer().hasPermission("bluestargame.color");
         if (canUseColor)
         {
-            event.setMessage(RGBChat.setColor(event.getMessage()));
+            event.setMessage(RGBColor.setColor(event.getMessage()));
         }
         else
         {
-            event.setMessage(ChatColor.stripColor(RGBChat.setColor(event.getMessage())));
+            event.setMessage(ChatColor.stripColor(RGBColor.setColor(event.getMessage())));
         }
     }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/CompostListener.java b/src/main/java/me/lanzhi/bluestargame/listener/CompostListener.java
new file mode 100644
index 0000000..1754498
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/listener/CompostListener.java
@@ -0,0 +1,34 @@
+package me.lanzhi.bluestargame.listener;
+
+import me.lanzhi.bluestarapi.api.Bluestar;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.data.Levelled;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
+import org.jetbrains.annotations.NotNull;
+
+public final class CompostListener implements Listener
+{
+    @EventHandler(ignoreCancelled=true)
+    public void onPlayerSneak(@NotNull PlayerToggleSneakEvent event)
+    {
+        if (event.isSneaking())
+        {
+            Player player=event.getPlayer();
+            Location location=player.getLocation();
+            if (location.getBlock().getType()!=Material.COMPOSTER)
+            {
+                return;
+            }
+            Levelled blockData=(Levelled) location.getBlock().getBlockData();
+            if (blockData.getLevel()<blockData.getMaximumLevel()&&Bluestar.randomInt(10)==0)
+            {
+                blockData.setLevel(blockData.getLevel()+1);
+                location.getBlock().setBlockData(blockData);
+            }
+        }
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/EasterEggListener.java b/src/main/java/me/lanzhi/bluestargame/listener/EasterEggListener.java
new file mode 100644
index 0000000..83110d6
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/listener/EasterEggListener.java
@@ -0,0 +1,23 @@
+package me.lanzhi.bluestargame.listener;
+
+import io.papermc.paper.event.player.PlayerNameEntityEvent;
+import me.lanzhi.bluestarapi.api.RGBColor;
+import net.kyori.adventure.text.TextComponent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class EasterEggListener implements Listener
+{
+    @EventHandler(ignoreCancelled=true)
+    public void onPlayerNameEntity(PlayerNameEntityEvent event)
+    {
+        if (event.getName() instanceof TextComponent name)
+        {
+            if (name.content().toLowerCase().contains("bluestar"))
+            {
+                event.getPlayer().sendMessage(
+                        RGBColor.random()+"你好!恭喜你发现了一个隐藏的"+RGBColor.random()+"彩"+RGBColor.random()+"蛋!");
+            }
+        }
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java b/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
index a1e2f41..98b566b 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/HealthFixListener.java
@@ -1,6 +1,6 @@
 package me.lanzhi.bluestargame.listener;
 
-import me.lanzhi.bluestarapi.Api.config.YamlFile;
+import me.lanzhi.bluestarapi.api.config.YamlFile;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import me.lanzhi.bluestargame.managers.RandomEventManger;
 import org.bukkit.attribute.Attribute;
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java b/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
index c022d32..35676ee 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/arrowListener.java
@@ -50,7 +50,7 @@ public void entityArrow(EntityShootBowEvent event)
             Entity entity=event.getEntity().getWorld().spawnEntity(event.getProjectile().getLocation(),type,true);
             event.setProjectile(entity);
         }
-        double vv=Math.min(v,decide(vector.getX(),vector.getY(),vector.getZ()));
+        double vv=v;//Math.min(v,decide(vector.getX(),vector.getY(),vector.getZ()));
         vector.setX(vector.getX()*vv).setY(vector.getY()*vv).setZ(vector.getZ()*vv);
         event.getProjectile().setVelocity(vector);
     }
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java b/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
index 931d8b8..ce14aeb 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/breakBedrockListener.java
@@ -1,11 +1,12 @@
 package me.lanzhi.bluestargame.listener;
 
-import me.lanzhi.bluestarapi.Api.Bluestar;
+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.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockDamageAbortEvent;
@@ -49,7 +50,7 @@ public void run()
         }
     };
 
-    @EventHandler
+    @EventHandler(ignoreCancelled=true,priority=EventPriority.MONITOR)
     public void onPlayerDamageBlock(BlockDamageEvent event)
     {
         if (!event.getBlock().getType().equals(Material.BEDROCK))
@@ -63,7 +64,7 @@ public void onPlayerDamageBlock(BlockDamageEvent event)
         playerList.put(event.getPlayer(),new AbstractMap.SimpleEntry<>(Calendar.getInstance().getTime(),event.getBlock()));
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled=true,priority=EventPriority.MONITOR)
     public void onPlayerDamageBlock(BlockDamageAbortEvent event)
     {
         playerList.remove(event.getPlayer());
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/effectListener.java b/src/main/java/me/lanzhi/bluestargame/listener/effectListener.java
index 5dcf3c6..e7d236c 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/effectListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/effectListener.java
@@ -3,9 +3,8 @@
 import de.tr7zw.nbtapi.NBTCompound;
 import de.tr7zw.nbtapi.NBTEntity;
 import de.tr7zw.nbtapi.NBTItem;
-import me.lanzhi.bluestarapi.Api.RGBChat;
+import me.lanzhi.bluestarapi.api.RGBColor;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -69,6 +68,7 @@ public void onPlayerDamageEntity(EntityDamageByEntityEvent event)
         setEffect(event.getDamager(),inventory.getLeggings(),effectEventType.DamageEntityToUs);
         setEffect(event.getDamager(),inventory.getHelmet(),effectEventType.DamageEntityToUs);
     }
+
     @EventHandler(priority=EventPriority.MONITOR)
     public void onPlayerDamage(EntityDamageEvent event)
     {
@@ -98,9 +98,11 @@ private void setEffect(Entity entity,ItemStack itemStack,effectEventType type)
             entity=Bukkit.getEntity(new NBTEntity(entity).getUUID("Owner"));
         }
         NBTCompound effect=new NBTItem(itemStack).addCompound("BluestarGame").addCompound(type.name());
-        for (String i:effect.getKeys())
+        for (String i: effect.getKeys())
         {
-            ((LivingEntity)entity).addPotionEffect(new PotionEffect(PotionEffectType.getByName(i),effect.addCompound(i).getInteger("time"),effect.addCompound(i).getInteger("s")));
+            ((LivingEntity) entity).addPotionEffect(
+                    new PotionEffect(PotionEffectType.getByName(i),effect.addCompound(i).getInteger("time"),
+                                     effect.addCompound(i).getInteger("s")));
         }
     }
 
@@ -126,6 +128,18 @@ public enum effectEventType
          * 被生物击中给予对方
          */
         DamageByEntityToIt(5);
+        private final static Map<Integer, effectEventType> byId=new HashMap<>();
+        private final static Map<String, effectEventType> byName=new HashMap<>();
+
+        static
+        {
+            for (effectEventType i: values())
+            {
+                byId.put(i.id,i);
+                byName.put(i.name().toLowerCase(),i);
+            }
+        }
+
         private final int id;
 
         effectEventType(int id)
@@ -133,6 +147,16 @@ public enum effectEventType
             this.id=id;
         }
 
+        public static effectEventType getById(int id)
+        {
+            return byId.get(id);
+        }
+
+        public static effectEventType getByName(String name)
+        {
+            return byName.get(name.toLowerCase());
+        }
+
         public int getId()
         {
             return id;
@@ -144,23 +168,23 @@ public String getName()
             {
                 case 1:
                 {
-                    return RGBChat.toColorCode("123456")+"非生物导致受伤时";
+                    return RGBColor.toColorCode("123456")+"非生物导致受伤时";
                 }
                 case 2:
                 {
-                    return RGBChat.toColorCode("523456")+"被生物击中受伤时";
+                    return RGBColor.toColorCode("523456")+"被生物击中受伤时";
                 }
                 case 3:
                 {
-                    return RGBChat.toColorCode("12f456")+"使生物受到伤害时";
+                    return RGBColor.toColorCode("12f456")+"使生物受到伤害时";
                 }
                 case 4:
                 {
-                    return RGBChat.toColorCode("12f4c6")+"击中生物时给予它";
+                    return RGBColor.toColorCode("12f4c6")+"击中生物时给予它";
                 }
                 case 5:
                 {
-                    return RGBChat.toColorCode("c234f6")+"被击中时给予生物";
+                    return RGBColor.toColorCode("c234f6")+"被击中时给予生物";
                 }
                 default:
                 {
@@ -168,25 +192,5 @@ public String getName()
                 }
             }
         }
-
-        public static effectEventType getById(int id)
-        {
-            return byId.get(id);
-        }
-        public static effectEventType getByName(String name)
-        {
-            return byName.get(name.toLowerCase());
-        }
-
-        private final static Map<Integer,effectEventType>byId=new HashMap<>();
-        private final static Map<String,effectEventType>byName=new HashMap<>();
-        static
-        {
-            for (effectEventType i:values())
-            {
-                byId.put(i.id,i);
-                byName.put(i.name().toLowerCase(),i);
-            }
-        }
     }
 }
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 7b8257d..ccf346b 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/moreMineralListener.java
@@ -21,7 +21,7 @@ public moreMineralListener(BluestarGamePlugin plugin)
         this.randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
 
-    @EventHandler(priority=EventPriority.MONITOR)
+    @EventHandler(ignoreCancelled=true,priority=EventPriority.MONITOR)
     public void onBlockDropItem(BlockDropItemEvent event)
     {
         if (randomEventManger.morediamond())
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/randoms/oneHealthListener.java b/src/main/java/me/lanzhi/bluestargame/listener/randoms/oneHealthListener.java
index 531bf57..23c05f9 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/oneHealthListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/oneHealthListener.java
@@ -1,6 +1,6 @@
 package me.lanzhi.bluestargame.listener.randoms;
 
-import me.lanzhi.bluestarapi.Api.config.YamlFile;
+import me.lanzhi.bluestarapi.api.config.YamlFile;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
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 1061135..e964397 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randChatColorListener.java
@@ -1,10 +1,8 @@
 package me.lanzhi.bluestargame.listener.randoms;
 
-import me.lanzhi.bluestarapi.Api.RGBChat;
+import me.lanzhi.bluestarapi.api.RGBColor;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
-import me.lanzhi.bluestargame.listener.ChatColorListener;
 import me.lanzhi.bluestargame.managers.RandomEventManger;
-import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -30,6 +28,6 @@ public void onChatForRand(AsyncPlayerChatEvent event)
         {
             return;
         }
-        event.setMessage(new RGBChat(Math.abs(ThreadLocalRandom.current().nextInt()%0xffffff))+message);
+        event.setMessage(new RGBColor(Math.abs(ThreadLocalRandom.current().nextInt()%0xffffff))+message);
     }
 }
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 b608fcb..ee759f6 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randDamageListener.java
@@ -25,7 +25,7 @@ public randDamageListener(BluestarGamePlugin plugin)
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
 
-    @EventHandler(priority=EventPriority.HIGHEST)
+    @EventHandler(ignoreCancelled=true,priority=EventPriority.HIGHEST)
     synchronized public void onEntityDamage(EntityDamageEvent event)
     {
         if (event.equals(lastEvent))
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 ad70ebe..d7d66a6 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/randSheepColorListener.java
@@ -23,10 +23,10 @@ public randSheepColorListener(BluestarGamePlugin plugin)
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
 
-    @EventHandler(priority=EventPriority.HIGH)
+    @EventHandler(ignoreCancelled=true, priority=EventPriority.HIGH)
     public void onSheepDyeWool(SheepDyeWoolEvent event)
     {
-        if ((!randomEventManger.randsheep())||(event.isCancelled()))
+        if ((!randomEventManger.randsheep()))
         {
             return;
         }
@@ -40,10 +40,10 @@ public void onSheepDyeWool(SheepDyeWoolEvent event)
         }
     }
 
-    @EventHandler(priority=EventPriority.HIGH)
+    @EventHandler(ignoreCancelled=true, priority=EventPriority.HIGH)
     public void onItemSpawn(ItemSpawnEvent event)
     {
-        if ((!randomEventManger.randsheep())||(event.isCancelled()))
+        if ((!randomEventManger.randsheep()))
         {
             return;
         }
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 40d1466..99eb68f 100644
--- a/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
+++ b/src/main/java/me/lanzhi/bluestargame/listener/randoms/the24PointListener.java
@@ -7,6 +7,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -24,7 +25,7 @@ public the24PointListener(BluestarGamePlugin plugin)
         randomEventManger=plugin.getBluestarGameManager().getRandomEventManger();
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR)
     public void onChatFor24(AsyncPlayerChatEvent event)
     {
         new BukkitRunnable()
@@ -34,16 +35,19 @@ public void run()
             {
                 if (decide(event.getMessage()))
                 {
-                    org.bukkit.Bukkit.getServer().broadcastMessage(plugin.getMessageHead()+ChatColor.YELLOW+event.getPlayer().getName()+"答案正确!");
+                    org.bukkit.Bukkit.getServer().broadcastMessage(
+                            plugin.getMessageHead()+ChatColor.YELLOW+event.getPlayer().getName()+"答案正确!");
                     org.bukkit.Bukkit.getServer().broadcastMessage(plugin.getMessageHead()+ChatColor.YELLOW+"获得1000!");
-                    me.lanzhi.bluestarapi.Api.Bluestar.useCommand(org.bukkit.Bukkit.getConsoleSender(),"eco give "+event.getPlayer().getName()+" 1000",plugin);
+                    me.lanzhi.bluestarapi.api.Bluestar.useCommand(org.bukkit.Bukkit.getConsoleSender(),
+                                                                  "eco give "+event.getPlayer().getName()+" 1000",
+                                                                  plugin);
                     randomEventManger.the24(false);
                 }
             }
         }.runTaskAsynchronously(plugin);
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled=true, priority=EventPriority.MONITOR)
     public void onQQChatFor24(QQChatEvent event)
     {
         new BukkitRunnable()
@@ -56,14 +60,22 @@ public void run()
                     String uuid=MiraiMC.getBinding(event.getSenderId());
                     if (uuid==null||"".equals(uuid))
                     {
-                        event.getGroup().sendMessageMirai("[mirai:at:"+event.getSenderId()+"] 您可能在参与24点,且答案正确,但您还未绑定Minecraft账号,请绑定");
-                        org.bukkit.Bukkit.getServer().broadcastMessage(plugin.getMessageHead()+ChatColor.YELLOW+event.getSenderName()+"答案正确!");
+                        event.getGroup().sendMessageMirai(
+                                "[mirai:at:"+event.getSenderId()+"] 您可能在参与24点,且答案正确,但您还未绑定Minecraft账号,请绑定");
+                        org.bukkit.Bukkit.getServer().broadcastMessage(
+                                plugin.getMessageHead()+ChatColor.YELLOW+event.getSenderName()+"答案正确!");
                     }
                     else
                     {
-                        org.bukkit.Bukkit.getServer().broadcastMessage(plugin.getMessageHead()+ChatColor.YELLOW+Bukkit.getOfflinePlayer(UUID.fromString(uuid)).getName()+"答案正确!");
-                        org.bukkit.Bukkit.getServer().broadcastMessage(plugin.getMessageHead()+ChatColor.YELLOW+"获得1000!");
-                        me.lanzhi.bluestarapi.Api.Bluestar.useCommand(org.bukkit.Bukkit.getConsoleSender(),"eco give "+Bukkit.getOfflinePlayer(UUID.fromString(uuid)).getName()+" 1000",plugin);
+                        org.bukkit.Bukkit.getServer().broadcastMessage(
+                                plugin.getMessageHead()+ChatColor.YELLOW+Bukkit.getOfflinePlayer(
+                                        UUID.fromString(uuid)).getName()+"答案正确!");
+                        org.bukkit.Bukkit.getServer().broadcastMessage(
+                                plugin.getMessageHead()+ChatColor.YELLOW+"获得1000!");
+                        me.lanzhi.bluestarapi.api.Bluestar.useCommand(org.bukkit.Bukkit.getConsoleSender(),
+                                                                      "eco give "+Bukkit.getOfflinePlayer(
+                                                                              UUID.fromString(uuid)).getName()+" 1000",
+                                                                      plugin);
                     }
                     randomEventManger.the24(false);
                 }
diff --git a/src/main/java/me/lanzhi/bluestargame/listener/setNickListener.java b/src/main/java/me/lanzhi/bluestargame/listener/setNickListener.java
new file mode 100644
index 0000000..7561ec5
--- /dev/null
+++ b/src/main/java/me/lanzhi/bluestargame/listener/setNickListener.java
@@ -0,0 +1,62 @@
+package me.lanzhi.bluestargame.listener;
+
+import me.lanzhi.bluestarapi.api.RGBColor;
+import me.lanzhi.bluestargame.BluestarGamePlugin;
+import net.milkbowl.vault.economy.EconomyResponse;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class setNickListener implements Listener
+{
+    private final List<Player>players;
+    private final BluestarGamePlugin plugin;
+    public setNickListener(@NotNull BluestarGamePlugin plugin)
+    {
+        this.plugin=plugin;
+        this.players=plugin.getBluestarGameManager().getSettingNickPlayer();
+    }
+    @EventHandler(priority=EventPriority.LOWEST)
+    public void onPlayerMessage(@NotNull AsyncPlayerChatEvent event)
+    {
+        if (players.remove(event.getPlayer()))
+        {
+            event.setCancelled(true);
+            if (!plugin.getEcon().has(event.getPlayer(),1000))
+            {
+                event.getPlayer().sendMessage(plugin.getErrorMessageHead()+"你的钱不足1000");
+                return;
+            }
+            if (plugin.getEcon().withdrawPlayer(event.getPlayer(),1000).type!=EconomyResponse.ResponseType.SUCCESS)
+            {
+                event.getPlayer().sendMessage(plugin.getErrorMessageHead()+"出现错误,请重试,或通知腐竹");
+                return;
+            }
+            String nick=RGBColor.setColor(event.getMessage());
+            if (nick.indexOf(' ')>=0)
+            {
+                event.getPlayer().sendMessage(plugin.getErrorMessageHead()+"错误!,名称中不能饱和空格");
+                return;
+            }
+            if (ChatColor.stripColor(nick).length()>10)
+            {
+                event.getPlayer().sendMessage(plugin.getErrorMessageHead()+"错误.昵称长度(去除颜色符号后)不应超过10");
+                return;
+            }
+            plugin.getChat().setPlayerPrefix(event.getPlayer(),nick);
+            event.getPlayer().sendMessage(plugin.getMessageHead()+"设置成功");
+        }
+    }
+    @EventHandler(priority=EventPriority.MONITOR)
+    public void onPlayerQuite(@NotNull PlayerQuitEvent event)
+    {
+        plugin.getBluestarGameManager().getSettingNickPlayer().remove(event.getPlayer());
+    }
+}
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java b/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java
index 0aed894..29ff4f9 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/BluestarGameManager.java
@@ -18,6 +18,7 @@
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Set;
 
 public final class BluestarGameManager implements BluestarGameManagerInterface
@@ -29,6 +30,7 @@ public final class BluestarGameManager implements BluestarGameManagerInterface
     private final RandomEventManger randomEventManger;
     private final SuperSpongeManager superSpongeManager;
     private final BukkitTask effectTask;
+    private final ArrayList<Player> settingNick;
 
     public BluestarGameManager(BluestarGamePlugin plugin)
     {
@@ -41,6 +43,11 @@ public BluestarGameManager(BluestarGamePlugin plugin)
         this.randomEventManger=new RandomEventManger(plugin);
         this.superSpongeManager=new SuperSpongeManager(plugin);
         this.effectTask=new Effect().runTaskTimer(plugin,0,95);
+        this.settingNick=new ArrayList<>();
+    }
+    public ArrayList<Player> getSettingNickPlayer()
+    {
+        return settingNick;
     }
 
     @Override
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java b/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java
index 838509a..4b266a5 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/RandomEventsChange.java
@@ -1,5 +1,6 @@
 package me.lanzhi.bluestargame.managers;
 
+import me.lanzhi.bluestarapi.api.Bluestar;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -31,7 +32,7 @@ public void run()
         }
         if (on==0)
         {
-            on=((int) (Math.random()*12)+1);
+            on=Bluestar.randomInt(12)+1;
             if (Bukkit.getServer().getOnlinePlayers().size()<=0&&on!=4)
             {
                 randomEventManger.randomEvents=new RandomEventsChange(plugin,on);
@@ -63,69 +64,19 @@ public synchronized void change(boolean b)
     {
         switch (on)
         {
-            case 1:
-            {
-                randomEventManger.randdamage(b);
-                return;
-            }
-            case 2:
-            {
-                randomEventManger.randchat(b);
-                return;
-            }
-            case 3:
-            {
-                randomEventManger.randsheep(b);
-                return;
-            }
-            case 4:
-            {
-                randomEventManger.the24(b);
-                return;
-            }
-            case 5:
-            {
-                randomEventManger.morediamond(b);
-                return;
-            }
-            case 6:
-            {
-                randomEventManger.morecoal(b);
-                return;
-            }
-            case 7:
-            {
-                randomEventManger.morecopper(b);
-                return;
-            }
-            case 8:
-            {
-                randomEventManger.moregold(b);
-                return;
-            }
-            case 9:
-            {
-                randomEventManger.moreemerald(b);
-                return;
-            }
-            case 10:
-            {
-                randomEventManger.morelapis(b);
-                return;
-            }
-            case 11:
-            {
-                randomEventManger.moreiron(b);
-                return;
-            }
-            case 12:
-            {
-                randomEventManger.respawn(b);
-                return;
-            }
-            default:{
-
-            }
+            case 1 -> randomEventManger.randdamage(b);
+            case 2 -> randomEventManger.randchat(b);
+            case 3 -> randomEventManger.randsheep(b);
+            case 4 -> randomEventManger.the24(b);
+            case 5 -> randomEventManger.morediamond(b);
+            case 6 -> randomEventManger.morecoal(b);
+            case 7 -> randomEventManger.morecopper(b);
+            case 8 -> randomEventManger.moregold(b);
+            case 9 -> randomEventManger.moreemerald(b);
+            case 10 -> randomEventManger.morelapis(b);
+            case 11 -> randomEventManger.moreiron(b);
+            case 12 -> randomEventManger.respawn(b);
+            default -> {}
         }
     }
 
diff --git a/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java b/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java
index 52e407a..f8485b2 100644
--- a/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java
+++ b/src/main/java/me/lanzhi/bluestargame/managers/SuperSpongeManager.java
@@ -2,7 +2,7 @@
 
 import de.tr7zw.nbtapi.NBTCompound;
 import de.tr7zw.nbtapi.NBTItem;
-import me.lanzhi.bluestarapi.Api.Bluestar;
+import me.lanzhi.bluestarapi.api.Bluestar;
 import me.lanzhi.bluestargame.BluestarGamePlugin;
 import me.lanzhi.bluestargame.Type.SuperSponge;
 import me.lanzhi.bluestargameapi.managers.SuperSpongeManagerInterface;
diff --git a/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java b/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java
index 417f4b5..ae4053d 100644
--- a/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java
+++ b/src/main/java/me/lanzhi/bluestargame/register/CommandRegister.java
@@ -22,5 +22,6 @@ public void registerCommands()
         plugin.getCommand("elevator").setExecutor(new ElevatorCommand(plugin));
         plugin.getCommand("xiaomobank").setExecutor(new XiaoMoBankCommand(plugin));
         plugin.getCommand("cmdbag").setExecutor(new CmdBagCommand());
+        plugin.getCommand("setnick").setExecutor(new setNickCommand(plugin));
     }
 }
diff --git a/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java b/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java
index a8eb487..8f60c38 100644
--- a/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java
+++ b/src/main/java/me/lanzhi/bluestargame/register/ListenersRegister.java
@@ -24,11 +24,14 @@ public void registerListeners()
         registerlistener(new HealthFixListener(plugin));
         registerlistener(new superSpongeListener(plugin));
         registerlistener(new opSwordListener(plugin));
+        registerlistener(new elevatorListener(plugin));
+        registerlistener(new setNickListener(plugin));
         registerlistener(new arrowListener());
         registerlistener(new breakBedrockListener());
-        registerlistener(new elevatorListener(plugin));
         registerlistener(new effectListener());
         registerlistener(new ChatColorListener());
+        registerlistener(new CompostListener());
+        registerlistener(new EasterEggListener());
 
         registerlistener(new moreMineralListener(plugin));
         registerlistener(new randChatColorListener(plugin));
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 0c6794e..3924283 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -5,6 +5,7 @@ api-version: 1.18
 website: https://github.com/lanzhi6/BluestarGame
 author: lanzhi
 commands:
+  test:
   bluestargame:
     aliases:
       - bsgame
@@ -42,6 +43,9 @@ commands:
   cmdbag:
     aliases:
       - commandbag
+  setnick:
+    aliases:
+      - nick
 permissions:
   bluestargame.*:
     description: 所有权限