增加一些反馈

Author: squi2rel

src/main/java/com/github/squi2rel/vp/DataHolder.java

@@ -9,6 +9,8 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -50,11 +52,13 @@ public static void update() {
                         ServerPacketHandler.sendTo(player, ServerPacketHandler.createScreen(area.screens));
                         ServerPacketHandler.sendTo(player, ServerPacketHandler.loadArea(area));
                         ServerPacketHandler.sendTo(player, ServerPacketHandler.updatePlaylist(area.screens));
+                        player.sendMessage(Text.literal("进入观影区 " + area.name).formatted(Formatting.DARK_AQUA));
                     }
                 } else {
                     if (area.removePlayer(player.getUuid())) {
                         ServerPacketHandler.sendTo(player, ServerPacketHandler.unloadArea(area));
                         ServerPacketHandler.sendTo(player, ServerPacketHandler.removeArea(area));
+                        player.sendMessage(Text.literal("离开观影区 " + area.name).formatted(Formatting.DARK_AQUA));
                     }
                 }
             }

src/main/java/com/github/squi2rel/vp/network/ServerPacketHandler.java

@@ -13,6 +13,7 @@
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 
 import java.util.HashMap;
 import java.util.List;
@@ -59,6 +60,7 @@ public static void handle(ServerPlayerEntity player, ByteBuf buf) {
                 DataHolder.lock();
                 DataHolder.areas.computeIfAbsent(area.dim, k -> new HashMap<>()).put(area.name, area);
                 DataHolder.unlock();
+                player.sendMessage(Text.literal("已成功在世界 " + player.getWorld().getRegistryKey().getValue() + " 创建名为 " + area.name + " 的观影区!").formatted(Formatting.GREEN));
             }
             case REMOVE_AREA -> {
                 // TODO check permission
@@ -72,6 +74,7 @@ public static void handle(ServerPlayerEntity player, ByteBuf buf) {
                     area.forEachPlayer(p -> sendTo(pm.getPlayer(p), data));
                 }
                 DataHolder.unlock();
+                player.sendMessage(Text.literal("已成功在世界 " + player.getWorld().getRegistryKey().getValue() + " 移除名为 " + area.name + " 的观影区!").formatted(Formatting.GREEN));
             }
             case CREATE_SCREEN -> {
                 // TODO check permission
@@ -87,17 +90,19 @@ public static void handle(ServerPlayerEntity player, ByteBuf buf) {
                     area.forEachPlayer(p -> sendTo(pm.getPlayer(p), data));
                 }
                 DataHolder.unlock();
+                player.sendMessage(Text.literal("已成功在观影区 " + area.name + " 创建名为 " + screen.name + " 的屏幕!").formatted(Formatting.GREEN));
             }
             case REMOVE_SCREEN -> {
                 // TODO check permission
                 VideoArea area = getArea(player, readName(buf));
                 if (area == null) return;
                 DataHolder.lock();
-                VideoScreen removed = area.removeScreen(readName(buf));
-                if (removed != null && area.hasPlayer()) {
-                    byte[] data = removeScreen(removed);
+                VideoScreen screen = area.removeScreen(readName(buf));
+                if (screen != null && area.hasPlayer()) {
+                    byte[] data = removeScreen(screen);
                     PlayerManager pm = Objects.requireNonNull(player.getServer()).getPlayerManager();
                     area.forEachPlayer(p -> sendTo(pm.getPlayer(p), data));
+                    player.sendMessage(Text.literal("已成功在观影区 " + area.name + " 移除名为 " + screen.name + " 的屏幕!").formatted(Formatting.GREEN));
                 }
                 DataHolder.unlock();
             }
@@ -113,6 +118,12 @@ public static void handle(ServerPlayerEntity player, ByteBuf buf) {
                     return;
                 }
                 screen.voteSkip(player.getUuid());
+                Text s = Text.literal("玩家 %s 已投票跳过 %s 上的视频 还需 %d 个玩家".formatted(
+                        player.getName(), screen.name, screen.skipped() == 0 ? 0 : (int) (area.players() * screen.skipPercent - screen.skipped() + 1)
+                ));
+                player.sendMessage(Text.literal("已投票跳过此视频").formatted(Formatting.GOLD));
+                PlayerManager pm = Objects.requireNonNull(player.getServer()).getPlayerManager();
+                area.forEachPlayer(p -> Objects.requireNonNull(pm.getPlayer(p)).sendMessage(s));
             }
             case SKIP_PERCENT -> {
                 // TODO check permission
@@ -121,6 +132,7 @@ public static void handle(ServerPlayerEntity player, ByteBuf buf) {
                 VideoScreen screen = area.getScreen(readName(buf));
                 if (screen == null) return;
                 screen.setSkipPercent(buf.readFloat());
+                player.sendMessage(Text.literal("屏幕 " + screen.name + " 的投票跳过比例已设置为 " + screen.skipPercent).formatted(Formatting.GREEN));
             }
             case IDLE_PLAY -> {
                 // TODO

src/main/java/com/github/squi2rel/vp/video/VideoScreen.java

@@ -79,6 +79,10 @@ public void initServer() {
         playNext();
     }
 
+    public int skipped() {
+        return skipped.size();
+    }
+
     public synchronized void addInfo(VideoInfo info) {
         LOGGER.info("added info: {} {} {}", info.playerName(), info.name(), info.path());
         lock();