From e9b422829374c24c49160085d88ebd8a2acf4d08 Mon Sep 17 00:00:00 2001 From: Pedro270707 Date: Mon, 25 Sep 2023 16:23:02 -0300 Subject: [PATCH] Removed redundant casts --- .../content/commands/AchievementCommand.java | 4 ++-- .../content/commands/MessageCommand.java | 4 ++-- .../content/commands/SetSpawnCommand.java | 2 +- .../content/commands/TeleportCommand.java | 8 +++---- .../content/commands/TimeCommand.java | 24 +++++++++---------- ...CommanderCommandNetServerHandlerMixin.java | 4 ++-- .../PreferCommanderCommandPlayerSPMixin.java | 3 +-- 7 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/pedroricardo/commander/content/commands/AchievementCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/AchievementCommand.java index 7fb5b2d..0988219 100644 --- a/src/main/java/net/pedroricardo/commander/content/commands/AchievementCommand.java +++ b/src/main/java/net/pedroricardo/commander/content/commands/AchievementCommand.java @@ -29,7 +29,7 @@ public static void register(CommandDispatcher dispatcher dispatcher.register((LiteralArgumentBuilder)(((LiteralArgumentBuilder)LiteralArgumentBuilder.literal("achievement")) .requires(source -> ((CommanderCommandSource)source).hasAdmin()) .then(((LiteralArgumentBuilder)LiteralArgumentBuilder.literal("grant")) - .then((RequiredArgumentBuilder)RequiredArgumentBuilder.argument("entities", EntityArgumentType.players()) + .then(RequiredArgumentBuilder.argument("entities", EntityArgumentType.players()) .then(RequiredArgumentBuilder.argument("achievement", AchievementArgumentType.achievement()) .executes(c -> { List entities = c.getArgument("entities", EntitySelector.class).get((CommanderCommandSource) c.getSource()); @@ -58,7 +58,7 @@ public static void register(CommandDispatcher dispatcher return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder)LiteralArgumentBuilder.literal("*") + .then(LiteralArgumentBuilder.literal("*") .executes(c -> { List entities = c.getArgument("entities", EntitySelector.class).get((CommanderCommandSource) c.getSource()); diff --git a/src/main/java/net/pedroricardo/commander/content/commands/MessageCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/MessageCommand.java index 250cc90..ff464eb 100644 --- a/src/main/java/net/pedroricardo/commander/content/commands/MessageCommand.java +++ b/src/main/java/net/pedroricardo/commander/content/commands/MessageCommand.java @@ -20,8 +20,8 @@ public class MessageCommand { public static void register(CommandDispatcher dispatcher) { CommandNode command = dispatcher.register((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("message") - .then((RequiredArgumentBuilder) RequiredArgumentBuilder.argument("targets", EntityArgumentType.players()) - .then((RequiredArgumentBuilder) RequiredArgumentBuilder.argument("message", StringArgumentType.greedyString()) + .then(RequiredArgumentBuilder.argument("targets", EntityArgumentType.players()) + .then(RequiredArgumentBuilder.argument("message", StringArgumentType.greedyString()) .executes(c -> { EntitySelector entitySelector = c.getArgument("targets", EntitySelector.class); String message = c.getArgument("message", String.class); diff --git a/src/main/java/net/pedroricardo/commander/content/commands/SetSpawnCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/SetSpawnCommand.java index 3ccd4fe..fbbbea8 100644 --- a/src/main/java/net/pedroricardo/commander/content/commands/SetSpawnCommand.java +++ b/src/main/java/net/pedroricardo/commander/content/commands/SetSpawnCommand.java @@ -15,7 +15,7 @@ public class SetSpawnCommand { public static void register(CommandDispatcher dispatcher) { CommandNode command = dispatcher.register((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("setworldspawn") .requires(source -> ((CommanderCommandSource)source).hasAdmin()) - .then((RequiredArgumentBuilder) RequiredArgumentBuilder.argument("position", IntegerCoordinatesArgumentType.intCoordinates()) + .then(RequiredArgumentBuilder.argument("position", IntegerCoordinatesArgumentType.intCoordinates()) .executes(c -> { IntegerCoordinates coordinates = c.getArgument("position", IntegerCoordinates.class); diff --git a/src/main/java/net/pedroricardo/commander/content/commands/TeleportCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/TeleportCommand.java index 18e273f..212fea0 100644 --- a/src/main/java/net/pedroricardo/commander/content/commands/TeleportCommand.java +++ b/src/main/java/net/pedroricardo/commander/content/commands/TeleportCommand.java @@ -22,7 +22,7 @@ public class TeleportCommand { public static void register(CommandDispatcher dispatcher) { CommandNode command = dispatcher.register((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("teleport") .requires(source -> ((CommanderCommandSource)source).hasAdmin()) - .then((RequiredArgumentBuilder)RequiredArgumentBuilder.argument("position", Vec3dArgumentType.vec3d()) + .then(RequiredArgumentBuilder.argument("position", Vec3dArgumentType.vec3d()) .executes(c -> { DoubleCoordinates targetCoordinates = c.getArgument("position", DoubleCoordinates.class); @@ -35,8 +35,8 @@ public static void register(CommandDispatcher dispatcher return Command.SINGLE_SUCCESS; })) - .then((RequiredArgumentBuilder)RequiredArgumentBuilder.argument("entity", EntityArgumentType.entities()) - .then((RequiredArgumentBuilder)RequiredArgumentBuilder.argument("position", Vec3dArgumentType.vec3d()) + .then(RequiredArgumentBuilder.argument("entity", EntityArgumentType.entities()) + .then(RequiredArgumentBuilder.argument("position", Vec3dArgumentType.vec3d()) .executes(c -> { EntitySelector entitySelector = c.getArgument("entity", EntitySelector.class); DoubleCoordinates targetCoordinates = c.getArgument("position", DoubleCoordinates.class); @@ -51,7 +51,7 @@ public static void register(CommandDispatcher dispatcher return Command.SINGLE_SUCCESS; })) - .then((RequiredArgumentBuilder)RequiredArgumentBuilder.argument("target", EntityArgumentType.entity()) + .then(RequiredArgumentBuilder.argument("target", EntityArgumentType.entity()) .executes(c -> { EntitySelector entitySelector = c.getArgument("entity", EntitySelector.class); EntitySelector targetEntitySelector = c.getArgument("target", EntitySelector.class); diff --git a/src/main/java/net/pedroricardo/commander/content/commands/TimeCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/TimeCommand.java index 19c5269..7aa357c 100644 --- a/src/main/java/net/pedroricardo/commander/content/commands/TimeCommand.java +++ b/src/main/java/net/pedroricardo/commander/content/commands/TimeCommand.java @@ -15,54 +15,54 @@ public class TimeCommand { public static void register(CommandDispatcher dispatcher) { dispatcher.register((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("time") .requires(source -> ((CommanderCommandSource)source).hasAdmin()) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("query") - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("daytime") + .then(LiteralArgumentBuilder.literal("query") + .then(LiteralArgumentBuilder.literal("daytime") .executes(c -> { ((CommanderCommandSource)c.getSource()).sendMessage(I18n.getInstance().translateKeyAndFormat("commands.commander.time.query", ((CommanderCommandSource)c.getSource()).getWorld().getWorldTime() % 24000L)); return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("gametime") + .then(LiteralArgumentBuilder.literal("gametime") .executes(c -> { ((CommanderCommandSource)c.getSource()).sendMessage(I18n.getInstance().translateKeyAndFormat("commands.commander.time.query", ((CommanderCommandSource)c.getSource()).getWorld().getWorldTime() % Integer.MAX_VALUE)); return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("day") + .then(LiteralArgumentBuilder.literal("day") .executes(c -> { ((CommanderCommandSource)c.getSource()).sendMessage(I18n.getInstance().translateKeyAndFormat("commands.commander.time.query", (int) Math.floor(((CommanderCommandSource)c.getSource()).getWorld().getWorldTime() / 24000L % Integer.MAX_VALUE))); return Command.SINGLE_SUCCESS; }))) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("set") - .then((RequiredArgumentBuilder) RequiredArgumentBuilder.argument("time", TimeArgumentType.time()) + .then(LiteralArgumentBuilder.literal("set") + .then(RequiredArgumentBuilder.argument("time", TimeArgumentType.time()) .executes(c -> { int time = c.getArgument("time", Integer.class); setWorldTime((CommanderCommandSource)c.getSource(), ((CommanderCommandSource)c.getSource()).getWorld(), time); return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("day") + .then(LiteralArgumentBuilder.literal("day") .executes(c -> { setDayTime((CommanderCommandSource)c.getSource(), ((CommanderCommandSource)c.getSource()).getWorld(), 1000); return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("noon") + .then(LiteralArgumentBuilder.literal("noon") .executes(c -> { setDayTime((CommanderCommandSource)c.getSource(), ((CommanderCommandSource)c.getSource()).getWorld(), 6000); return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("night") + .then(LiteralArgumentBuilder.literal("night") .executes(c -> { setDayTime((CommanderCommandSource)c.getSource(), ((CommanderCommandSource)c.getSource()).getWorld(), 13000); return Command.SINGLE_SUCCESS; })) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("midnight") + .then(LiteralArgumentBuilder.literal("midnight") .executes(c -> { setDayTime((CommanderCommandSource)c.getSource(), ((CommanderCommandSource)c.getSource()).getWorld(), 18000); return Command.SINGLE_SUCCESS; }))) - .then((LiteralArgumentBuilder) LiteralArgumentBuilder.literal("add") - .then((RequiredArgumentBuilder) RequiredArgumentBuilder.argument("time", TimeArgumentType.time()) + .then(LiteralArgumentBuilder.literal("add") + .then(RequiredArgumentBuilder.argument("time", TimeArgumentType.time()) .executes(c -> { int time = c.getArgument("time", Integer.class); addWorldTime((CommanderCommandSource)c.getSource(), ((CommanderCommandSource)c.getSource()).getWorld(), time); diff --git a/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandNetServerHandlerMixin.java b/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandNetServerHandlerMixin.java index 3124537..19cc099 100644 --- a/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandNetServerHandlerMixin.java +++ b/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandNetServerHandlerMixin.java @@ -1,6 +1,7 @@ package net.pedroricardo.commander.mixin; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.core.net.command.TextFormatting; import net.minecraft.core.net.packet.Packet3Chat; import net.minecraft.core.util.helper.AES; import net.minecraft.server.MinecraftServer; @@ -31,8 +32,7 @@ private void handleSlashCommand(String s, CallbackInfo ci) { try { CommanderCommandManager.execute(s, serverCommandSource); } catch (CommandSyntaxException e) { - if (e.getType() != CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand()) - ((NetServerHandlerAccessor)((NetServerHandler)(Object)this)).playerEntity().playerNetServerHandler.sendPacket(new Packet3Chat(e.getMessage(), AES.keyChain.get(((NetServerHandlerAccessor)((NetServerHandler)(Object)this)).playerEntity().username))); + ((NetServerHandlerAccessor)((NetServerHandler)(Object)this)).playerEntity().playerNetServerHandler.sendPacket(new Packet3Chat(TextFormatting.RED + e.getMessage(), AES.keyChain.get(((NetServerHandlerAccessor)((NetServerHandler)(Object)this)).playerEntity().username))); } ci.cancel(); } diff --git a/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandPlayerSPMixin.java b/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandPlayerSPMixin.java index 503df1c..2e0e39c 100644 --- a/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandPlayerSPMixin.java +++ b/src/main/java/net/pedroricardo/commander/mixin/PreferCommanderCommandPlayerSPMixin.java @@ -28,8 +28,7 @@ private void sendChatMessage(String s, CallbackInfo ci) { try { CommanderCommandManager.execute(command, clientCommandSource); } catch (CommandSyntaxException e) { - if (e.getType() != CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand()) - ((EntityPlayerSPAccessor)((EntityPlayerSP)(Object)this)).mc().thePlayer.sender.sendMessage(TextFormatting.RED + e.getMessage()); + ((EntityPlayerSPAccessor)((EntityPlayerSP)(Object)this)).mc().thePlayer.sender.sendMessage(TextFormatting.RED + e.getMessage()); } ci.cancel(); }