diff options
| author | Aizistral | 2023-09-27 11:57:24 +0200 |
|---|---|---|
| committer | Aizistral | 2023-09-27 12:09:04 +0200 |
| commit | fa14575bc7281a091fef47a776ae98227fc7f54d (patch) | |
| tree | 0060b0a36e14c0d77e72e8576f6bf95f25c598c5 | |
| parent | c60ea05d0cd4855383959dfa075dab936bcba8a4 (diff) | |
Resolve mixin errors
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java | 17 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java | 16 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java | 14 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java (renamed from src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java) | 58 | ||||
| -rw-r--r-- | src/main/resources/mixins/common/nochatreports.mixins.json | 5 |
7 files changed, 72 insertions, 45 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java new file mode 100644 index 0000000..caeccd8 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java @@ -0,0 +1,17 @@ +package com.aizistral.nochatreports.common.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import com.mojang.brigadier.ParseResults; + +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.commands.SharedSuggestionProvider; + +@Mixin(ClientPacketListener.class) +public interface AccessorClientPacketListener { + + @Invoker("parseCommand") + public ParseResults<SharedSuggestionProvider> invokeParseCommand(String string); + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index d6c599e..bcfc5f8 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -31,6 +31,7 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.navigation.FocusNavigationEvent; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.client.multiplayer.resolver.ServerAddress; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; @@ -210,8 +211,8 @@ public abstract class MixinChatScreen extends Screen { this.addRenderableWidget(button); } - @Inject(method = "tick", at = @At("RETURN")) - private void onTick(CallbackInfo info) { + @Override + public void tick() { if (this.safetyStatusButton != null) { this.safetyStatusButton.useSprites(this.getSpriteSet()); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java index 1074931..98d672f 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java @@ -10,6 +10,7 @@ import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.mojang.brigadier.ParseResults; +import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.network.chat.SignableCommand; @@ -17,25 +18,28 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; import net.minecraft.network.protocol.game.ServerboundChatPacket; -@Mixin(ClientPacketListener.class) +@Mixin(ClientCommonPacketListenerImpl.class) public abstract class MixinClientPacketListener { @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD")) private void onSend(Packet<?> packet, CallbackInfo info) { + Object self = this; + + if (!(self instanceof ClientPacketListener)) + return; + + AccessorClientPacketListener accessor = (AccessorClientPacketListener) self; + if (!ServerSafetyState.allowChatSigning() && !ServerSafetyState.isDetermined()) { if (packet instanceof ServerboundChatPacket chat) { ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); // asume unintrusive until further notice } else if (packet instanceof ServerboundChatCommandPacket command) { - if (!SignableCommand.of(this.parseCommand(command.command())).arguments().isEmpty()) { + if (!SignableCommand.of(accessor.invokeParseCommand(command.command())).arguments().isEmpty()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); } } } - } - @Shadow - private ParseResults<SharedSuggestionProvider> parseCommand(String command) { - throw new IllegalStateException("@Shadow transformation failed"); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java index 32ed839..41c5b5d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java @@ -20,26 +20,18 @@ import net.minecraft.resources.ResourceLocation; @Mixin(GuiMessageTag.Icon.class) public abstract class MixinGuiMessageTagIcon { - private static final ResourceLocation TEXTURE_NCR = new ResourceLocation("nochatreports", "textures/gui/encrypted_tag.png"); + private static final ResourceLocation TEXTURE_NCR = new ResourceLocation("nochatreports", "encryption/encrypted_tag"); @Shadow(aliases = "field_39768") @Mutable static Icon[] $VALUES; @Invoker("<init>") - static Icon create(String name, int ordinal, int u, int v, int width, int height) { + static Icon create(String name, int ordinal, ResourceLocation texture, int width, int height) { throw new IllegalStateException("Invoker transformation failed"); } - @Inject(method = "draw", at = @At("HEAD"), cancellable = true) - public void onDraw(GuiGraphics graphics, int x, int y, CallbackInfo info) { - if (((Icon)(Object)this).name().equals("CHAT_NCR_ENCRYPTED")) { - graphics.blit(TEXTURE_NCR, x, y, 0, 0, 9, 9, 9, 9); - info.cancel(); - } - } - static { var ordinal = $VALUES.length; var values = Arrays.copyOf($VALUES, ordinal + 1); - values[ordinal] = create("CHAT_NCR_ENCRYPTED", ordinal, 9, 0, 9, 9); + values[ordinal] = create("CHAT_NCR_ENCRYPTED", ordinal, TEXTURE_NCR, 9, 9); $VALUES = values; } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java index 5705fad..ce61259 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java @@ -53,7 +53,7 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { SwitchableSprites.of( GUIShenanigans.getSprites("ncr_active_button"), GUIShenanigans.getSprites("ncr_inactive_button") - ).setIndex(NCRConfig.getClient().enableMod() ? 1 : 2), + ).setIndex(NCRConfig.getClient().enableMod() ? 0 : 1), btn -> { NCRConfig.getClient().toggleMod(); boolean enabled = NCRConfig.getClient().enableMod(); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java index fab0317..f7d66f1 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java @@ -1,6 +1,7 @@ package com.aizistral.nochatreports.common.mixins.server; import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -15,14 +16,16 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerCommonPacketListenerImpl; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.network.ServerPlayerConnection; -@Mixin(ServerGamePacketListenerImpl.class) -public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerConnection { - @Shadow - public ServerPlayer player; +@Mixin(ServerCommonPacketListenerImpl.class) +public abstract class MixinServerCommonPacketListenerImpl { + + /** * @reason Convert player message to system message if mod is configured respectively. @@ -33,19 +36,23 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, CallbackInfo info) { - if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() - : chat.body().content()); - } + Object self = this; + + if (self instanceof ServerGamePacketListenerImpl listener) { + if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); + } - if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat) { - packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level().registryAccess()) - .get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() - : Component.literal(chat.body().content())), false); + if (NCRConfig.getCommon().convertToGameMessage()) { + if (packet instanceof ClientboundPlayerChatPacket chat) { + packet = new ClientboundSystemChatPacket(chat.chatType().resolve(listener.player.level() + .registryAccess()).get().decorate(chat.unsignedContent() != null ? chat.unsignedContent() + : Component.literal(chat.body().content())), false); - info.cancel(); - this.send(packet); + info.cancel(); + listener.send(packet); + } } } } @@ -58,16 +65,21 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { - if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() - : chat.body().content()); - } + Object self = this; + + if (self instanceof ServerGamePacketListenerImpl listener) { + if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + : chat.body().content()); + } - if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { - info.cancel(); - ((ServerGamePacketListenerImpl) (Object) this).send(chat); + if (NCRConfig.getCommon().convertToGameMessage()) { + if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { + info.cancel(); + listener.send(chat); + } } + } } diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index 88b41ee..8b84b48 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -8,7 +8,7 @@ "common.MixinServerStatus", "common.MixinFriendlyByteBuf", "server.MixinServerboundChatPacket", - "server.MixinServerGamePacketListenerImpl", + "server.MixinServerCommonPacketListenerImpl", "server.MixinPlayerList", "server.MixinServerboundChatSessionUpdatePacket", "server.MixinServerboundChatCommandPacket" @@ -33,7 +33,8 @@ "client.MixinTitleScreen", "client.MixinMinecraft", "client.MixinClientPacketListener", - "client.MixinRowHelper" + "client.MixinRowHelper", + "client.AccessorClientPacketListener" ], "server": [ "server.MixinDedicatedServer" |
