From 6e84fdad23b9f1585cfc6f12b0f2ae7bcd6893e0 Mon Sep 17 00:00:00 2001 From: Seth <13510767+ZeroEpoch1969@users.noreply.github.com> Date: Sun, 25 Oct 2020 09:27:56 -0700 Subject: [PATCH] Login messages Last commit from me. Don't have the power but to me Packs is the new Lead Developer --- .../command/Command_loginmessage.java | 2 +- .../totalfreedommod/rank/Displayable.java | 2 +- .../totalfreedom/totalfreedommod/rank/Rank.java | 8 ++++---- .../totalfreedommod/rank/RankManager.java | 4 ++-- .../totalfreedommod/rank/Title.java | 8 ++++---- src/main/resources/config.yml | 17 +++++++++++++++-- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java index c3e4987b..f83cf8b9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_loginmessage.java @@ -37,7 +37,7 @@ public class Command_loginmessage extends FreedomCommand msg("Your login message must contain your rank. Use either %rank% or %coloredrank% to specify where you want the rank", ChatColor.RED); return true; } - int length = message.replace("%name%", "").replace("%rank%", "").replace("%coloredrank%", "").replace("%det%", "").length(); + int length = message.replace("%name%", "").replace("%rank%", "").replace("%coloredrank%", "").replace("%art%", "").length(); if (length > 100) { msg("Your login message cannot be more than 100 characters (excluding your rank and your name)", ChatColor.RED); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java index db4ea54e..d63d4fa8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java @@ -5,7 +5,7 @@ import net.md_5.bungee.api.ChatColor; public interface Displayable { - public String getDeterminer(); + public String getArticle(); public String getName(); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java index cbedc2d4..ce6f4169 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java @@ -19,7 +19,7 @@ public enum Rank implements Displayable @Getter private final String abbr; @Getter - private final String determiner; + private final String article; @Getter private final String tag; @Getter @@ -33,12 +33,12 @@ public enum Rank implements Displayable @Getter private final boolean hasDefaultLoginMessage; - Rank(String determiner, String name, Type type, String abbr, ChatColor color, org.bukkit.ChatColor teamColor, Boolean hasTeam, Boolean hasDefaultLoginMessage) + Rank(String article, String name, Type type, String abbr, ChatColor color, org.bukkit.ChatColor teamColor, Boolean hasTeam, Boolean hasDefaultLoginMessage) { this.type = type; this.name = name; this.abbr = abbr; - this.determiner = determiner; + this.article = article; this.tag = abbr.isEmpty() ? "" : "[" + abbr + "]"; this.coloredTag = abbr.isEmpty() ? "" : ChatColor.DARK_GRAY + "[" + color + abbr + ChatColor.DARK_GRAY + "]" + color; this.color = color; @@ -56,7 +56,7 @@ public enum Rank implements Displayable @Override public String getColoredLoginMessage() { - return determiner + " " + color + name; + return article + " " + color + name; } @Override diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java index b099e187..8c013f5b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java @@ -271,7 +271,7 @@ public class RankManager extends FreedomService { if (display.hasDefaultLoginMessage()) { - message = "%name% is %det% %coloredrank%"; + message = "%name% is %art% %coloredrank%"; } } } @@ -281,7 +281,7 @@ public class RankManager extends FreedomService + FUtil.colorize(message).replace("%name%", player.getName()) .replace("%rank%", display.getName()) .replace("%coloredrank%", display.getColoredName()) - .replace("%det%", display.getDeterminer())); + .replace("%art%", display.getDeterminer())); return loginMessage; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java index 6f67e7e3..0af577f3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java @@ -13,7 +13,7 @@ public enum Title implements Displayable OWNER("the", "Owner", ChatColor.of("#ff0000"), org.bukkit.ChatColor.DARK_RED, "Owner", true, true); @Getter - private final String determiner; + private final String article; @Getter private final String name; @Getter @@ -30,9 +30,9 @@ public enum Title implements Displayable private final boolean hasTeam; private final boolean hasDefaultLoginMessage; - Title(String determiner, String name, ChatColor color, org.bukkit.ChatColor teamColor, String tag, Boolean hasTeam, Boolean hasDefaultLoginMessage) + Title(String article, String name, ChatColor color, org.bukkit.ChatColor teamColor, String tag, Boolean hasTeam, Boolean hasDefaultLoginMessage) { - this.determiner = determiner; + this.article = article; this.name = name; this.coloredTag = ChatColor.DARK_GRAY + "[" + color + tag + ChatColor.DARK_GRAY + "]" + color; this.abbr = tag; @@ -64,6 +64,6 @@ public enum Title implements Displayable @Override public String getColoredLoginMessage() { - return determiner + " " + color + name; + return article + " " + color + name; } } \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a633aa65..316cb770 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -148,8 +148,21 @@ shop: # Login messages. Use %name% for usernames, and %rank% for ranks/titles login_messages: - - '&b%name% is a terrible %coloredrank%' - - '&bthat %name% dude is a shitty %coloredrank%' + - '%name% is a terrible %coloredrank%' + - 'that %name% dude is a shitty %coloredrank%' + - 'Hi, my name is %name% and I'm %art% %coloredrank%&b that wasted coins on this login message.' + - '&aDo not fear, %coloredrank% &b%name% &ais here!' + - '%name% is %art% %coloredrank%&b, say hi to them before they gets banned for doing something stupid' + - 'Oh. It's &l%name%&r&b the %coloredrank%&b again. Great.' + - 'Make way for %name% the %coloredrank%&b!' + - 'It's a bird! It's a plane! No, it's %art% %rank%! It's %name%' + - '%rank% %name%' + - '%coloredrank%&b %name%' + - 'A wild %name%, %art% %coloredrank%&b, appeared!' + - 'All in all, the %rank% %name% is just another brick in the wall' + - '&a%name% &bis a a geeky &6%rank%' + - '%name% is the %rank% who just exists' + - '%name% based cringe poggers based based %rank%' # Item prices prices: