From 39b69424e8cf4a165566ba7939a6fb04f58a6757 Mon Sep 17 00:00:00 2001 From: mlus <1319237806@qq.com> Date: Sun, 4 May 2025 18:40:39 +0800 Subject: [PATCH] so it is 2.0.0 release --- src/main/java/vip/fubuki/playersync/sync/ChatSync.java | 3 ++- src/main/java/vip/fubuki/playersync/sync/VanillaSync.java | 6 ++++-- .../vip/fubuki/playersync/util/PSThreadPoolFactory.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/vip/fubuki/playersync/sync/ChatSync.java b/src/main/java/vip/fubuki/playersync/sync/ChatSync.java index 087d241..3dd6e65 100644 --- a/src/main/java/vip/fubuki/playersync/sync/ChatSync.java +++ b/src/main/java/vip/fubuki/playersync/sync/ChatSync.java @@ -15,6 +15,7 @@ import java.net.Socket; import java.util.Objects; import java.util.Scanner; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -29,7 +30,7 @@ public class ChatSync { static ServerSocket serverSocket; static Socket clientSocket; - static Set SocketList; + static Set SocketList = ConcurrentHashMap.newKeySet(); static ExecutorService executorService = Executors.newCachedThreadPool(); public static void register(){ diff --git a/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java b/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java index fff93d7..a3ea524 100644 --- a/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java +++ b/src/main/java/vip/fubuki/playersync/sync/VanillaSync.java @@ -14,7 +14,6 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.storage.WorldData; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.OnDatapackSyncEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -35,7 +34,10 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.*; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/vip/fubuki/playersync/util/PSThreadPoolFactory.java b/src/main/java/vip/fubuki/playersync/util/PSThreadPoolFactory.java index 4f47205..7269daf 100644 --- a/src/main/java/vip/fubuki/playersync/util/PSThreadPoolFactory.java +++ b/src/main/java/vip/fubuki/playersync/util/PSThreadPoolFactory.java @@ -1,5 +1,6 @@ package vip.fubuki.playersync.util; +import javax.annotation.Nonnull; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; @@ -11,9 +12,8 @@ public class PSThreadPoolFactory implements ThreadFactory { public PSThreadPoolFactory(String Prefix) { threadNamePrefix = Prefix; } - @Override - public Thread newThread(Runnable runnable) { + public Thread newThread(@Nonnull Runnable runnable) { Thread thread = new Thread(runnable); thread.setName(threadNamePrefix + "-thread-" + threadIdx.getAndIncrement()); return thread;