Skip to content

Commit

Permalink
/say now works on servers
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro270707 committed Jan 20, 2024
1 parent 408c878 commit dc5b4cb
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<CommanderCommandSource> dispatcher) {
Expand All @@ -18,9 +15,8 @@ public static void register(CommandDispatcher<CommanderCommandSource> 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;
})));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down

0 comments on commit dc5b4cb

Please sign in to comment.