diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java index 17c8679d0..7138dc839 100644 --- a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java +++ b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/language/Messages.java @@ -314,6 +314,8 @@ public class Messages { public static String SCOREBOARD_DEFAULT_STARTING_SPEC = "sidebar.Default.starting.spectator"; public static String SCOREBOARD_DEFAULT_PLAYING = "sidebar.Default.playing.alive"; public static String SCOREBOARD_DEFAULT_PLAYING_SPEC = "sidebar.Default.playing.spectator"; + public static String SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED = "sidebar.Default.playing.eliminated"; + public static String SCOREBOARD_DEFAULT_RESTARTING_SPEC = "sidebar.Default.restarting.spectator"; public static String SCOREBOARD_DEFAULT_RESTARTING_WIN1 = "sidebar.Default.restarting.winner-alive"; public static String SCOREBOARD_DEFAULT_RESTARTING_WIN2 = "sidebar.Default.restarting.winner-eliminated"; @@ -386,8 +388,8 @@ public class Messages { public static String XP_REWARD_FINAL_KILL = "xp-reward-final-kill"; public static String MONEY_REWARD_WIN = "money-reward-game-win"; - public static String MONEY_REWARD_PER_MINUTE = "money-reward-per-teammate"; - public static String MONEY_REWARD_PER_TEAMMATE = "money-reward-per-minute"; + public static String MONEY_REWARD_PER_MINUTE = "money-reward-per-minute"; + public static String MONEY_REWARD_PER_TEAMMATE = "money-reward-per-teammate"; public static String MONEY_REWARD_BED_DESTROYED = "money-reward-bed-destroyed"; public static String MONEY_REWARD_FINAL_KILL = "money-reward-final-kill"; public static String MONEY_REWARD_REGULAR_KILL = "money-reward-regular-kill"; diff --git a/bedwars-plugin/pom.xml b/bedwars-plugin/pom.xml index 287ea5493..a6fc8af58 100644 --- a/bedwars-plugin/pom.xml +++ b/bedwars-plugin/pom.xml @@ -257,66 +257,78 @@ com.andrei1058.spigot.sidebar sidebar-base - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_8_R3 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_12_R1 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar - sidebar-v1_16_R1 - 23.12 + sidebar-v1_16_R3 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_17_R1 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_18_R2 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_19_R2 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_19_R3 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_20_R1 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_20_R2 - 23.12 + 24.2 compile com.andrei1058.spigot.sidebar sidebar-v1_20_R3 + 24.2 + compile + + + com.andrei1058.spigot.sidebar + sidebar-v1_20_R4 + 24.2 + compile + + + com.andrei1058.spigot.sidebar + sidebar-v1_20_R4 23.12 compile diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Bangla.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Bangla.java index 33fdd4a17..4911abf7c 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Bangla.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Bangla.java @@ -441,6 +441,25 @@ public Bangla() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -552,6 +571,23 @@ public Bangla() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -571,6 +607,20 @@ public Bangla() { "&e{serverIp}") ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -606,6 +656,20 @@ public Bangla() { "&e{serverIp}") ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/English.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/English.java index 2cdcbc76a..69781b8b2 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/English.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/English.java @@ -442,6 +442,26 @@ public English() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -554,6 +574,23 @@ public English() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -578,6 +615,24 @@ public English() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -618,6 +673,20 @@ public English() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Hindi.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Hindi.java index 08daf4bb7..0c981bffb 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Hindi.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Hindi.java @@ -441,6 +441,25 @@ public Hindi() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -552,6 +571,23 @@ public Hindi() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -576,6 +612,24 @@ public Hindi() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -616,6 +670,20 @@ public Hindi() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&e&lBED WARS", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&e&lBED WARS", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Indonesia.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Indonesia.java index 4e44c86cf..76cc820de 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Indonesia.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Indonesia.java @@ -437,6 +437,25 @@ public Indonesia() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -548,6 +567,23 @@ public Indonesia() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -572,6 +608,24 @@ public Indonesia() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -612,6 +666,20 @@ public Indonesia() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Italian.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Italian.java index 9d9cc0ddb..dc839a5e8 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Italian.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Italian.java @@ -412,6 +412,25 @@ public Italian() { "", "&e{serverIp}") ); + yml.addDefault(SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Guardando {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -523,6 +542,23 @@ public Italian() { "", "&e{serverIp}") ); + yml.addDefault(SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Guardando {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -547,6 +583,24 @@ public Italian() { ); yml.addDefault(SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Guardando {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Guardando {spectatorTarget}", @@ -587,6 +641,20 @@ public Italian() { ); yml.addDefault(SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Guardando {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Guardando {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Persian.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Persian.java index 660ad0a1d..ea1f71ac0 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Persian.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Persian.java @@ -440,6 +440,25 @@ public Persian() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -551,6 +570,23 @@ public Persian() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} dar &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -575,6 +611,24 @@ public Persian() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} dar &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -619,6 +673,24 @@ public Persian() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} dar &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Polish.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Polish.java index 818434441..35e8e7022 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Polish.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Polish.java @@ -405,6 +405,25 @@ public Polish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -516,6 +535,23 @@ public Polish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -540,6 +576,24 @@ public Polish() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -580,6 +634,20 @@ public Polish() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Portuguese.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Portuguese.java index ba5ff5daf..7ccc601d4 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Portuguese.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Portuguese.java @@ -437,6 +437,25 @@ public Portuguese() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} em &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -548,6 +567,23 @@ public Portuguese() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -572,6 +608,24 @@ public Portuguese() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -612,6 +666,20 @@ public Portuguese() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java index 6d8677ae3..f1b6a1986 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Romanian.java @@ -428,6 +428,25 @@ public Romanian() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -539,6 +558,23 @@ public Romanian() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -563,6 +599,24 @@ public Romanian() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -607,6 +661,24 @@ public Romanian() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Russian.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Russian.java index 0a375a7c7..5c2138843 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Russian.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Russian.java @@ -216,6 +216,25 @@ public Russian() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -327,6 +346,23 @@ public Russian() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&e&lBED WARS", @@ -351,6 +387,24 @@ public Russian() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&e&lBED WARS", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&e&lBED WARS", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -391,6 +445,20 @@ public Russian() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/SimplifiedChinese.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/SimplifiedChinese.java index 4489826dc..7e79b7ae7 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/SimplifiedChinese.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/SimplifiedChinese.java @@ -419,6 +419,25 @@ public SimplifiedChinese() { "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&e&l起床战争", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} - &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC, Arrays.asList( "&e&l起床战争", "&7{date}", @@ -549,6 +568,23 @@ public SimplifiedChinese() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&e&l起床战争", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} - &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&e&l起床战争", @@ -573,6 +609,24 @@ public SimplifiedChinese() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&e&l起床战争", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} - &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&e&l起床战争", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -613,6 +667,20 @@ public SimplifiedChinese() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&e&l起床战争", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} - &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&e&l起床战争", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Spanish.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Spanish.java index 20b4a2753..7867491a0 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Spanish.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Spanish.java @@ -217,6 +217,25 @@ public Spanish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -328,6 +347,23 @@ public Spanish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -352,6 +388,24 @@ public Spanish() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", @@ -374,6 +428,20 @@ public Spanish() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&f{nextEvent} in &a{time}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Turkish.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Turkish.java index 9a38acec7..62f001f7b 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Turkish.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/language/Turkish.java @@ -440,6 +440,25 @@ public Turkish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED, Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&a{time} sonra &f{nextEvent}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_RESTARTING_SPEC, Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", @@ -551,6 +570,23 @@ public Turkish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "Doubles"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&a{time} sonra &f{nextEvent}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "3v3v3v3"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -595,6 +631,24 @@ public Turkish() { "", "&e{serverIp}") ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "3v3v3v3"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&a{time} sonra &f{nextEvent}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", @@ -615,6 +669,20 @@ public Turkish() { ); yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC.replaceFirst("Default", "4v4v4v4"), Arrays.asList( + "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", + "&7{date}", + "&o&7Spectating {spectatorTarget}", + "&a{time} sonra &f{nextEvent}", + "", + "{team}", + "{team}", + "{team}", + "{team}", + "", + "", + "&e{serverIp}") + ); + yml.addDefault(Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED.replaceFirst("Default", "4v4v4v4"), Arrays.asList( "&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&lBED WARS,&f&l{poweredBy},&f&l{poweredBy},&f&l{poweredBy},&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&lBED WARS,&e&l{poweredBy},&e&l{poweredBy},&e&l{poweredBy}", "&7{date}", "&o&7Spectating {spectatorTarget}", diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/SidebarService.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/SidebarService.java index cf8bfd71b..af663a3f3 100644 --- a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/SidebarService.java +++ b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/sidebar/SidebarService.java @@ -169,7 +169,12 @@ public void giveSidebar(@NotNull Player player, @Nullable IArena arena, boolean } } else if (arena.getStatus() == GameState.playing) { if (arena.isSpectator(player)) { - lines = getScoreboard(player, "sidebar." + arena.getGroup() + ".playing.spectator", Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC); + ITeam holderExTeam = arena.getExTeam(player.getUniqueId()); + if (null == holderExTeam) { + lines = getScoreboard(player, "sidebar." + arena.getGroup() + ".playing.spectator", Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC); + } else { + lines = getScoreboard(player, "sidebar." + arena.getGroup() + ".playing.eliminated", Messages.SCOREBOARD_DEFAULT_PLAYING_SPEC_ELIMINATED); + } } else { lines = getScoreboard(player, "sidebar." + arena.getGroup() + ".playing.alive", Messages.SCOREBOARD_DEFAULT_PLAYING); } diff --git a/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java b/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java index 86bec8d55..16a952ff7 100644 --- a/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java +++ b/versionsupport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java @@ -74,6 +74,9 @@ public v1_12_R1(Plugin plugin, String name) { @Override public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) { net.minecraft.server.v1_12_R1.ItemStack i = CraftItemStack.asNMSCopy(itemStack); + if (i == null) { + return null; + } NBTTagCompound tag = i.getTag(); return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null; } @@ -377,10 +380,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta NBTTagCompound tag = itemStack.getTag(); if (tag == null) { tag = new NBTTagCompound(); - itemStack.setTag(tag); } tag.setString("BedWars1058", data); + itemStack.setTag(tag); return CraftItemStack.asBukkitCopy(itemStack); } @@ -390,10 +393,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack i, S NBTTagCompound tag = itemStack.getTag(); if (tag == null) { tag = new NBTTagCompound(); - itemStack.setTag(tag); } tag.setString(key, value); + itemStack.setTag(tag); return CraftItemStack.asBukkitCopy(itemStack); } @@ -545,9 +548,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent NBTTagCompound tag = i.getTag(); if (tag == null) { tag = new NBTTagCompound(); - i.setTag(tag); } - tag.setString("tierIdentifier", identifier); + + tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier); + i.setTag(tag); return CraftItemStack.asBukkitCopy(i); } diff --git a/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java b/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java index f0fd47f77..38fee7c37 100644 --- a/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java +++ b/versionsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java @@ -418,10 +418,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta NBTTagCompound tag = itemStack.getTag(); if (tag == null) { tag = new NBTTagCompound(); - itemStack.setTag(tag); } tag.setString("BedWars1058", data); + itemStack.setTag(tag); return CraftItemStack.asBukkitCopy(itemStack); } @@ -431,16 +431,19 @@ public ItemStack setTag(ItemStack itemStack, String key, String value) { NBTTagCompound tag = is.getTag(); if (tag == null) { tag = new NBTTagCompound(); - is.setTag(tag); } tag.setString(key, value); + is.setTag(tag); return CraftItemStack.asBukkitCopy(is); } @Override public String getTag(ItemStack itemStack, String key) { net.minecraft.server.v1_8_R3.ItemStack i = CraftItemStack.asNMSCopy(itemStack); + if (i == null) { + return null; + } NBTTagCompound tag = i.getTag(); return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null; } @@ -599,9 +602,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent NBTTagCompound tag = i.getTag(); if (tag == null) { tag = new NBTTagCompound(); - i.setTag(tag); } - tag.setString("tierIdentifier", identifier); + + tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier); + i.setTag(tag); return CraftItemStack.asBukkitCopy(i); } diff --git a/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java b/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java index cbf392e89..4ac05dfc5 100644 --- a/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java +++ b/versionsupport_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java @@ -90,6 +90,9 @@ public void registerCommand(String name, Command clasa) { @Override public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) { net.minecraft.server.v1_16_R3.ItemStack i = CraftItemStack.asNMSCopy(itemStack); + if (i == null) { + return null; + } NBTTagCompound tag = i.getTag(); return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null; } @@ -381,10 +384,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta NBTTagCompound tag = itemStack.getTag(); if (tag == null) { tag = new NBTTagCompound(); - itemStack.setTag(tag); } tag.setString("BedWars1058", data); + itemStack.setTag(tag); return CraftItemStack.asBukkitCopy(itemStack); } @@ -394,10 +397,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item NBTTagCompound tag = is.getTag(); if (tag == null) { tag = new NBTTagCompound(); - is.setTag(tag); } tag.setString(key, value); + is.setTag(tag); return CraftItemStack.asBukkitCopy(is); } @@ -530,9 +533,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent NBTTagCompound tag = i.getTag(); if (tag == null) { tag = new NBTTagCompound(); - i.setTag(tag); } - tag.setString("tierIdentifier", identifier); + + tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier); + i.setTag(tag); return CraftItemStack.asBukkitCopy(i); } diff --git a/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java b/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java index a50197c58..df665e4f7 100644 --- a/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java +++ b/versionsupport_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java @@ -116,6 +116,9 @@ public void registerCommand(String name, Command clasa) { @Override public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) { ItemStack i = CraftItemStack.asNMSCopy(itemStack); + if (i == null) { + return null; + } NBTTagCompound tag = i.getTag(); return tag == null ? null : tag.hasKey(key) ? tag.getString(key) : null; } @@ -411,10 +414,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta NBTTagCompound tag = itemStack.getTag(); if (tag == null) { tag = new NBTTagCompound(); - itemStack.setTag(tag); } tag.setString("BedWars1058", data); + itemStack.setTag(tag); return CraftItemStack.asBukkitCopy(itemStack); } @@ -424,10 +427,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item NBTTagCompound tag = is.getTag(); if (tag == null) { tag = new NBTTagCompound(); - is.setTag(tag); } tag.setString(key, value); + is.setTag(tag); return CraftItemStack.asBukkitCopy(is); } @@ -560,9 +563,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent NBTTagCompound tag = i.getTag(); if (tag == null) { tag = new NBTTagCompound(); - i.setTag(tag); } - tag.setString("tierIdentifier", identifier); + + tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier); + i.setTag(tag); return CraftItemStack.asBukkitCopy(i); } diff --git a/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java b/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java index b0b29c190..44e1e1512 100644 --- a/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java +++ b/versionsupport_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java @@ -106,6 +106,9 @@ public void registerCommand(String name, Command clasa) { @Override public String getTag(org.bukkit.inventory.ItemStack itemStack, String key) { ItemStack i = CraftItemStack.asNMSCopy(itemStack); + if (i == null) { + return null; + } NBTTagCompound tag = i.t(); return tag == null ? null : tag.e(key) ? tag.l(key) : null; } @@ -391,10 +394,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta NBTTagCompound tag = itemStack.t(); if (tag == null) { tag = new NBTTagCompound(); - itemStack.c(tag); } tag.a("BedWars1058", data); + itemStack.c(tag); return CraftItemStack.asBukkitCopy(itemStack); } @@ -404,10 +407,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item NBTTagCompound tag = is.t(); if (tag == null) { tag = new NBTTagCompound(); - is.c(tag); } tag.a(key, value); + is.c(tag); return CraftItemStack.asBukkitCopy(is); } @@ -540,9 +543,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent NBTTagCompound tag = i.t(); if (tag == null) { tag = new NBTTagCompound(); - i.c(tag); } - tag.a("tierIdentifier", identifier); + + tag.a(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier); + i.c(tag); return CraftItemStack.asBukkitCopy(i); } diff --git a/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableProvider.java b/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableProvider.java index 5195fd4ab..124b2a5a7 100644 --- a/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableProvider.java +++ b/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/despawnable/DespawnableProvider.java @@ -66,6 +66,6 @@ protected void applyDefaultSettings(org.bukkit.entity.@NotNull LivingEntity bukk var entity = ((EntityInsentient)((CraftEntity)bukkitEntity).getHandle()); Objects.requireNonNull(entity.a(GenericAttributes.a)).a(attr.health()); Objects.requireNonNull(entity.a(GenericAttributes.d)).a(attr.speed()); - Objects.requireNonNull(entity.a(GenericAttributes.f)).a(attr.damage()); + Objects.requireNonNull(entity.a(GenericAttributes.c)).a(attr.damage()); } } diff --git a/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/v1_20_R3.java b/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/v1_20_R3.java index d769de4e5..d0e282f83 100644 --- a/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/v1_20_R3.java +++ b/versionsupport_v1_20_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_20_R3/v1_20_R3.java @@ -163,7 +163,7 @@ public void setSource(TNTPrimed tnt, Player owner) { EntityLiving nmsEntityLiving = (((CraftLivingEntity) owner).getHandle()); EntityTNTPrimed nmsTNT = (((CraftTNTPrimed) tnt).getHandle()); try { - Field sourceField = EntityTNTPrimed.class.getDeclaredField("d"); + Field sourceField = EntityTNTPrimed.class.getDeclaredField("g"); sourceField.setAccessible(true); sourceField.set(nmsTNT, nmsEntityLiving); } catch (Exception ex) {