Update MiniMessage usage

- The plugin now requires Java 11 instead of Java 16.
4drian3d · Sep 27, 2021 · b3f6fac · b3f6fac
1 parent 566ecee
commit b3f6fac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>16</java.version>
+        <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/src/main/java/net/dreamerzero/chatregulator/listener/ChatListener.java b/src/main/java/net/dreamerzero/chatregulator/listener/ChatListener.java
@@ -41,12 +41,12 @@ public void onChat(final PlayerChatEvent event) {
         if(floodMatch.find()) {
             event.setResult(ChatResult.denied());
             player.sendMessage(
-                MiniMessage.get().parse(
+                MiniMessage.miniMessage().parse(
                     Regulator.getConfig().getString("messages.flood-message"), TEMPLATES));
             server.getAllPlayers().stream().filter(
                 op -> op.hasPermission("regulator.notifications")).forEach(op -> {
                     op.sendMessage(
-                        MiniMessage.get().parse(
+                        MiniMessage.miniMessage().parse(
                             Regulator.getConfig().getString("messages.flood-detected"), TEMPLATES));
                 });
             if (Regulator.getConfig().getBoolean("debug")){
@@ -63,12 +63,12 @@ public void onChat(final PlayerChatEvent event) {
             if(match.find()) {
                 event.setResult(ChatResult.denied());
                 player.sendMessage(
-                    MiniMessage.get().parse(
+                    MiniMessage.miniMessage().parse(
                         Regulator.getConfig().getString("messages.blocked-message"), TEMPLATES));
                 server.getAllPlayers().stream().filter(
                     op -> op.hasPermission("regulator.notifications")).forEach(op -> {
                         op.sendMessage(
-                            MiniMessage.get().parse(
+                            MiniMessage.miniMessage().parse(
                                 Regulator.getConfig().getString("messages.infraction-detected"), TEMPLATES));
                     });
                 if (Regulator.getConfig().getBoolean("debug")){

diff --git a/src/main/java/net/dreamerzero/chatregulator/listener/CommandListener.java b/src/main/java/net/dreamerzero/chatregulator/listener/CommandListener.java
@@ -27,10 +27,13 @@ public CommandListener(final ProxyServer server, final Logger logger) {
 
     @Subscribe
     public void onCommand(CommandExecuteEvent event){
-        if (!(event.getCommandSource() instanceof Player player)) {
+        if (!(event.getCommandSource() instanceof Player)) {
             return;
         }
-        var command = event.getCommand();
+
+        Player player = (Player)event.getCommandSource();
+
+        String command = event.getCommand();
 
         List<String> commandsChecked = Regulator.getConfig().getStringList("commands-checked");
         boolean isCommand = false;
@@ -56,12 +59,12 @@ public void onCommand(CommandExecuteEvent event){
             if (match.find()) {
                 event.setResult(CommandResult.denied());
                 player.sendMessage(
-                    MiniMessage.get().parse(
+                    MiniMessage.miniMessage().parse(
                         Regulator.getConfig().getString("messages.blocked-message"), TEMPLATES));
                 server.getAllPlayers().stream().filter(
                     op -> op.hasPermission("regulator.notifications")).forEach(op -> {
                         op.sendMessage(
-                            MiniMessage.get().parse(
+                            MiniMessage.miniMessage().parse(
                                 Regulator.getConfig().getString("messages.infraction-detected"), TEMPLATES));
                     });
                 if (Regulator.getConfig().getBoolean("debug")){