mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-18 00:25:39 +01:00
c1d14dc076
*still waiting for leaf to port datafixer to 1.18 so i can do entity serialization
70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 1 Oct 2021 08:04:43 -0700
|
|
Subject: [PATCH] Add missing team sidebar display slots
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/scoreboard/DisplaySlot.java b/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
|
|
index 5d58a18b3625fd01ea34969200edc3bc80cbb587..fe7d0a19f970ac5b4e0c4bef4ff7c4ceae60bb86 100644
|
|
--- a/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
|
|
+++ b/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
|
|
@@ -1,10 +1,55 @@
|
|
package org.bukkit.scoreboard;
|
|
|
|
+import net.kyori.adventure.text.format.NamedTextColor; // Paper
|
|
/**
|
|
* Locations for displaying objectives to the player
|
|
*/
|
|
public enum DisplaySlot {
|
|
- BELOW_NAME,
|
|
- PLAYER_LIST,
|
|
- SIDEBAR;
|
|
+ // Paper start
|
|
+ BELOW_NAME("belowName"),
|
|
+ PLAYER_LIST("list"),
|
|
+ SIDEBAR("sidebar"),
|
|
+ SIDEBAR_TEAM_BLACK(NamedTextColor.BLACK),
|
|
+ SIDEBAR_TEAM_DARK_BLUE(NamedTextColor.DARK_BLUE),
|
|
+ SIDEBAR_TEAM_DARK_GREEN(NamedTextColor.DARK_GREEN),
|
|
+ SIDEBAR_TEAM_DARK_AQUA(NamedTextColor.DARK_AQUA),
|
|
+ SIDEBAR_TEAM_DARK_RED(NamedTextColor.DARK_RED),
|
|
+ SIDEBAR_TEAM_DARK_PURPLE(NamedTextColor.DARK_PURPLE),
|
|
+ SIDEBAR_TEAM_GOLD(NamedTextColor.GOLD),
|
|
+ SIDEBAR_TEAM_GRAY(NamedTextColor.GRAY),
|
|
+ SIDEBAR_TEAM_DARK_GRAY(NamedTextColor.DARK_GRAY),
|
|
+ SIDEBAR_TEAM_BLUE(NamedTextColor.BLUE),
|
|
+ SIDEBAR_TEAM_GREEN(NamedTextColor.GREEN),
|
|
+ SIDEBAR_TEAM_AQUA(NamedTextColor.AQUA),
|
|
+ SIDEBAR_TEAM_RED(NamedTextColor.RED),
|
|
+ SIDEBAR_TEAM_LIGHT_PURPLE(NamedTextColor.LIGHT_PURPLE),
|
|
+ SIDEBAR_TEAM_YELLOW(NamedTextColor.YELLOW),
|
|
+ SIDEBAR_TEAM_WHITE(NamedTextColor.WHITE);
|
|
+
|
|
+ public static final net.kyori.adventure.util.Index<String, DisplaySlot> NAMES = net.kyori.adventure.util.Index.create(DisplaySlot.class, DisplaySlot::getId);
|
|
+
|
|
+ private final String id;
|
|
+
|
|
+ DisplaySlot(@org.jetbrains.annotations.NotNull String id) {
|
|
+ this.id = id;
|
|
+ }
|
|
+
|
|
+ DisplaySlot(@org.jetbrains.annotations.NotNull NamedTextColor color) {
|
|
+ this.id = "sidebar.team." + color;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the string id of this display slot.
|
|
+ *
|
|
+ * @return the string id
|
|
+ */
|
|
+ public @org.jetbrains.annotations.NotNull String getId() {
|
|
+ return id;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String toString() {
|
|
+ return this.id;
|
|
+ }
|
|
+ // Paper end
|
|
}
|