diff --git a/pom.xml b/pom.xml
index 3bf9c09..024cb81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
Votifier
- http://repo.howaner.de/
+ https://dl.bintray.com/nuvotifier/maven/
Minigames
@@ -167,8 +167,8 @@
com.vexsoftware
- votifier
- 1.9
+ nuvotifier-universal
+ 2.3.4
diff --git a/src/main/java/buttondevteam/chat/ChatProcessing.java b/src/main/java/buttondevteam/chat/ChatProcessing.java
index e725ed0..eafb412 100644
--- a/src/main/java/buttondevteam/chat/ChatProcessing.java
+++ b/src/main/java/buttondevteam/chat/ChatProcessing.java
@@ -197,6 +197,12 @@ public class ChatProcessing {
new TellrawPart((sender instanceof IDiscordSender ? "From Discord\n" : "")
+ "Copy message").setColor(Color.Blue)))
.setClickEvent(TellrawEvent.create(TellrawEvent.ClickAction.SUGGEST_COMMAND, message)));
+ if (PluginMain.permission.has(player, "tbmc.badge.diamond"))
+ json.addExtra(new TellrawPart("[P]").setColor(Color.Aqua).setBold(true)
+ .setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Diamond Patreon supporter")));
+ else if (PluginMain.permission.has(player, "tbmc.badge.gold"))
+ json.addExtra(new TellrawPart("[P]").setColor(Color.Gold).setBold(true)
+ .setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Gold Patreon supporter")));
json.addExtra(new TellrawPart(" <"));
TellrawPart hovertp = new TellrawPart("");
if (mp != null)
diff --git a/src/main/java/buttondevteam/chat/PluginMain.java b/src/main/java/buttondevteam/chat/PluginMain.java
index 7ea6e1f..cb9315c 100644
--- a/src/main/java/buttondevteam/chat/PluginMain.java
+++ b/src/main/java/buttondevteam/chat/PluginMain.java
@@ -109,8 +109,8 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
setTownColor(dtp, entry.getKey(), entry.getValue());
});
- if (!setupChat() || !setupEconomy() || !setupPermissions())
- getLogger().warning("Failed to set up chat or economy or permissions!");
+ if (!setupEconomy() || !setupPermissions())
+ TBMCCoreAPI.SendException("We're in trouble", new Exception("Failed to set up economy or permissions!"));
new Thread(this::FlairGetterThreadMethod).start();
new Thread(new AnnouncerThread()).start();
diff --git a/src/main/java/buttondevteam/chat/commands/WaitWhatCommand.java b/src/main/java/buttondevteam/chat/commands/WaitWhatCommand.java
deleted file mode 100644
index c8c8f9f..0000000
--- a/src/main/java/buttondevteam/chat/commands/WaitWhatCommand.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package buttondevteam.chat.commands;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.entity.Player;
-
-import buttondevteam.chat.ChatPlayer;
-import buttondevteam.chat.listener.PlayerListener;
-import buttondevteam.lib.chat.Channel;
-import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.chat.TBMCChatAPI;
-import buttondevteam.lib.chat.TBMCCommandBase;
-import buttondevteam.lib.player.TBMCPlayer;
-
-@CommandClass(modOnly = false)
-public class WaitWhatCommand extends TBMCCommandBase {
- @Override
- public boolean OnCommand(CommandSender sender, String alias, String[] args) {
- Channel channel;
- if (sender instanceof Player && ((Player) sender).isOnline())
- channel = TBMCPlayer.getPlayer(((Player) sender).getUniqueId(), ChatPlayer.class).CurrentChannel;
- else if (sender instanceof ConsoleCommandSender)
- channel = PlayerListener.ConsoleChannel;
- else
- channel = Channel.GlobalChat;
- final String message;
- if (args.length == 0)
- message = "wait what";
- else
- message = "wait " + Arrays.stream(args).collect(Collectors.joining(" ")) + " what";
- TBMCChatAPI.SendChatMessage(channel, sender, message);
- return true;
- }
-
- @Override
- public String[] GetHelpText(String alias) {
- return new String[] { //
- "§6--- Wait what ----", //
- "Wait what" //
- };
- }
-}
diff --git a/src/main/java/buttondevteam/chat/commands/appendtext/WaitWhatCommand.java b/src/main/java/buttondevteam/chat/commands/appendtext/WaitWhatCommand.java
new file mode 100644
index 0000000..08b7799
--- /dev/null
+++ b/src/main/java/buttondevteam/chat/commands/appendtext/WaitWhatCommand.java
@@ -0,0 +1,19 @@
+package buttondevteam.chat.commands.appendtext;
+
+import buttondevteam.lib.chat.CommandClass;
+
+@CommandClass(modOnly = false)
+public class WaitWhatCommand extends AppendTextCommandBase {
+ @Override
+ public String[] GetHelpText(String alias) {
+ return new String[] { //
+ "§6--- Wait what ----", //
+ "Wait what" //
+ };
+ }
+
+ @Override
+ public String GetAppendedText() {
+ return "wait what";
+ }
+}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2635b37..d429973 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -44,4 +44,10 @@ permissions:
tbmc.admin:
description: Gives access to /un- commands and /u admin commands
tbmc.rainbow:
- description: Gives access to rainbow colors (/u c).
\ No newline at end of file
+ description: Gives access to rainbow colors (/u c).
+ tbmc.badge.gold:
+ description: Gives a patron badge.
+ default: false
+ tbmc.badge.diamond:
+ description: Gives a cool patron badge.
+ default: false
\ No newline at end of file