From bcd6ed8a90ee203d76a80f8ff3dc80da8f3828fe Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 28 Dec 2020 18:02:04 +0100 Subject: [PATCH 1/2] Use TeamColor --- .../src/de/steamwar/fightsystem/Config.java | 10 ++++++---- .../src/de/steamwar/fightsystem/fight/Fight.java | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index 1469700..f599427 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -95,8 +95,8 @@ public class Config { //team parameter public static final String TeamRedName; public static final String TeamBlueName; - public static final String TeamRedPrefix; - public static final String TeamBluePrefix; + public static final String TeamRedColor; + public static final String TeamBlueColor; public static final String GameName; public static final String TeamChatDetection; public static final UUID BlueLeader; @@ -197,8 +197,6 @@ public class Config { ReplaceBedrock = config.getBoolean("Schematic.ReplaceBedrock"); ReplaceWithBlockupdates = config.getBoolean("Schematic.ReplaceWithBlockupdates"); - TeamRedPrefix = config.getString("Output.TeamRedPrefix"); - TeamBluePrefix = config.getString("Output.TeamBluePrefix"); GameName = config.getString("Output.GameName"); TeamChatDetection = config.getString("Output.TeamChatDetection"); @@ -361,6 +359,8 @@ public class Config { assert team2 != null; TeamBlueName = team1.getTeamKuerzel(); TeamRedName = team2.getTeamKuerzel(); + TeamBlueColor = team1.getTeamColor(); + TeamRedColor = team2.getTeamColor(); EventTeamBlueID = team1.getTeamId(); EventTeamRedID = team2.getTeamId(); BothTeamsPublic = EventTeamRedID == 0 && EventTeamBlueID == 0; @@ -378,6 +378,8 @@ public class Config { SpectateSystem = event.spectateSystem(); }else{ //No event + TeamRedColor = config.getString("Output.TeamRedPrefix"); + TeamBlueColor = config.getString("Output.TeamBluePrefix"); TeamRedName = config.getString("Output.TeamRedName"); TeamBlueName = config.getString("Output.TeamBlueName"); OnlyPublicSchematics = config.getBoolean("Schematic.OnlyPublicSchematics"); diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java index 10fd183..a720c85 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java @@ -41,8 +41,8 @@ import java.util.logging.Level; public class Fight { private Fight(){} - public static final FightTeam redTeam = new FightTeam(Config.TeamRedName, Config.TeamRedPrefix, Config.TeamRedSpawn, Config.TeamRedCornerX, Config.TeamRedCornerY, Config.TeamRedCornerZ, Config.TeamRedRotate, false, Config.RedLeader); - public static final FightTeam blueTeam = new FightTeam(Config.TeamBlueName, Config.TeamBluePrefix, Config.TeamBlueSpawn, Config.TeamBlueCornerX, Config.TeamBlueCornerY, Config.TeamBlueCornerZ, Config.TeamBlueRotate, true, Config.BlueLeader); + public static final FightTeam redTeam = new FightTeam(Config.TeamRedName, Config.TeamRedColor, Config.TeamRedSpawn, Config.TeamRedCornerX, Config.TeamRedCornerY, Config.TeamRedCornerZ, Config.TeamRedRotate, false, Config.RedLeader); + public static final FightTeam blueTeam = new FightTeam(Config.TeamBlueName, Config.TeamBlueColor, Config.TeamBlueSpawn, Config.TeamBlueCornerX, Config.TeamBlueCornerY, Config.TeamBlueCornerZ, Config.TeamBlueRotate, true, Config.BlueLeader); private static int schemRank; public static void init(){ From ef02f87cf1379ec19c7580a19b8c51e5f25469b3 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 28 Dec 2020 19:04:15 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Add=20=C2=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FightSystem_API/src/de/steamwar/fightsystem/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java index f599427..8c175c2 100644 --- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java @@ -359,8 +359,8 @@ public class Config { assert team2 != null; TeamBlueName = team1.getTeamKuerzel(); TeamRedName = team2.getTeamKuerzel(); - TeamBlueColor = team1.getTeamColor(); - TeamRedColor = team2.getTeamColor(); + TeamBlueColor = "§" + team1.getTeamColor(); + TeamRedColor = "§" + team2.getTeamColor(); EventTeamBlueID = team1.getTeamId(); EventTeamRedID = team2.getTeamId(); BothTeamsPublic = EventTeamRedID == 0 && EventTeamBlueID == 0;