remove bedrock tools

fakeplayer-api/pom.xml

@@ -30,12 +30,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.github.hello09x</groupId>
-            <artifactId>bedrock</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
 </project>

fakeplayer-core/pom.xml

@@ -38,12 +38,12 @@
 
         <dependency>
             <groupId>io.github.hello09x</groupId>
-            <artifactId>bedrock</artifactId>
+            <artifactId>devtools-core</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.github.hello09x</groupId>
-            <artifactId>devtools-core</artifactId>
+            <artifactId>devtools-command</artifactId>
         </dependency>
 
         <dependency>

fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/Main.java

@@ -3,27 +3,30 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.zaxxer.hikari.HikariConfig;
-import io.github.hello09x.bedrock.util.RegistrablePlugin;
 import io.github.hello09x.devtools.core.PluginEventModule;
 import io.github.hello09x.devtools.core.TranslationModule;
 import io.github.hello09x.devtools.core.transaction.TranslationConfig;
 import io.github.hello09x.devtools.core.transaction.TranslatorUtils;
+import io.github.hello09x.devtools.core.utils.Exceptions;
 import io.github.hello09x.devtools.core.utils.Lambdas;
 import io.github.hello09x.devtools.database.DatabaseModule;
 import io.github.hello09x.fakeplayer.core.command.CommandRegistry;
 import io.github.hello09x.fakeplayer.core.config.Config;
 import io.github.hello09x.fakeplayer.core.listener.FakeplayerListener;
 import io.github.hello09x.fakeplayer.core.listener.PlayerListener;
 import io.github.hello09x.fakeplayer.core.listener.ReplenishListener;
+import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager;
 import io.github.hello09x.fakeplayer.core.manager.WildFakeplayerManager;
+import io.github.hello09x.fakeplayer.core.repository.UsedIdRepository;
 import io.github.hello09x.fakeplayer.core.util.update.UpdateChecker;
 import lombok.Getter;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.concurrent.CompletableFuture;
 
