Team Status

Kamesuta · Nov 7, 2020 · 7b27134 · 7b27134
1 parent 3115a5a
commit 7b27134
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 28 deletions.
diff --git a/src/main/java/net/teamfruit/sushida/listener/ManageCommandListener.java b/src/main/java/net/teamfruit/sushida/listener/ManageCommandListener.java
@@ -553,7 +553,7 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
                                 if (e.mode.equals(currentMode))
                                     return new ComponentBuilder(new TextComponent(new ComponentBuilder(
                                             new TextComponent(
-                                                    new ComponentBuilder("[✓]").color(ChatColor.GREEN).bold(true)
+                                                    new ComponentBuilder("[✔]").color(ChatColor.GREEN).bold(true)
                                                             .append(e.mode.title()).color(ChatColor.YELLOW).bold(false)
                                                             .create()
                                             ))

diff --git a/src/main/java/net/teamfruit/sushida/mode/TimeLimitMode.java b/src/main/java/net/teamfruit/sushida/mode/TimeLimitMode.java
@@ -43,7 +43,7 @@ public boolean isGameOver(StateContainer state) {
     @Override
     public String getScoreBelowName(StateContainer state) {
         return String.format(
-                "%,d円 (" + ChatColor.GREEN + "✓%d "
+                "%,d円 (" + ChatColor.GREEN + "✔%d "
                         + ChatColor.RED + "✗%d" + ChatColor.WHITE + ")",
                 getDynamicScore(state),
                 state.clearCount,

diff --git a/src/main/java/net/teamfruit/sushida/player/Group.java b/src/main/java/net/teamfruit/sushida/player/Group.java
@@ -17,7 +17,6 @@
 
 import javax.annotation.Nullable;
 import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
 
 public class Group {
     public PlayerData owner;
@@ -30,7 +29,11 @@ public class Group {
     private ImmutableList<Map.Entry<String, String>> wordRequiredList;
 
     private Scoreboard groupScoreboard;
-    private Team groupTeam;
+    private Team groupTeamTitle;
+
+    private Team groupTeamCountdownWait;
+    private Team groupTeamPlay;
+    private Team groupTeamResultWait;
     private Objective scoreLeaderboard;
     private Objective tabLeaderboard;
 
@@ -66,8 +69,20 @@ public boolean hasRanking() {
         return ranking != null;
     }
 
-    public Team getGroupTeam() {
-        return groupTeam;
+    public Team getGroupTeamTitle() {
+        return groupTeamTitle;
+    }
+
+    public Team getGroupTeamCountdownWait() {
+        return groupTeamCountdownWait;
+    }
+
+    public Team getGroupTeamPlay() {
+        return groupTeamPlay;
+    }
+
+    public Team getGroupTeamResultWait() {
+        return groupTeamResultWait;
     }
 
     public Scoreboard getGroupScoreboard() {
@@ -144,26 +159,34 @@ public ImmutableList<Map.Entry<String, String>> getWordList() {
         return wordRequiredList;
     }
 
+    private Team initTeam(String name, String prefix) {
+        Team team = groupScoreboard.getTeam(name);
+        if (team != null)
+            team.unregister();
+        team = groupScoreboard.registerNewTeam(name);
+        team.setPrefix(prefix);
+        team.setColor(ChatColor.AQUA);
+        return team;
+    }
+
+    private Objective initObjective(String name, String title, DisplaySlot slot) {
+        Objective objective = groupScoreboard.getObjective("score");
+        if (objective != null)
+            objective.unregister();
+        objective = groupScoreboard.registerNewObjective("score", "dummy", "スコア");
+        objective.setDisplaySlot(DisplaySlot.SIDEBAR);
+        return objective;
+    }
+
     public void init() {
         wordRequiredList = getMode().getWords(this);
 
-        groupTeam = groupScoreboard.getTeam("sushida");
-        if (this.groupTeam != null)
-            this.groupTeam.unregister();
-        this.groupTeam = groupScoreboard.registerNewTeam("sushida");
-        this.groupTeam.setPrefix(ChatColor.RED + "[␣]" + ChatColor.RESET);
-        this.groupTeam.setColor(ChatColor.WHITE);
-
-        this.scoreLeaderboard = groupScoreboard.getObjective("score");
-        if (this.scoreLeaderboard != null)
-            this.scoreLeaderboard.unregister();
-        this.scoreLeaderboard = groupScoreboard.registerNewObjective("score", "dummy", "スコア");
-        this.scoreLeaderboard.setDisplaySlot(DisplaySlot.SIDEBAR);
-
-        this.tabLeaderboard = groupScoreboard.getObjective("tab");
-        if (this.tabLeaderboard != null)
-            this.tabLeaderboard.unregister();
-        this.tabLeaderboard = groupScoreboard.registerNewObjective("tab", "dummy", "スコア");
-        this.tabLeaderboard.setDisplaySlot(DisplaySlot.PLAYER_LIST);
+        groupTeamTitle = initTeam("sushida.title", ChatColor.BLUE + "[␣]" + ChatColor.RESET);
+        groupTeamCountdownWait = initTeam("sushida.wait", ChatColor.GOLD + "[⏸]" + ChatColor.RESET);
+        groupTeamPlay = initTeam("sushida.play", ChatColor.RED + "[▶]" + ChatColor.RESET);
+        groupTeamResultWait = initTeam("sushida.goal", ChatColor.GREEN + "[✔]" + ChatColor.RESET);
+
+        this.scoreLeaderboard = initObjective("score", "スコア", DisplaySlot.SIDEBAR);
+        this.tabLeaderboard = initObjective("tab", "スコア", DisplaySlot.PLAYER_LIST);
     }
 }
diff --git a/src/main/java/net/teamfruit/sushida/player/PlayerData.java b/src/main/java/net/teamfruit/sushida/player/PlayerData.java
@@ -8,9 +8,9 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scoreboard.Scoreboard;
 
 import java.util.ArrayList;
+import java.util.Optional;
 
 public class PlayerData {
     public Player player;
@@ -69,9 +69,8 @@ public boolean leave() {
         return b;
     }
 
-    public void joinScoreboard(Group group) {
+    public void joinScoreboard() {
         player.setScoreboard(group.getGroupScoreboard());
-        group.getGroupTeam().addEntry(player.getName());
     }
 
     public void leaveScoreboard() {
@@ -105,7 +104,7 @@ public void run() {
             }
         }.runTaskLaterAsynchronously(Sushida.plugin, 40);
 
-        joinScoreboard(this.group);
+        joinScoreboard();
         Sushida.belowName.spawn(this);
     }
 
@@ -115,6 +114,9 @@ public void destroy() {
         session.apply(StateContainer.supply(NoneState::new));
         session = null;
 
+        // チームをリセット
+        Optional.ofNullable(group.getGroupScoreboard().getEntryTeam(player.getName())).ifPresent(e -> e.removeEntry(player.getName()));
+
         if (this.group.getMembers().isEmpty())
             leaveScoreboard();
         Sushida.belowName.despawn(this);

diff --git a/src/main/java/net/teamfruit/sushida/player/state/CountdownWaitState.java b/src/main/java/net/teamfruit/sushida/player/state/CountdownWaitState.java
@@ -13,6 +13,9 @@ public class CountdownWaitState implements IState {
     public IState onEnter(StateContainer state) {
         Player player = state.data.player;
 
+        // チーム
+        state.data.getGroup().getGroupTeamCountdownWait().addEntry(player.getName());
+
         // シングルプレイのときは飛ばす
         if (state.data.getGroup().getMembers().isEmpty())
             return new CountdownState();

diff --git a/src/main/java/net/teamfruit/sushida/player/state/PlayState.java b/src/main/java/net/teamfruit/sushida/player/state/PlayState.java
@@ -22,6 +22,11 @@ public class PlayState implements IState {
 
     @Override
     public IState onEnter(StateContainer state) {
+        Player player = state.data.player;
+
+        // チーム
+        state.data.getGroup().getGroupTeamPlay().addEntry(player.getName());
+
         if (progressBar == null)
             progressBar = Bukkit.getBossBar(state.progressKey);
         if (progressBar == null)

diff --git a/src/main/java/net/teamfruit/sushida/player/state/ResultWaitState.java b/src/main/java/net/teamfruit/sushida/player/state/ResultWaitState.java
@@ -13,6 +13,9 @@ public class ResultWaitState implements IState {
     public IState onEnter(StateContainer state) {
         Player player = state.data.player;
 
+        // チーム
+        state.data.getGroup().getGroupTeamResultWait().addEntry(player.getName());
+
         state.timer.pause();
         state.realTimer.pause();
         state.sushiTimer.pause();

diff --git a/src/main/java/net/teamfruit/sushida/player/state/TitleState.java b/src/main/java/net/teamfruit/sushida/player/state/TitleState.java
@@ -19,6 +19,9 @@ public class TitleState implements IState {
     public IState onEnter(StateContainer state) {
         Player player = state.data.player;
 
+        // チーム
+        state.data.getGroup().getGroupTeamTitle().addEntry(player.getName());
+
         IntStream.range(0, 9).forEachOrdered(e -> player.sendMessage(""));
 
         TitleUtils.showTitle(player);