diff options
Diffstat (limited to 'src')
8 files changed, 153 insertions, 10 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 5e04502..828e73b 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -6,6 +6,7 @@ import org.apache.logging.log4j.Logger; import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.network.ServerChannelHandler; import com.mojang.authlib.minecraft.UserApiService; +import com.mojang.patchy.MojangBlockListSupplier; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; 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 ecc7906..a29f24b 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -36,7 +36,7 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC 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.chatType().resolve(this.player.level.registryAccess()).get()); + component = decoration.decorate(component, chat.resolveChatType(this.player.level.registryAccess()).get()); packet = new ClientboundSystemChatPacket(component, false); info.cancel(); diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 84c7f95..c36beec 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -2,8 +2,8 @@ "gui.nochatreport.secureChat": "This option cannot work with No Chat Reports, since there are no signatures to verify.", "gui.nochatreport.noReporting": "Chat reports are disabled on this server, courtesy of No Chat Reports.", "disconnect.nochatreports.client": "This server does not have No Chat Reports, and you have it configured to require itself on server.", - "gui.nochatreports.status_secure": "This server has No Chat Reports installed, or prevents your messages from being reportable in some other known way. You can chat safely.", - "gui.nochatreports.status_unintrusive": "This server does not prevent chat reports, but allows you to send unsigned messages. Technically - they can still be reported to Mojang, but are generally not considered valid evidence, and it is improbable that any action would be taken on such reports.", + "gui.nochatreports.status_secure": "This server has No Chat Reports installed, or prevents everyone's messages from being reportable in some other known way. Nobody will see a red bar, (!) symbol or can hide messages with \"Only Show Secure Chat\". You can chat safely.", + "gui.nochatreports.status_unintrusive": "This server allows you to send unsigned messages, which cannot be reported to Mojang. However, for vanilla clients the messages will show a red bar on the left, (!) symbol on the right and anyone enabling the option \"Only Show Secure Chat\" won't see your messages at all.", "gui.nochatreports.status_insecure": "This server demands all player messages to be signed, and you agreed to proceed with this arrangement. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can manually remove this server from NoChatReports.json in your config folder to get warned again.", "gui.nochatreports.status_unknown": "No Chat Reports could not evaluate the safety of this server. This should never happen, please report it as a bug to the mod developer.", "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json index 1cdb973..94d2c75 100644 --- a/src/main/resources/assets/nochatreports/lang/et_ee.json +++ b/src/main/resources/assets/nochatreports/lang/et_ee.json @@ -2,8 +2,8 @@ "gui.nochatreport.secureChat": "See funktsioon ei saa töötada modiga No Chat Reports, kuna kinnitatavad signatuurid puuduvad.", "gui.nochatreport.noReporting": "Selles serveris on mängijast teatamine keelatud modi No Chat Reports olemasolu tõttu.", "disconnect.nochatreports.client": "Sellest serverist puudub mod No Chat Reports ning sinu seadistused nõuavad selle olemasolu serveris.", - "gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.", - "gui.nochatreports.status_unintrusive": "See server ei piira sõnumitest teatamist, kuid lubab saata signeerimata sõnumeid. Tehniliselt saab neid siiski Mojangile teatada, ent neid ei loeta üldjuhul kehtivaks asitõendiks ning on ebatõenäoline, et sellistele raportitele rakendatakse meetmeid.", + "gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab kõigi sõnumitest teatamist mõnel muul teadaoleval viisil. Keegi ei näe punast riba, (!)-sümbolit ega saa sõnumeid peita valikuga \"Vaid turvaline vestlus\". Sa saad turvaliselt vestelda.", + "gui.nochatreports.status_unintrusive": "See server võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Siiski, vanilliklientidele kuvavad need sõnumid vasakul punast riba, paremal (!)-sümbolit ning igaüks, kes lubab valiku \"Vaid turvaline vestlus\" ei näe su sõnumeid üldse.", "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri käsitsi config kaustas olevast NoChatReports.json failist eemaldada.", "gui.nochatreports.status_unknown": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.", "gui.nochatreports.unsafe_server.header": "Hoiatus: ebaturvaline server", diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json index 4785ed8..75c63ad 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_cn.json +++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json @@ -1,5 +1,13 @@ { - "gui.nochatreport.secureChat": "此选项无法与No Chat Reports一起使用,因为没有可用于验证的签名。", - "gui.nochatreport.noReporting": "聊天举报在此服务器上被禁用,由No Chat Reports提供。", - "disconnect.nochatreports.client": "此服务器没有No Chat Reports,但你已将其配置为要求在服务器上安装。" + "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_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/fabric.mod.json b/src/main/resources/fabric.mod.json index caf0d11..73b15e7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "depends": { "fabricloader": ">=0.14.6", "fabric": "*", - "minecraft": "=1.19.1-rc.2", + "minecraft": "=1.19.1", "java": ">=17" }, "suggests": {}, diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java index e7894d6..78c97d4 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java +++ b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java @@ -12,6 +12,7 @@ import net.minecraft.network.chat.ChatMessageContent; import net.minecraft.network.chat.ChatSender; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.FilterMask; import net.minecraft.network.chat.LastSeenMessages; import net.minecraft.network.chat.MessageSignature; import net.minecraft.network.chat.PlayerChatMessage; @@ -67,7 +68,7 @@ public class UnrealPlayer { new SignedMessageHeader(MessageSignature.EMPTY, this.id), MessageSignature.EMPTY, new SignedMessageBody(new ChatMessageContent(message, Component.literal(message)), Instant.now(), 0, LastSeenMessages.EMPTY), unsigned != null ? Optional.of(Component.literal(unsigned)) - : Optional.empty()), + : Optional.empty(), FilterMask.PASS_THROUGH), ChatType.bind(ChatType.CHAT, player).toNetwork(server.registryAccess())); diff --git a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java new file mode 100644 index 0000000..ace6058 --- /dev/null +++ b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java @@ -0,0 +1,133 @@ +package com.aizistral.nochatreports.debug.mixins; + +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import it.unimi.dsi.fastutil.objects.ObjectList; +import net.minecraft.network.chat.LastSeenMessages; +import net.minecraft.network.chat.LastSeenMessagesValidator; +import net.minecraft.network.chat.LastSeenMessagesValidator.ErrorCondition; + +@Mixin(LastSeenMessagesValidator.class) +public class MixinLastSeenMessageValidator { + @Shadow @Final + private static int NOT_FOUND; + + @Shadow + private LastSeenMessages lastSeenMessages = LastSeenMessages.EMPTY; + @Shadow @Final + private ObjectList<LastSeenMessages.Entry> pendingEntries; + + private int calculateIndices(List<LastSeenMessages.Entry> lastSeenEntries, int[] indexArray, @Nullable LastSeenMessages.Entry unseenEntry) { + int value = 0; + int counter = 0; + Arrays.fill(indexArray, NOT_FOUND); + + List<LastSeenMessages.Entry> previousSeenEntries = this.lastSeenMessages.entries(); + int previousSeenEntiresSize = previousSeenEntries.size(); + + for (counter = previousSeenEntiresSize - 1; counter >= 0; --counter) { + value = lastSeenEntries.indexOf(previousSeenEntries.get(counter)); + if (value == -1) { + continue; + } + indexArray[value] = -counter - 1; + } + + counter = NOT_FOUND; + value = this.pendingEntries.size(); + + for (int counter2 = 0; counter2 < value; ++counter2) { + LastSeenMessages.Entry pendingEntry = this.pendingEntries.get(counter2); + int pendingIndexInLastSeen = lastSeenEntries.indexOf(pendingEntry); + + if (pendingIndexInLastSeen != -1) { + indexArray[pendingIndexInLastSeen] = counter2; + } + + if (!pendingEntry.equals(unseenEntry)) { + continue; + } + + counter = counter2; + } + + return counter; + } + + public Set<ErrorCondition> validateAndUpdate(LastSeenMessages.Update update) { + EnumSet<ErrorCondition> errors = EnumSet.noneOf(ErrorCondition.class); + LastSeenMessages lastSeenMessages = update.lastSeen(); + LastSeenMessages.Entry unseenEntry = update.lastReceived().orElse(null); + List<LastSeenMessages.Entry> lastSeenEntries = lastSeenMessages.entries(); + + int previousSeenCount = this.lastSeenMessages.entries().size(); + int value = NOT_FOUND; + int lastSeenCount = lastSeenEntries.size(); + + if (lastSeenCount < previousSeenCount) { + errors.add(ErrorCondition.REMOVED_MESSAGES); + } + + int[] indexArray = new int[lastSeenCount]; + int indicesResult = this.calculateIndices(lastSeenEntries, indexArray, unseenEntry); + + for (int counter = lastSeenCount - 1; counter >= 0; --counter) { + int index = indexArray[counter]; + + if (index != NOT_FOUND) { + if (index < value) { + errors.add(ErrorCondition.OUT_OF_ORDER); + continue; + } + value = index; + continue; + } + + errors.add(ErrorCondition.UNKNOWN_MESSAGES); + } + + if (unseenEntry != null) { + if (indicesResult == NOT_FOUND || indicesResult < value) { + errors.add(ErrorCondition.UNKNOWN_MESSAGES); + } else { + value = indicesResult; + } + } + + if (value >= 0) { + this.pendingEntries.removeElements(0, value + 1); + } + + if (this.hasDuplicateProfiles(lastSeenMessages)) { + errors.add(ErrorCondition.DUPLICATED_PROFILES); + } + + this.lastSeenMessages = lastSeenMessages; + return errors; + } + + private boolean hasDuplicateProfiles(LastSeenMessages lastSeenMessages) { + HashSet<UUID> set = new HashSet<UUID>(lastSeenMessages.entries().size()); + + for (LastSeenMessages.Entry entry : lastSeenMessages.entries()) { + if (set.add(entry.profileId())) { + continue; + } + + return true; + } + + return false; + } + +} |