-public final class Main extends RegistrablePlugin {
+public final class Main extends JavaPlugin {
 
     @Getter
     private static Main instance;
@@ -107,11 +110,16 @@ public void checkForUpdatesAsync() {
 
     @Override
     public void onDisable() {
-        super.onDisable();
         {
-            var messenger = getServer().getMessenger();
-            messenger.unregisterIncomingPluginChannel(this);
-            messenger.unregisterOutgoingPluginChannel(this);
+            Exceptions.suppress(this, () -> injector.getInstance(FakeplayerManager.class).onDisable());
+            Exceptions.suppress(this, () -> injector.getInstance(UsedIdRepository.class).onDisable());
+        }
+        {
+            Exceptions.suppress(this, () -> {
+                var messenger = getServer().getMessenger();
+                messenger.unregisterIncomingPluginChannel(this);
+                messenger.unregisterOutgoingPluginChannel(this);
+            });
         }
     }
 

fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/command/CommandSupports.java

@@ -23,8 +23,8 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import static io.github.hello09x.bedrock.command.Commands.command;
-import static io.github.hello09x.bedrock.command.Commands.int32;
+import static io.github.hello09x.devtools.command.exception.Commands.command;
+import static io.github.hello09x.devtools.command.exception.Commands.int32;
 import static net.kyori.adventure.text.Component.translatable;
 
 public abstract class CommandSupports {

fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/command/impl/ListCommand.java

@@ -2,7 +2,7 @@
 
 import com.google.inject.Singleton;
 import dev.jorel.commandapi.executors.CommandArguments;
-import io.github.hello09x.bedrock.page.Page;
+import io.github.hello09x.devtools.command.exception.Page;
 import io.github.hello09x.fakeplayer.core.command.Permission;
 import io.github.hello09x.fakeplayer.core.util.Mth;
 import org.apache.commons.lang3.StringUtils;

fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/manager/FakeplayerManager.java

@@ -2,9 +2,9 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import io.github.hello09x.bedrock.util.AddressUtils;
 import io.github.hello09x.devtools.core.message.MessageException;
 import io.github.hello09x.devtools.core.message.RuntimeMessageException;
+import io.github.hello09x.devtools.core.utils.Exceptions;
 import io.github.hello09x.fakeplayer.api.spi.Action;
 import io.github.hello09x.fakeplayer.api.spi.NMSBridge;
 import io.github.hello09x.fakeplayer.core.Main;
@@ -17,6 +17,7 @@
 import io.github.hello09x.fakeplayer.core.manager.naming.SequenceName;
 import io.github.hello09x.fakeplayer.core.manager.naming.exception.IllegalCustomNameException;
 import io.github.hello09x.fakeplayer.core.repository.UsedIdRepository;
+import io.github.hello09x.fakeplayer.core.util.AddressUtils;
 import io.github.hello09x.fakeplayer.core.util.Commands;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
@@ -36,6 +37,7 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
@@ -56,6 +58,7 @@ public class FakeplayerManager {
     private final UserConfigManager configManager;
     private final NMSBridge nms;
     private final Config config;
+    private final ScheduledExecutorService lagMonitor;
 
     @Inject
     public FakeplayerManager(Invsee invsee, UsedIdRepository usedIdRepository, NameManager nameManager, FakeplayerList playerList, UserConfigManager configManager, NMSBridge nms, Config config) {
@@ -67,8 +70,8 @@ public FakeplayerManager(Invsee invsee, UsedIdRepository usedIdRepository, NameM
         this.nms = nms;
         this.config = config;
 
-        var timer = Executors.newSingleThreadScheduledExecutor();
-        timer.scheduleWithFixedDelay(() -> {
+        this.lagMonitor = Executors.newSingleThreadScheduledExecutor();
+        this.lagMonitor.scheduleWithFixedDelay(() -> {
                                          if (Bukkit.getServer().getTPS()[1] < config.getKaleTps()) {
                                              Bukkit.getScheduler().runTask(Main.getInstance(), () -> {
                                                  if (this.removeAll("low tps") > 0) {
@@ -78,9 +81,6 @@ public FakeplayerManager(Invsee invsee, UsedIdRepository usedIdRepository, NameM
                                          }
                                      }, 0, 60, TimeUnit.SECONDS
         );
-
-        Main.getInstance().registerOnDisable(() -> this.removeAll("Plugin disabled"));
-        Main.getInstance().registerOnDisable(timer::shutdown);
     }
 
     /**
@@ -527,5 +527,9 @@ private void checkLimit(@NotNull CommandSender creator) throws MessageException
         }
     }
 
+    public void onDisable() {
+        Exceptions.suppress(Main.getInstance(), () -> this.removeAll("Plugin disabled"));
+        Exceptions.suppress(Main.getInstance(), this.lagMonitor::shutdownNow);
+    }
 
 }

fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/repository/UsedIdRepository.java

@@ -3,6 +3,7 @@
 import com.google.common.base.Throwables;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import io.github.hello09x.devtools.core.utils.Exceptions;
 import io.github.hello09x.fakeplayer.core.Main;
 import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +28,6 @@ public class UsedIdRepository {
     @Inject
     public UsedIdRepository() {
         this.load();
-        Main.getInstance().registerOnDisable(this::saveAll);
     }
 
     public boolean contains(@NotNull UUID uuid) {
@@ -85,5 +85,9 @@ public void saveAll() {
         }
     }
 
+    public void onDisable() {
+        Exceptions.suppress(Main.getInstance(), this::saveAll);
+    }
+
 
 }

fakeplayer-core/src/main/java/io/github/hello09x/fakeplayer/core/util/AddressUtils.java

@@ -0,0 +1,30 @@
+package io.github.hello09x.fakeplayer.core.util;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.InetSocketAddress;
+import java.util.Optional;
+
+/**
+ * @author tanyaofei
+ * @since 2024/7/29
+ **/
+public class AddressUtils {
+
+    /**
+     * 获取 IP 地址
+     * <p>如果不是玩家则返回 127.0.0.1, 如果该玩家已离线则返回 0.0.0.0 </p>
+     *
+     * @param sender 玩家
+     * @return IP 地址
+     */
+    public static @NotNull String getAddress(@NotNull CommandSender sender) {
+        if (sender instanceof Player p) {
+            return Optional.ofNullable(p.getAddress()).map(InetSocketAddress::getHostString).orElse("0.0.0.0");
+        } else {
+            return "127.0.0.1";
+        }
+    }
+}

pom.xml

@@ -68,13 +68,13 @@
 
             <dependency>
                 <groupId>io.github.hello09x</groupId>
-                <artifactId>bedrock</artifactId>
-                <version>0.0.1</version>
+                <artifactId>devtools-core</artifactId>
+                <version>0.1.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>io.github.hello09x</groupId>
-                <artifactId>devtools-core</artifactId>
+                <artifactId>devtools-command</artifactId>
                 <version>0.1.1-SNAPSHOT</version>
             </dependency>