From 00daa7e9b1b375dd241da561003e89410673c6b9 Mon Sep 17 00:00:00 2001 From: Xujiayao Date: Sat, 16 Dec 2023 00:45:56 +0800 Subject: [PATCH] =?UTF-8?q?1.18.2=E5=8F=8A=E4=BB=A5=E4=B8=8B=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=A7=BB=E9=99=A4=E6=8E=A7=E5=88=B6=E5=8F=B0=E4=B8=8E?= =?UTF-8?q?Discord=E8=81=8A=E5=A4=A9=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #197 --- .../minecraft/mixins/MixinPlayerManager.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/versions/1.20.1/src/main/java/top/xujiayao/mcdiscordchat/minecraft/mixins/MixinPlayerManager.java b/versions/1.20.1/src/main/java/top/xujiayao/mcdiscordchat/minecraft/mixins/MixinPlayerManager.java index f528fc96..03e5a4ad 100644 --- a/versions/1.20.1/src/main/java/top/xujiayao/mcdiscordchat/minecraft/mixins/MixinPlayerManager.java +++ b/versions/1.20.1/src/main/java/top/xujiayao/mcdiscordchat/minecraft/mixins/MixinPlayerManager.java @@ -17,9 +17,6 @@ //$$ import net.minecraft.server.filter.FilteredMessage; //#endif import net.minecraft.server.network.ServerPlayerEntity; -//#if MC < 11900 -//$$ import net.minecraft.text.Text; -//#endif import okhttp3.MediaType; import okhttp3.Request; import okhttp3.RequestBody; @@ -32,10 +29,6 @@ import top.xujiayao.mcdiscordchat.utils.Translations; import top.xujiayao.mcdiscordchat.utils.Utils; -//#if MC < 11900 -//$$ import java.util.UUID; -//#endif - //#if MC == 11900 //$$ import java.util.Objects; //#endif @@ -69,22 +62,8 @@ private void broadcast(SignedMessage message, ServerCommandSource source, Messag //$$ private void broadcast(FilteredMessage message, ServerCommandSource source, RegistryKey typeKey, CallbackInfo ci) { //$$ sendMessage(Objects.requireNonNull(message.filtered()).signedContent().getString(), source.getName()); //$$ } - //#elseif MC >= 11800 - //$$ @Inject(method = "broadcast", at = @At("RETURN")) - //$$ private void broadcast(Text message, MessageType type, UUID sender, CallbackInfo ci) { - //$$ sendMessage(message.getString(), "Server"); - //$$ } - //#elseif MC >= 11600 - //$$ @Inject(method = "broadcastChatMessage", at = @At("RETURN")) - //$$ private void broadcastChatMessage(Text message, MessageType type, UUID sender, CallbackInfo ci) { - //$$ sendMessage(message.getString(), "Server"); - //$$ } - //#else - //$$ @Inject(method = "sendToAll(Lnet/minecraft/text/Text;)V", at = @At("RETURN")) - //$$ private void sendToAll(Text text, CallbackInfo ci) { - //$$ sendMessage(text.getString(), "Server"); - //$$ } //#endif + // This feature has been removed in versions 1.18.2 and below due to compatibility issues private void sendMessage(String content, String username) { if (CONFIG.generic.broadcastChatMessages) {