Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Make TNTLeague Event System Capable

Browse Source
This commit is contained in:
Chaoscaot
2025-02-01 22:00:36 +01:00
parent 3d153d49b5
commit 482282f913
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
+2 -5
View File
@@ -72,12 +72,9 @@ public class Message {
pattern += fromRB(resourceBundle, message); pattern += fromRB(resourceBundle, message);
for (int i = 0; i < params.length; i++) { for (int i = 0; i < params.length; i++) {
if (params[i] instanceof SubMessage.Translatable) { if (params[i] instanceof SubMessage) {
SubMessage.Translatable smsg = (SubMessage.Translatable) params[i]; SubMessage smsg = (SubMessage) params[i];
params[i] = parse(smsg.getMessage(), sender, smsg.getParams()); params[i] = parse(smsg.getMessage(), sender, smsg.getParams());
} else if (params[i] instanceof SubMessage.Literal) {
SubMessage.Literal smsg = (SubMessage.Literal) params[i];
params[i] = smsg.getMessage();
} }
} }
SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
+8 -21
View File
@@ -19,33 +19,20 @@
package de.steamwar.message; package de.steamwar.message;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@Getter @Getter
@AllArgsConstructor public class SubMessage {
public abstract class SubMessage {
private final String message; private final String message;
private final Object[] params;
@Getter public SubMessage(String message, Object... params) {
public static class Translatable extends SubMessage { this.message = message;
private final Object[] params; this.params = params;
public Translatable(String message, Object... params) {
super(message);
this.params = params;
}
public Translatable(String message) {
super(message);
this.params = new Object[0];
}
} }
@Getter public SubMessage(String message) {
public static class Literal extends SubMessage { this.message = message;
public Literal(String message) { this.params = new Object[0];
super(message);
}
} }
} }
TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
+1
View File
@@ -18,6 +18,7 @@
# #
PREFIX=§eTNT§7League§8» PREFIX=§eTNT§7League§8»
PLAIN_STRING={0}
JOIN=§e{0} §7joined the game! JOIN=§e{0} §7joined the game!
JOIN_TEAM={0} §7joined the {1} §7team! JOIN_TEAM={0} §7joined the {1} §7team!
QUIT={0} §7left the game! QUIT={0} §7left the game!
TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
+4 -4
View File
@@ -60,11 +60,11 @@ data class TNTLeagueConfig(
eventTeamBlue = Team.get(eventFight.teamBlue) eventTeamBlue = Team.get(eventFight.teamBlue)
eventTeamRed = Team.get(eventFight.teamRed) eventTeamRed = Team.get(eventFight.teamRed)
blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage.Literal("§${eventTeamBlue.teamColor}${eventTeamBlue.teamName}"), eventTeamBlue.teamColor[0]) blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage("PLAIN_STRING", "§${eventTeamBlue.teamColor}${eventTeamBlue.teamName}"), eventTeamBlue.teamColor[0])
redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage.Literal("§${eventTeamRed.teamColor}${eventTeamRed.teamName}"), eventTeamRed.teamColor[0]) redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage("PLAIN_STRING", "§${eventTeamRed.teamColor}${eventTeamRed.teamName}"), eventTeamRed.teamColor[0])
} else { } else {
blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage.Translatable("BLUE"), '3') blueTeam = TeamConfig(TNTLeagueWorldConfig.blueTeam, SubMessage("BLUE"), '3')
redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage.Translatable("RED"), 'c') redTeam = TeamConfig(TNTLeagueWorldConfig.redTeam, SubMessage("RED"), 'c')
} }
} }