From 160677ff824171c7e18d087d82707bdc0cb68c7d Mon Sep 17 00:00:00 2001 From: grng <36968271+grngxd@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:32:25 +0100 Subject: [PATCH] restyled team chat (buggy do not use) --- db.ps1 | 2 ++ docker-compose.yml | 8 ++++++++ pom.xml | 2 +- src/main/java/rip/iwakura/civilcore/PlayerHandler.java | 6 +++--- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 db.ps1 create mode 100644 docker-compose.yml diff --git a/db.ps1 b/db.ps1 new file mode 100644 index 0000000..01fddb1 --- /dev/null +++ b/db.ps1 @@ -0,0 +1,2 @@ +docker-compose up +docker ps \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5765784 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3' +services: + civil_test_db: + environment: + - POSTGRES_PASSWORD=TEST123 + image: postgres:16.3 + ports: + - 5432:5432 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1447579..ca26969 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ rip.iwakura CivilCore - 0.1a + 0.1b diff --git a/src/main/java/rip/iwakura/civilcore/PlayerHandler.java b/src/main/java/rip/iwakura/civilcore/PlayerHandler.java index f3e37bc..e2eebb2 100644 --- a/src/main/java/rip/iwakura/civilcore/PlayerHandler.java +++ b/src/main/java/rip/iwakura/civilcore/PlayerHandler.java @@ -30,11 +30,11 @@ public class PlayerHandler implements Listener { boolean inTeamChat = civilCore.teamChatRegister.contains(p); DbPlayer dbPlayer = civilCore.db.getPlayerByName(player_name); - String prefix = (inTeamChat ? ChatColor.DARK_BLUE + "TC " + ChatColor.RESET : "") + String prefix = (inTeamChat ? ChatColor.DARK_GREEN + "TEAM >" + ChatColor.RESET : "") + (dbPlayer.team.prefix == null ? "" : - ChatColor.translateAlternateColorCodes('&', "[" + dbPlayer.team.prefix + "]") + " "); - String message = String.format("%s%s: %s", prefix, player_name, e.getMessage()); + ChatColor.translateAlternateColorCodes('&', inTeamChat ? "" : "[" + dbPlayer.team.prefix + "]")); + String message = String.format("%s %s: %s", prefix, player_name, e.getMessage()); if (!inTeamChat) { Bukkit.broadcastMessage(message);