fix: fix can report a player twice bug

fix: fix flash bug

Author: Wzp-2008

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.19
 yarn_mappings=1.19+build.4
 loader_version=0.14.8
 # Mod Properties
-mod_version=0.1.3+1.19
+mod_version=0.1.4+1.19
 maven_group=org.mmga
 archives_base_name=controlgem
 # Dependencies

src/main/java/org/mmga/controlgem/commands/ReportCommand.java

@@ -15,10 +15,7 @@
 import org.mmga.controlgem.events.ServerWorldTickEvent;
 import org.mmga.controlgem.threads.PlayerJobThread;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created On 2022/7/12 23:51
@@ -27,8 +24,9 @@
  * @version 1.0.0
  */
 public class ReportCommand implements Command<ServerCommandSource> {
-    Map<ServerPlayerEntity, Integer> playerCount = new HashMap<>();
-    Map<ServerCommandSource, ArrayList<ServerPlayerEntity>> playersReport = new HashMap<>();
+    public static final Map<ServerPlayerEntity, Integer> playerCount = new HashMap<>();
+    public static final Map<UUID, ArrayList<ServerPlayerEntity>> playersReport = new HashMap<>();
+
     @Override
     public int run(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
         ServerPlayerEntity target = EntityArgumentType.getPlayer(context, "target");
@@ -40,13 +38,14 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
         }
         int count = playerCount.getOrDefault(target, 0) + 1;
         playerCount.put(target, count);
-        ArrayList<ServerPlayerEntity> list = playersReport.getOrDefault(source, new ArrayList<>());
+        UUID sender = source.getChatMessageSender().uuid();
+        ArrayList<ServerPlayerEntity> list = playersReport.getOrDefault(sender, new ArrayList<>());
         if (list.contains(target)) {
             source.sendFeedback(Text.translatable("tip.controlgem.report.already"), false);
             return 1;
         }
         list.add(target);
-        playersReport.put(source, list);
+        playersReport.put(sender, list);
         MinecraftServer server = target.getServer();
         assert server != null;
         PlayerManager playerManager = server.getPlayerManager();
@@ -58,7 +57,6 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
             for (ServerPlayerEntity player : playerManager.getPlayerList()) {
                 player.playSound(SoundEvents.BLOCK_ANVIL_LAND, SoundCategory.VOICE, 1.0f, 1.0f);
             }
-            playerCount.remove(target);
         }
         source.sendFeedback(Text.translatable("tip.controlgem.report.success", target.getName()), true);
         return 1;

src/main/java/org/mmga/controlgem/events/StartClientWorldTick.java

@@ -19,25 +19,31 @@
 @Environment(EnvType.CLIENT)
 public class StartClientWorldTick implements ClientTickEvents.StartWorldTick {
     public static List<ClientOnServerTick.Data> data = new ArrayList<>();
-    private final ArrayList<TaskWidget> tasks = new ArrayList<>();
+    private ArrayList<TaskWidget> tasks = new ArrayList<>();
 
     @Override
     public void onStartTick(ClientWorld world) {
-        for (TaskWidget task : tasks) {
-            CottonHud.remove(task);
-        }
-        tasks.clear();
         int i = data.size();
+        List<TaskWidget> tData = new ArrayList<>();
+        int size = tasks.size();
         for (int i1 = 0; i1 < i; i1++) {
             ClientOnServerTick.Data d = data.get(i1);
             String name = d.getName();
             String word = d.getWord();
             int fullTime = d.getFullTime();
             int time = d.getTime();
             TaskWidget taskWidget = new TaskWidget(name, word, fullTime, time);
-            tasks.add(taskWidget);
+            if (size > i1) {
+                CottonHud.remove(tasks.get(i1));
+            }
             CottonHud.add(taskWidget, 10, 10 + 15 * i1);
+            tData.add(taskWidget);
+        }
+        if (size > i) {
+            for (TaskWidget task : tasks) {
+                CottonHud.remove(task);
+            }
         }
-        data.clear();
+        tasks = new ArrayList<>(tData);
     }
 }

src/main/java/org/mmga/controlgem/threads/PlayerJobThread.java

@@ -15,12 +15,11 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
 import net.minecraft.world.GameMode;
+import org.mmga.controlgem.commands.ReportCommand;
 import org.mmga.controlgem.events.ServerWorldTickEvent;
 import org.mmga.controlgem.utils.TitleUtils;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * Created On 2022/7/13 23:43
@@ -135,6 +134,11 @@ public void run() {
             }
         }
         ServerWorldTickEvent.PLAYERS_JOBS.remove(this.getEntity());
+        ReportCommand.playerCount.put(entity, 0);
+        for (UUID uuid : ReportCommand.playersReport.keySet()) {
+            ArrayList<ServerPlayerEntity> serverPlayerEntities = ReportCommand.playersReport.get(uuid);
+            serverPlayerEntities.remove(entity);
+        }
     }
 
     public ServerPlayerEntity getEntity() {

src/main/resources/assets/controlgem/lang/en_us.json

@@ -20,5 +20,6 @@
   "tip.controlgem.success": "§1 %s §r was success!",
   "tip.controlgem.unknown": "This player is not controlled",
   "tip.controlgem.win": "Player §1 %s §r was win!",
-  "tip.controlgem.report.success": "Report success!"
+  "tip.controlgem.report.already": "You already report this player once!",
+  "tip.controlgem.report.success": "Report %s was succeeded!"
 }

src/main/resources/assets/controlgem/lang/zh_cn.json

@@ -20,5 +20,6 @@
   "tip.controlgem.success": "§1%s完成了任务",
   "tip.controlgem.unknown": "这个玩家没有被控制",
   "tip.controlgem.win": "玩家§1%s赢了！",
-  "tip.controlgem.report.success": "举报成功！"
+  "tip.controlgem.report.success": "成功举报玩家%s！",
+  "tip.controlgem.report.already": "你举报过这个玩家一次了！"
 }