From 322567e12ddfd868650d452a53ed3315f02f45ba Mon Sep 17 00:00:00 2001 From: JayAvery Date: Tue, 3 Dec 2019 15:02:37 +0000 Subject: [PATCH 1/2] Fix player colours in tab list --- resources/plugin.yml => plugin.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/plugin.yml => plugin.yml (100%) diff --git a/resources/plugin.yml b/plugin.yml similarity index 100% rename from resources/plugin.yml rename to plugin.yml From 8e8af718a6335d474bdd824b4286bb97f6f8fdfe Mon Sep 17 00:00:00 2001 From: JayAvery Date: Tue, 3 Dec 2019 15:03:00 +0000 Subject: [PATCH 2/2] Fix player colours in tab list --- .gitignore | 4 ++++ src/net/richardprojects/autismchat3/AutismChat3.java | 8 +++++--- src/net/richardprojects/autismchat3/Config.java | 9 +++------ src/net/richardprojects/autismchat3/Messages.java | 4 +--- src/net/richardprojects/autismchat3/PartyUtils.java | 6 ------ .../autismchat3/commands/YellowCommand.java | 3 +++ 6 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..84c246f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/bin/ +.classpath +.project +*.jar \ No newline at end of file diff --git a/src/net/richardprojects/autismchat3/AutismChat3.java b/src/net/richardprojects/autismchat3/AutismChat3.java index 5c9fdb7..003feea 100644 --- a/src/net/richardprojects/autismchat3/AutismChat3.java +++ b/src/net/richardprojects/autismchat3/AutismChat3.java @@ -37,6 +37,7 @@ import net.richardprojects.autismchat3.events.PDeathEvent; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @@ -84,13 +85,14 @@ public void onEnable() { manager = Bukkit.getScoreboardManager(); board = manager.getNewScoreboard(); yellowTeam = board.registerNewTeam("yellowTeam"); - yellowTeam.setPrefix(Utils.colorCodes(Messages.color_yellow)); + yellowTeam.setColor(ChatColor.YELLOW); blueTeam = board.registerNewTeam("blueTeam"); - blueTeam.setPrefix(Utils.colorCodes(Messages.color_blue)); + blueTeam.setColor(ChatColor.BLUE); redTeam = board.registerNewTeam("redTeam"); + redTeam.setColor(ChatColor.DARK_RED); redTeam.setPrefix(Utils.colorCodes(Messages.color_red)); greenTeam = board.registerNewTeam("greenTeam"); - greenTeam.setPrefix(Utils.colorCodes(Messages.color_green)); + greenTeam.setColor(ChatColor.DARK_GREEN); loadPlayerData(); loadPartyData(); diff --git a/src/net/richardprojects/autismchat3/Config.java b/src/net/richardprojects/autismchat3/Config.java index b32821d..06b0130 100644 --- a/src/net/richardprojects/autismchat3/Config.java +++ b/src/net/richardprojects/autismchat3/Config.java @@ -11,13 +11,10 @@ package net.richardprojects.autismchat3; import java.io.BufferedReader; -import java.io.PrintWriter; import java.io.InputStreamReader; - -import net.md_5.bungee.api.ChatColor; - +import java.io.PrintWriter; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.craftbukkit.libs.jline.internal.Log; +import net.md_5.bungee.api.ChatColor; public class Config { @@ -54,7 +51,7 @@ public static void setupConfig(AutismChat3 plugin) { config = new YamlConfiguration(); config.load(plugin.config); } catch (Exception e) { - Log.info(" There was an error setting up the config file..."); + AutismChat3.log.info(" There was an error setting up the config file..."); e.printStackTrace(); } } diff --git a/src/net/richardprojects/autismchat3/Messages.java b/src/net/richardprojects/autismchat3/Messages.java index 01782a5..ade47a2 100644 --- a/src/net/richardprojects/autismchat3/Messages.java +++ b/src/net/richardprojects/autismchat3/Messages.java @@ -15,9 +15,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; - import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.craftbukkit.libs.jline.internal.Log; public class Messages { public static String color_red; @@ -102,7 +100,7 @@ public static void setupMessages() { messagesConfig = new YamlConfiguration(); messagesConfig.load(AutismChat3.messages); } catch (Exception e) { - Log.info(" There was an error setting up the config file..."); + AutismChat3.log.info(" There was an error setting up the config file..."); e.printStackTrace(); } } diff --git a/src/net/richardprojects/autismchat3/PartyUtils.java b/src/net/richardprojects/autismchat3/PartyUtils.java index 44a64f3..bcf3e1b 100644 --- a/src/net/richardprojects/autismchat3/PartyUtils.java +++ b/src/net/richardprojects/autismchat3/PartyUtils.java @@ -14,19 +14,13 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - -import org.bukkit.craftbukkit.libs.jline.internal.Log; -import org.bukkit.entity.Player; -import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/net/richardprojects/autismchat3/commands/YellowCommand.java b/src/net/richardprojects/autismchat3/commands/YellowCommand.java index 629df0d..54aeac2 100644 --- a/src/net/richardprojects/autismchat3/commands/YellowCommand.java +++ b/src/net/richardprojects/autismchat3/commands/YellowCommand.java @@ -51,8 +51,10 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String msg = msg.replace("{yellow_list}", yellowList); player.sendMessage(msg); + System.out.println("in yellow command"); // update the player teams Team playerTeam = AutismChat3.board.getPlayerTeam(player); + System.out.println("current team is " + playerTeam); if(playerTeam != null) { String name = playerTeam.getName(); if(name.equals("greenTeam")) { @@ -68,6 +70,7 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String AutismChat3.yellowTeam.addPlayer(player); for(Player cPlayer : plugin.getServer().getOnlinePlayers()) { cPlayer.setScoreboard(AutismChat3.board); + System.out.println("updating scoreboard for " + cPlayer + " " + AutismChat3.board); } new SwitchYellowTask(player.getUniqueId()).runTaskAsynchronously(plugin);