From c50d56d9fa648a1331bdb625a98b56dd4fb5bce4 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Sat, 23 Mar 2024 15:36:13 +0000 Subject: [PATCH] Remove canClickRunClientCommand This was added in 4675583e1c4fb8e7a02b82ae9d0c4b2171abebaf to handle Forge on longer supporting RUN_COMMAND for client-side commands. However, the mixins are still present on NF/1.20.4, so we don't need this! --- .../computercraft/shared/command/text/ChatHelpers.java | 6 +----- .../computercraft/shared/platform/PlatformHelper.java | 9 --------- .../shared/platform/PlatformHelperImpl.java | 5 ----- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/projects/common/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java b/projects/common/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java index 849654875..5485515ac 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java @@ -5,7 +5,6 @@ package dan200.computercraft.shared.command.text; import dan200.computercraft.shared.computer.core.ServerComputer; -import dan200.computercraft.shared.platform.PlatformHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.ClickEvent; @@ -56,10 +55,7 @@ public static Component link(MutableComponent component, String command, Compone } public static Component clientLink(MutableComponent component, String command, Component toolTip) { - var event = PlatformHelper.get().canClickRunClientCommand() - ? new ClickEvent(ClickEvent.Action.RUN_COMMAND, command) - : new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command); - return link(component, event, toolTip); + return link(component, new ClickEvent(ClickEvent.Action.RUN_COMMAND, command), toolTip); } public static Component link(Component component, ClickEvent click, Component toolTip) { diff --git a/projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java b/projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java index 2e3fb2edf..b93b56dfe 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java @@ -375,13 +375,4 @@ default double getReachDistance(Player player) { * @see ServerPlayerGameMode#useItemOn(ServerPlayer, Level, ItemStack, InteractionHand, BlockHitResult) */ InteractionResult useOn(ServerPlayer player, ItemStack stack, BlockHitResult hit, Predicate canUseBlock); - - /** - * Whether {@link net.minecraft.network.chat.ClickEvent.Action#RUN_COMMAND} can be used to run client commands. - * - * @return Whether client commands can be triggered from chat components. - */ - default boolean canClickRunClientCommand() { - return true; - } } diff --git a/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java b/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java index ff8bd8111..8cb0694b6 100644 --- a/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java +++ b/projects/forge/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java @@ -312,11 +312,6 @@ public InteractionResult useOn(ServerPlayer player, ItemStack stack, BlockHitRes return event.getUseItem() == Event.Result.DENY ? InteractionResult.PASS : stack.useOn(context); } - @Override - public boolean canClickRunClientCommand() { - return false; - } - private record RegistrationHelperImpl(DeferredRegister registry) implements RegistrationHelper { @Override public RegistryEntry register(String name, Supplier create) {