Command sources now have a getName() method

gradle.properties

@@ -10,6 +10,6 @@ loader_version=0.14.19-babric.3-bta
 halplibe_version=3.1.4
 
 # Mod
-mod_version=1.2.9
+mod_version=1.2.10
 mod_group=net.pedroricardo
 mod_name=commander

src/main/java/net/pedroricardo/commander/content/CommanderClientCommandSource.java

@@ -129,6 +129,11 @@ public void movePlayerToDimension(EntityPlayer player, int dimension) {
  }
  }
 
+ @Override
+ public String getName() {
+ return this.mc.thePlayer.username;
+ }
+
  @Override
  public @Deprecated CommandHandler getCommandHandler() {
  return this.mc.commandHandler;

src/main/java/net/pedroricardo/commander/content/CommanderCommandSource.java

@@ -52,6 +52,8 @@ default void sendTranslatableMessage(EntityPlayer player, String message, Object
 
  void movePlayerToDimension(EntityPlayer player, int dimension);
 
+ String getName();
+
  @Deprecated CommandHandler getCommandHandler();
 
  @Deprecated CommandSender getCommandSender();

src/main/java/net/pedroricardo/commander/content/CommanderConsoleCommandSource.java

@@ -97,6 +97,11 @@ public void movePlayerToDimension(EntityPlayer player, int dimension) {
  else throw new IllegalStateException("Player is not an instance of EntityPlayerMP");
  }
 
+ @Override
+ public String getName() {
+ return "Server";
+ }
+
  @Override
  public @Deprecated CommandHandler getCommandHandler() {
  return this.server.serverCommandHandler;

src/main/java/net/pedroricardo/commander/content/CommanderServerCommandSource.java

@@ -99,6 +99,11 @@ public void movePlayerToDimension(EntityPlayer player, int dimension) {
  else throw new IllegalStateException("Player is not an instance of EntityPlayerMP");
  }
 
+ @Override
+ public String getName() {
+ return this.player.username;
+ }
+
  @Override
  public @Deprecated CommandHandler getCommandHandler() {
  return this.server.serverCommandHandler;

src/main/java/net/pedroricardo/commander/content/commands/MessageCommand.java

@@ -28,7 +28,7 @@ public static void register(CommandDispatcher<CommanderCommandSource> dispatcher
  EntitySelector entitySelector = c.getArgument("targets", EntitySelector.class);
  String message = c.getArgument("message", String.class);
 
- String senderName = source.getSender() == null ? "Server" : CommanderHelper.getEntityName(source.getSender());
+ String senderName = source.getName();
 
  List<? extends Entity> players = entitySelector.get(source);
 

src/main/java/net/pedroricardo/commander/content/commands/server/MeCommand.java

@@ -21,7 +21,7 @@ public static void register(CommandDispatcher<CommanderCommandSource> dispatcher
  String message = StringArgumentType.getString(c, "message");
  boolean asterisk = BoolArgumentType.getBool(c, "asterisk");
  if (!(source instanceof IServerCommandSource)) throw CommanderExceptions.multiplayerWorldOnly().create();
- String senderName = source.getSender() == null ? "Server" : CommanderHelper.getEntityName(source.getSender());
+ String senderName = source.getName();
  ((IServerCommandSource) source).getServer().playerList.sendEncryptedChatToAllPlayers((asterisk ? "* " : "") + senderName + message);
  return Command.SINGLE_SUCCESS;
  })))
@@ -30,7 +30,7 @@ public static void register(CommandDispatcher<CommanderCommandSource> dispatcher
  CommanderCommandSource source = c.getSource();
  String message = StringArgumentType.getString(c, "message");
  if (!(source instanceof IServerCommandSource)) throw CommanderExceptions.multiplayerWorldOnly().create();
- String senderName = source.getSender() == null ? "Server" : CommanderHelper.getEntityName(source.getSender());
+ String senderName = source.getName();
  ((IServerCommandSource) source).getServer().playerList.sendEncryptedChatToAllPlayers(senderName + message);
  return Command.SINGLE_SUCCESS;
  })));

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
  "schemaVersion": 1,
  "id": "commander",
- "version": "1.2.9",
+ "version": "1.2.10",
 
  "name": "Commander",
  "description": "This mod overhauls the command system.",