diff options
| author | JFronny | 2022-06-20 14:43:45 +0200 |
|---|---|---|
| committer | JFronny | 2022-06-20 14:43:45 +0200 |
| commit | 6a8dc21a6d3dbabe821a384052eb82392b1a5de9 (patch) | |
| tree | 61bb7be7036e28b402ff90f0696690f2ceb3033a /src/main/java/com/aizistral/nochatreports | |
| parent | 3acb4606b9be8b7c25b967581de19f02e6d7093a (diff) | |
Attempt to replicate original code style
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java | 12 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java | 30 |
2 files changed, 22 insertions, 20 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java index 2bb04ec..0a9734e 100644 --- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java @@ -1,16 +1,18 @@ package com.aizistral.nochatreports.handlers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.fabricmc.loader.api.FabricLoader; - -import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import javax.annotation.Nullable; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.fabricmc.loader.api.FabricLoader; + public class NoReportsConfig { private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java index a96d69d..68749f6 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java @@ -19,21 +19,21 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ServerPlayer.class) public abstract class MixinServerPlayer { - @Shadow - protected abstract int resolveChatTypeId(ResourceKey<ChatType> resourceKey); + @Shadow + protected abstract int resolveChatTypeId(ResourceKey<ChatType> resourceKey); - @Redirect(method = "sendChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/ChatSender;Lnet/minecraft/resources/ResourceKey;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) - void extractChatMessage(ServerGamePacketListenerImpl listener, Packet<?> packet) { - if (NoReportsConfig.convertsToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat) { - Component component = chat.unsignedContent().orElse(chat.signedContent()); - component = ChatDecoration.withSender("chat.type.text").decorate(component, chat.sender()); - packet = new ClientboundSystemChatPacket(component, resolveChatTypeId(ChatType.SYSTEM)); - } else { - NoChatReports.LOGGER.warn("Unexpected packet type in sendChatMessage, skipping"); - } - } - listener.send(packet); - } + @Redirect(method = "sendChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/ChatSender;Lnet/minecraft/resources/ResourceKey;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) + void extractChatMessage(ServerGamePacketListenerImpl listener, Packet<?> packet) { + if (NoReportsConfig.convertsToGameMessage()) { + if (packet instanceof ClientboundPlayerChatPacket chat) { + Component component = chat.unsignedContent().orElse(chat.signedContent()); + component = ChatDecoration.withSender("chat.type.text").decorate(component, chat.sender()); + packet = new ClientboundSystemChatPacket(component, resolveChatTypeId(ChatType.SYSTEM)); + } else { + NoChatReports.LOGGER.warn("Unexpected packet type in sendChatMessage, skipping"); + } + } + listener.send(packet); + } } |
