Merge pull request #84 from Johni0702/scoreboard-team-sidebar

Add sidebar scoreboard positions for each of the 16 teams
GeyserMC · Apr 5, 2015 · c4f2c7e · c4f2c7e
2 parents b9fec7d + df65043
commit c4f2c7e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java b/src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java
@@ -327,6 +327,22 @@ public class MagicValues {
 		register(ScoreboardPosition.PLAYER_LIST, 0);
 		register(ScoreboardPosition.SIDEBAR, 1);
 		register(ScoreboardPosition.BELOW_NAME, 2);
+		register(ScoreboardPosition.SIDEBAR_TEAM_BLACK, 3);
+		register(ScoreboardPosition.SIDEBAR_TEAM_DARK_BLUE, 4);
+		register(ScoreboardPosition.SIDEBAR_TEAM_DARK_GREEN, 5);
+		register(ScoreboardPosition.SIDEBAR_TEAM_DARK_AQUA, 6);
+		register(ScoreboardPosition.SIDEBAR_TEAM_DARK_RED, 7);
+		register(ScoreboardPosition.SIDEBAR_TEAM_DARK_PURPLE, 8);
+		register(ScoreboardPosition.SIDEBAR_TEAM_GOLD, 9);
+		register(ScoreboardPosition.SIDEBAR_TEAM_GRAY, 10);
+		register(ScoreboardPosition.SIDEBAR_TEAM_DARK_GRAY, 11);
+		register(ScoreboardPosition.SIDEBAR_TEAM_BLUE, 12);
+		register(ScoreboardPosition.SIDEBAR_TEAM_GREEN, 13);
+		register(ScoreboardPosition.SIDEBAR_TEAM_AQUA, 14);
+		register(ScoreboardPosition.SIDEBAR_TEAM_RED, 15);
+		register(ScoreboardPosition.SIDEBAR_TEAM_LIGHT_PURPLE, 16);
+		register(ScoreboardPosition.SIDEBAR_TEAM_YELLOW, 17);
+		register(ScoreboardPosition.SIDEBAR_TEAM_WHITE, 18);
 
 		register(ObjectiveAction.ADD, 0);
 		register(ObjectiveAction.REMOVE, 1);

diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/values/scoreboard/ScoreboardPosition.java b/src/main/java/org/spacehq/mc/protocol/data/game/values/scoreboard/ScoreboardPosition.java
@@ -4,6 +4,23 @@ public enum ScoreboardPosition {
 
 	PLAYER_LIST,
 	SIDEBAR,
-	BELOW_NAME;
+	BELOW_NAME,
+
+	SIDEBAR_TEAM_BLACK,
+	SIDEBAR_TEAM_DARK_BLUE,
+	SIDEBAR_TEAM_DARK_GREEN,
+	SIDEBAR_TEAM_DARK_AQUA,
+	SIDEBAR_TEAM_DARK_RED,
+	SIDEBAR_TEAM_DARK_PURPLE,
+	SIDEBAR_TEAM_GOLD,
+	SIDEBAR_TEAM_GRAY,
+	SIDEBAR_TEAM_DARK_GRAY,
+	SIDEBAR_TEAM_BLUE,
+	SIDEBAR_TEAM_GREEN,
+	SIDEBAR_TEAM_AQUA,
+	SIDEBAR_TEAM_RED,
+	SIDEBAR_TEAM_LIGHT_PURPLE,
+	SIDEBAR_TEAM_YELLOW,
+	SIDEBAR_TEAM_WHITE;
 
 }