Skip to content

Commit

Permalink
Some release (#1042)
Browse files Browse the repository at this point in the history
- add new sidebar layout for playing state but eliminated (new path will be created: sidebar.Default.playing.eliminated) by andrei1058
- fix message paths for money rewards [ #1021](#1021) by andrei1058
-[ Fixed tag apply for VersionSupport#setShopUpgradeIdentifier](https://github.com/andrei1058/BedWars1058/pull/976/files), will fix shop item tier lost issue on mc 1.12 by [ImYenil](https://github.com/ImYenil)
- [Fixed DespawnableProvider error in versions 1.20.3 & 1.20.4](#994) by [ImYenil](https://github.com/ImYenil)
- [Fix TNT setSource method error in versions 1.20.3 & 1.20.4](#1003) by [ImYenil](https://github.com/ImYenil)
- [Fix #1006 - Sidebar support for 1.16.5](#1010)
- [Fix NBTTag tag apply for 1.18.2, 1.17.1, 1.12.2 and 1.8.8](#969) by [KKiiya](https://github.com/KKiiya)
-[ Fix null pointer error while trying to apply NBT tags to AIR](#967) by [ImYenil](https://github.com/ImYenil)
- [Add spigot 1.20.3 support](#943) by andrei1058
- [Fix bStats metric tracking](5f1c526) by andrei1058
- [ fix default blast protection from fireballs on 1.8.8](#937) by Owner
[andrei1058](https://github.com/andrei1058)
- [fix bStats resource ID](f6bfd88) by andrei1058
  • Loading branch information
andrei1058 authored Sep 5, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
wistefan Stefan Wiedemann
1 parent 89129b2 commit b88998d
Showing 23 changed files with 964 additions and 36 deletions.
Original file line number Diff line number Diff line change
@@ -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";
34 changes: 23 additions & 11 deletions bedwars-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -257,66 +257,78 @@
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-base</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_8_R3</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_12_R1</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_16_R1</artifactId>
<version>23.12</version>
<artifactId>sidebar-v1_16_R3</artifactId>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_17_R1</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_18_R2</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_19_R2</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_19_R3</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R1</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R2</artifactId>
<version>23.12</version>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R3</artifactId>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R4</artifactId>
<version>24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-v1_20_R4</artifactId>
<version>23.12</version>
<scope>compile</scope>
</dependency>
Original file line number Diff line number Diff line change
@@ -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}",
Original file line number Diff line number Diff line change
@@ -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}",
Loading

0 comments on commit b88998d

Please sign in to comment.