Let's deprecate MESSAGE action

GlowingInk · Aug 20, 2023 · 725bafc · 725bafc
1 parent 60e4eaf
commit 725bafc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/reactions/src/main/java/fun/reactions/module/basics/actions/MessageAction.java b/reactions/src/main/java/fun/reactions/module/basics/actions/MessageAction.java
@@ -28,8 +28,6 @@
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.naming.Aliased;
 import fun.reactions.util.parameter.Parameters;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.jetbrains.annotations.NotNull;
@@ -39,6 +37,7 @@
 import java.util.Set;
 
 @Aliased.Names("MSG")
+@Deprecated
 public class MessageAction implements Action {
 
     @Override
@@ -61,26 +60,27 @@ private static void sendMessage(Environment env, Player player, Parameters param
         if (players.isEmpty()) return;
 
         String type = params.getString("type");
-        String message = params.getStringSafe("text", () -> hideSelectors(env, params.origin()));
-        if (message.isEmpty()) return;
+        String message = Msg.colorize(params.getStringSafe("text", () -> hideSelectors(env, params.origin())));
         String annoymentTime = params.getString("hide");
-        for (Player p : players) {
-            if (showMessage(env, p, message, annoymentTime)) {
+        for (Player receiver : players) {
+            if (showMessage(env, receiver, message, annoymentTime)) {
                 switch (type.toLowerCase(Locale.ROOT)) {
-                    case "title" -> p.sendTitle(Msg.colorize(message),
-                            params.getString("subtitle", null),
+                    case "title" -> receiver.sendTitle(
+                            message,
+                            Msg.colorize(params.getString("subtitle", null)),
                             params.getInteger("fadein", 10),
                             params.getInteger("stay", 70),
                             params.getInteger("fadeout", 20)
                     );
-                    case "subtitle" -> p.sendTitle(null,
-                            Msg.colorize(params.getString("subtitle", null)),
+                    case "subtitle" -> receiver.sendTitle(
+                            null,
+                            message,
                             params.getInteger("fadein", 10),
                             params.getInteger("stay", 70),
                             params.getInteger("fadeout", 20)
                     );
-                    case "actionbar" -> p.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(Msg.colorize(message)));
-                    default -> p.sendMessage(Msg.colorize(message));
+                    case "actionbar" -> receiver.sendActionBar(message);
+                    default -> receiver.sendMessage(message);
                 }
             }
         }

diff --git a/reactions/src/main/java/fun/reactions/module/basics/actions/OpenMenuAction.java b/reactions/src/main/java/fun/reactions/module/basics/actions/OpenMenuAction.java
@@ -7,7 +7,7 @@
 import fun.reactions.util.parameter.Parameters;
 import org.jetbrains.annotations.NotNull;
 
-@Aliased.Names("MENU_ITEM")
+@Aliased.Names({"MENU_ITEM", "MENU"})
 public class OpenMenuAction implements Action {
 
     @Override