summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java30
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java34
-rw-r--r--src/main/resources/assets/nochatreports/lang/pl_pl.json6
-rw-r--r--src/main/resources/assets/nochatreports/lang/ro_ro.json13
-rw-r--r--src/main/resources/assets/nochatreports/lang/zh_cn.json4
-rw-r--r--src/main/resources/assets/nochatreports/lang/zh_tw.json13
-rw-r--r--src/main/resources/nochatreports.mixins.json3
9 files changed, 94 insertions, 12 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index 828e73b..7ea17d2 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -18,6 +18,7 @@ import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.DetectedVersion;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.network.protocol.login.ServerboundHelloPacket;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index bcd1a84..7f1d28d 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -29,6 +29,8 @@ import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.contents.TranslatableContents;
+import net.minecraft.realms.RealmsConnect;
+import net.minecraft.realms.RealmsScreen;
/**
* Client initializer for the mod. Some networking setup here, as well as few screen-related events.
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
new file mode 100644
index 0000000..9d8a3a5
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
@@ -0,0 +1,30 @@
+package com.aizistral.nochatreports.mixins.client;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.aizistral.nochatreports.core.ServerSafetyLevel;
+import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.mojang.realmsclient.dto.RealmsServer;
+
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
+import net.minecraft.realms.RealmsConnect;
+
+@Mixin(RealmsConnect.class)
+public class MixinRealmsConnect {
+
+ /**
+ * @reason Always treat Realms servers as insecure, there is nothing we can do about them.
+ * @author Aizistral
+ */
+
+ @Inject(method = "connect", at = @At("HEAD"))
+ private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) {
+ ServerSafetyState.setLastConnectedServer(serverAddress);
+ ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE);
+ ServerSafetyState.setAllowsUnsafeServer(true);
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
index a29f24b..2226193 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java
@@ -3,15 +3,18 @@ package com.aizistral.nochatreports.mixins.server;
import com.aizistral.nochatreports.core.NoReportsConfig;
import net.minecraft.core.Registry;
+import net.minecraft.network.PacketSendListener;
import net.minecraft.network.chat.ChatTypeDecoration;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket;
import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket;
import net.minecraft.network.protocol.game.ClientboundSystemChatPacket;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.server.network.ServerPlayerConnection;
+import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@@ -30,14 +33,15 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC
* @author Aizistral
*/
- @Inject(method = "send", at = @At("HEAD"), cancellable = true)
+ @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true)
private void onSend(Packet<?> packet, CallbackInfo info) {
if (NoReportsConfig.convertToGameMessage()) {
- if (packet instanceof ClientboundPlayerChatPacket chat) {
- Component component = chat.message().signedContent().decorated();
- ChatTypeDecoration decoration = this.player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY).byId(chat.chatType().chatType()).chat();
- component = decoration.decorate(component, chat.resolveChatType(this.player.level.registryAccess()).get());
- packet = new ClientboundSystemChatPacket(component, false);
+ if (packet instanceof ClientboundPlayerChatHeaderPacket) {
+ info.cancel();
+ } else if (packet instanceof ClientboundPlayerChatPacket chat) {
+ packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess())
+ .get().decorate(chat.message().serverContent()), false);
+
info.cancel();
this.send(packet);
@@ -45,4 +49,22 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC
}
}
+ /**
+ * @reason Ensure conversion works regardless of which send method is used.
+ * @author Aizistral
+ */
+
+ @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 (NoReportsConfig.convertToGameMessage()) {
+ if (packet instanceof ClientboundPlayerChatHeaderPacket) {
+ info.cancel();
+ } else if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) {
+ info.cancel();
+ ((ServerGamePacketListenerImpl) (Object) this).send(chat);
+ }
+ }
+ }
+
}
diff --git a/src/main/resources/assets/nochatreports/lang/pl_pl.json b/src/main/resources/assets/nochatreports/lang/pl_pl.json
index 421b68a..42dd7f3 100644
--- a/src/main/resources/assets/nochatreports/lang/pl_pl.json
+++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json
@@ -2,12 +2,12 @@
"gui.nochatreport.secureChat": "Ta opcja nie działa z No Chat Reports, ponieważ nie ma podpisów do weryfikacji.",
"gui.nochatreport.noReporting": "Raporty czatu są wyłączone na tym serwerze, dzięki No Chat Reports.",
"disconnect.nochatreports.client": "Na tym serwerze nie ma No Chat Reports, a został skonfigurowany tak, aby był wymagany na serwerze."
- "gui.nochatreports.status_secure": "Ten serwer ma zainstalowane No Chat Reports lub uniemożliwia raportowanie wiadomości w inny znany sposób. Możesz bezpiecznie chatować.",
- "gui.nochatreports.status_unintrusive": "Ten serwer nie blokuje raportów z czatów, ale umożliwia wysyłanie niepodpisanych wiadomości. Technicznie rzecz biorąc, nadal można je zgłosić Mojangowi, ale generalnie nie są one ważnymi dowodami i jest to mało prawdopodobne, aby w związku z takimi raportami zostały podjęte jakiekolwiek działania.",
+ "gui.nochatreports.status_secure": "Ten serwer ma zainstalowane No Chat Reports lub uniemożliwia raportowanie wiadomości w inny znany sposób. Nikt nie będzie widzieć czerwonego paska czy symbolu (!) lub może wyłączyć wiadomości przez opcję \"Tylko bezpieczny czat\". Możesz bezpiecznie chatować.",
+ "gui.nochatreports.status_unintrusive": "Ten serwer pozwala na wysyłanie nie podpisanych wiadomości, których nie można zgłosić do Mojangu. Jednakże u klientów Vanilla wiadomości będą mieć czerwony pasek po lewej i symbol (!) po prawej, a włączenie opcji \"Tylko bezpieczny czat\" przez kogokolwiek nie pokaże im twoich wiadomości w ogóle.",
"gui.nochatreports.status_insecure": "Ten serwer wymaga podpisania wszystkich wiadomości graczy, a ty zgodziłeś się kontynuować z tym. Wszystko, co wysyłasz na czacie, jest potencjalnie obciążającym dowodem, który można wykorzystać przeciwko tobie w zgłoszeniu. Możesz ręcznie usunąć ten serwer z NoChatReports.json w folderze konfiguracyjnym, aby ponownie otrzymać ostrzeżenie.",
"gui.nochatreports.status_unknown": "No Chat Reports nie może ocenić bezpieczeństwa tego serwera. To nigdy nie powinno się zdarzyć, zgłoś to jako błąd twórcy modów.",
"gui.nochatreports.unsafe_server.header": "Uwaga: Niezabezpieczony serwer",
- "gui.nochatreports.unsafe_server.contents": "Ten serwer wymaga podpisania wszystkich wiadomości czatu, co oznacza, że można je zgłaszać do Mojang. Prawdopodobnie oznacza to, że właściciel serwera pozostawił włączony „enforce-secure-profile” w server.properties, co jest ustawieniem domyślnym od wersji 1.19.1. Pomimo to możesz dalej zagrać, ale No Chat Reports nie będzie w stanie Cię ochronić.",
+ "gui.nochatreports.unsafe_server.contents": "Ten serwer wymaga podpisania wszystkich wiadomości czatu, co oznacza, że można je zgłaszać do Mojang. Prawdopodobnie oznacza to, że właściciel serwera pozostawił włączony „enforce-secure-profile” w server.properties, co jest ustawieniem domyślnym od 1.19.1. Pomimo to możesz dalej zagrać, ale No Chat Reports nie będzie w stanie Cię ochronić.",
"gui.nochatreports.unsafe_server.check": "Nie pokazuj ponownie dla tego serwera",
"gui.nochatrepords.reload_config_tooltip": "Przeładuj konfigurację No Chat Reports. Używaj ostrożnie."
}
diff --git a/src/main/resources/assets/nochatreports/lang/ro_ro.json b/src/main/resources/assets/nochatreports/lang/ro_ro.json
new file mode 100644
index 0000000..ced3792
--- /dev/null
+++ b/src/main/resources/assets/nochatreports/lang/ro_ro.json
@@ -0,0 +1,13 @@
+{
+ "gui.nochatreport.secureChat": "Această opțiune nu poate funcționa cu No Chat Reports, deoarece nu există semnături de verificat.",
+ "gui.nochatreport.noReporting": "Rapoartele de chat sunt dezactivate pe acest server, folosind No Chat Reports.",
+ "disconnect.nochatreports.client": "Acest server nu are No Chat Reports, iar tu îl ai configurat să fie necesar pe server.",
+ "gui.nochatreports.status_secure": "Acest server are No Chat Reports instalat sau previne mesajele tuturor de la a fi raportate în alt mod. Nimeni nu va vedea o bară roșie, simbol (!) sau să poată ascunde mesajele cu „Only Show Secure Chat”. Poți să trimiți mesaje în siguranță.",
+ "gui.nochatreports.status_unintrusive": "Acest server îți permite să trimiți mesaje nesemnate, care nu pot fi raportate la Micro$oft. Cu toate acestea, pentru clienți vanilla mesajele vor avea o bară roșie în stânga, un simbol (!) în dreapta și orcine activează „Only Show Secure Chat” nu-ți va vedea mesajele deloc.",
+ "gui.nochatreports.status_insecure": "Acest server cere ca toate mesajele să fie semnate, și ai fost de acord cu asta. Orice trimiți poate fi folosit împotriva ta. Poți să ștergi acest server din NoChatReports.json în folderul tău de config pentru a fi atenționat iar.",
+ "gui.nochatreports.status_unknown": "No Chat Reports nu a putut evalua siguranța acestui server. Aceasta nu ar trebui să se întâmple niciodată, te rog trimite-l ca un bug la dezvoltatorul modului..",
+ "gui.nochatreports.unsafe_server.header": "Atenție: server nesigur",
+ "gui.nochatreports.unsafe_server.contents": "Acest server cere ca toate mesajele să fie semnate, ceea ce înseamnă că pot fi raportate la Micro$oft. Aceasta probabil înseamnă că proprietarul serverului a lăsat „enforce-secure-profile” activat pe server.properties, care este implicit din 1.19.1. Poți alege să joci, dar No Chat Reports nu va putea să te protejeze.",
+ "gui.nochatreports.unsafe_server.check": "Nu afișa din nou pentru acest server",
+ "gui.nochatrepords.reload_config_tooltip": "Reîncarcă configurația No Chat Reports. Folosește cu grijă."
+}
diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json
index 75c63ad..c986469 100644
--- a/src/main/resources/assets/nochatreports/lang/zh_cn.json
+++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json
@@ -2,8 +2,8 @@
"gui.nochatreport.secureChat": "此选项无法与 No Chat Reports 一起使用,因为没有可用于验证的签名。",
"gui.nochatreport.noReporting": "聊天举报在此服务器上被禁用,由 No Chat Reports 提供。",
"disconnect.nochatreports.client": "此服务器没有安装 No Chat Reports,但你已将其配置为要求在服务器上安装。",
- "gui.nochatreports.status_secure": "此服务器安装了 No Chat Reports 或其他已知的方法避免你的聊天被举报。你可以安全地聊天。",
- "gui.nochatreports.status_unintrusive": "此服务器不能防止聊天举报,但允许发送未签名的消息。技术上来讲,你还是有可能被举报,但不太可能被视为有效的证据,同时也不太可能因此被处理。",
+ "gui.nochatreports.status_secure": "此服务器安装了 No Chat Reports 或其他已知的方法避免消息被举报。这也会避免 \"仅显示安全的聊天\" 挡你的消息。你可以安全地聊天。",
+ "gui.nochatreports.status_unintrusive": "此服务器不能防止聊天举报,但允许发送未签名的消息。这意味着你发的消息不能被举报给 Mojang,但其他人还可以用 \"仅显示安全的聊天\" 挡你的消息",
"gui.nochatreports.status_insecure": "此服务器要求所有玩家的消息签名,你也同意在这设置下继续游戏。你所发送的任何消息都可能成为你被举报时潜在的违规证据。你可以在 NoChatReports.json 中手动移除此服务器,以再次获得相同的警告。",
"gui.nochatreports.status_unknown": "No Chat Reports 无法检测此服务器的安全性。这不应该发生,请将此错误反馈给模组作者。",
"gui.nochatreports.unsafe_server.header": "警告:不安全的服务器",
diff --git a/src/main/resources/assets/nochatreports/lang/zh_tw.json b/src/main/resources/assets/nochatreports/lang/zh_tw.json
new file mode 100644
index 0000000..d4dbb28
--- /dev/null
+++ b/src/main/resources/assets/nochatreports/lang/zh_tw.json
@@ -0,0 +1,13 @@
+{
+ "gui.nochatreport.secureChat": "此選項無法與 No Chat Reports 一起使用,因為沒有可用於驗證的簽名。",
+ "gui.nochatreport.noReporting": "聊天舉報在此伺服器上被禁用,由 No Chat Reports 提供。",
+ "disconnect.nochatreports.client": "此伺服器沒有安裝 No Chat Reports,但你已將其配置為要求在伺服器上安裝。",
+ "gui.nochatreports.status_secure": "此伺服器安裝了 No Chat Reports 或其他已知的方法避免消息被舉報。這也會避免「僅顯示已受保護的聊天內容」阻擋你的消息。你可以安全地聊天。",
+ "gui.nochatreports.status_unintrusive": "此伺服器不能防止聊天舉報,但允許發送未簽名的消息。這意味著你發的消息不能被舉報給 Mojang,但其他人還可以用「僅顯示已受保護的聊天內容」阻擋你的消息",
+ "gui.nochatreports.status_insecure": "此伺服器要求所有玩家的消息簽名,你也同意在這設置下繼續遊戲。你所發送的任何消息都可能成為你被舉報時潛在的違規證據。你可以在「NoChatReports.json」中手動移除此伺服器,以再次獲得相同的警告。",
+ "gui.nochatreports.status_unknown": "No Chat Reports 無法檢測此伺服器的安全性。這不應該發生,請將此錯誤反饋給模組作者。",
+ "gui.nochatreports.unsafe_server.header": "警告:不安全的伺服器",
+ "gui.nochatreports.unsafe_server.contents": "此伺服器要求所有消息簽名,這意味著它們可以被舉報給 Mojang。可能是伺服器默認開啟了「enforce-secure-profile」選項。你可以選擇繼續遊玩,但 No Chat Reports 不能提供任何保護。",
+ "gui.nochatreports.unsafe_server.check": "不在此伺服器中再次顯示",
+ "gui.nochatrepords.reload_config_tooltip": "重載 No Chat Reports 配置。請小心使用。"
+}
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index efe9c5c..a3afe8b 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -26,7 +26,8 @@
"client.MixinClientboundHelloPacket",
"client.MixinJoinMultiplayerScreen",
"client.MixinGuiMessageTag",
- "client.MixinToastComponent"
+ "client.MixinToastComponent",
+ "client.MixinRealmsConnect"
],
"server": [
"server.MixinDedicatedServer"