diff --git a/gradle.properties b/gradle.properties index 6de914a..9891147 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ loader_version=0.14.19-babric.3-bta halplibe_version=3.1.4 # Mod -mod_version=1.2.10 +mod_version=1.2.11 mod_group=net.pedroricardo mod_name=commander diff --git a/src/main/java/net/pedroricardo/commander/content/CommanderClientCommandSource.java b/src/main/java/net/pedroricardo/commander/content/CommanderClientCommandSource.java index 45706f4..8181c44 100644 --- a/src/main/java/net/pedroricardo/commander/content/CommanderClientCommandSource.java +++ b/src/main/java/net/pedroricardo/commander/content/CommanderClientCommandSource.java @@ -92,6 +92,11 @@ public void sendMessage(EntityPlayer player, String message) { } } + @Override + public void sendMessageToAllPlayers(String message) { + this.mc.thePlayer.addChatMessage(message); + } + @Override public World getWorld() { return this.mc.theWorld; diff --git a/src/main/java/net/pedroricardo/commander/content/CommanderCommandSource.java b/src/main/java/net/pedroricardo/commander/content/CommanderCommandSource.java index c084342..ac3fc64 100644 --- a/src/main/java/net/pedroricardo/commander/content/CommanderCommandSource.java +++ b/src/main/java/net/pedroricardo/commander/content/CommanderCommandSource.java @@ -46,6 +46,8 @@ default void sendTranslatableMessage(EntityPlayer player, String message, Object this.sendMessage(player, I18n.getInstance().translateKeyAndFormat(message, args)); } + void sendMessageToAllPlayers(String message); + World getWorld(); World getWorld(int dimension); diff --git a/src/main/java/net/pedroricardo/commander/content/CommanderConsoleCommandSource.java b/src/main/java/net/pedroricardo/commander/content/CommanderConsoleCommandSource.java index 96ead8a..7e54df4 100644 --- a/src/main/java/net/pedroricardo/commander/content/CommanderConsoleCommandSource.java +++ b/src/main/java/net/pedroricardo/commander/content/CommanderConsoleCommandSource.java @@ -81,6 +81,11 @@ public void sendMessage(EntityPlayer player, String message) { this.server.playerList.sendPacketToPlayer(player.username, new Packet3Chat(message, AES.keyChain.get(player.username))); } + @Override + public void sendMessageToAllPlayers(String message) { + this.getServer().playerList.sendPacketToAllPlayers(new Packet3Chat(message)); + } + @Override public World getWorld() { return this.server.getDimensionWorld(0); diff --git a/src/main/java/net/pedroricardo/commander/content/CommanderServerCommandSource.java b/src/main/java/net/pedroricardo/commander/content/CommanderServerCommandSource.java index 1d5c91a..07baa62 100644 --- a/src/main/java/net/pedroricardo/commander/content/CommanderServerCommandSource.java +++ b/src/main/java/net/pedroricardo/commander/content/CommanderServerCommandSource.java @@ -83,6 +83,11 @@ public void sendMessage(EntityPlayer player, String message) { this.server.playerList.sendPacketToPlayer(player.username, new Packet3Chat(message, AES.keyChain.get(player.username))); } + @Override + public void sendMessageToAllPlayers(String message) { + this.getServer().playerList.sendPacketToAllPlayers(new Packet3Chat(message)); + } + @Override public World getWorld() { return this.player == null ? this.server.getDimensionWorld(0) : this.player.world; diff --git a/src/main/java/net/pedroricardo/commander/content/commands/SayCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/SayCommand.java index 1250bfe..72f79c2 100644 --- a/src/main/java/net/pedroricardo/commander/content/commands/SayCommand.java +++ b/src/main/java/net/pedroricardo/commander/content/commands/SayCommand.java @@ -5,10 +5,7 @@ import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; -import net.minecraft.core.net.packet.Packet3Chat; import net.pedroricardo.commander.content.CommanderCommandSource; -import net.pedroricardo.commander.content.IServerCommandSource; -import net.pedroricardo.commander.content.exceptions.CommanderExceptions; public class SayCommand { public static void register(CommandDispatcher dispatcher) { @@ -18,9 +15,8 @@ public static void register(CommandDispatcher dispatcher .executes(c -> { CommanderCommandSource source = c.getSource(); String message = StringArgumentType.getString(c, "message"); - if (!(source instanceof IServerCommandSource)) throw CommanderExceptions.multiplayerWorldOnly().create(); String senderName = source.getName(); - ((IServerCommandSource) source).getServer().playerList.sendPacketToAllPlayers(new Packet3Chat("[" + senderName + "§r]" + message)); + source.sendMessageToAllPlayers("[" + senderName + "§r]" + message); return Command.SINGLE_SUCCESS; }))); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 66cc0c1..55b182b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "commander", - "version": "1.2.10", + "version": "1.2.11", "name": "Commander", "description": "This mod overhauls the command system.",