From 39a9692c9c3a8414f37660e7ed022695ab675215 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 27 Jul 2022 22:04:20 +0200 Subject: Update to 1.19.1 --- build.gradle | 17 +++ docs/README.md | 2 +- gradle.properties | 8 +- .../com/aizistral/nochatreports/NoChatReports.java | 1 + .../server/MixinServerGamePacketListenerImpl.java | 2 +- src/main/resources/fabric.mod.json | 2 +- .../nochatreports/debug/UnrealPlayer.java | 3 +- .../mixins/MixinLastSeenMessageValidator.java | 133 +++++++++++++++++++++ 8 files changed, 160 insertions(+), 8 deletions(-) create mode 100644 src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java diff --git a/build.gradle b/build.gradle index 9ccf11e..ee7d355 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,24 @@ java { // withSourcesJar() } +task testJar (type: Jar) { + classifier = 'test' + from sourceSets.test.output + testJar.finalizedBy('prepareRemapJar') + testJar.finalizedBy('remapJar') + + from("LICENSE") { + // NO-OP + } + + doFirst { + remapJar.classifier = 'test-reobf' + remapJar.inputFile = testJar.outputs.files.singleFile + } +} + jar { + from("LICENSE") { // NO-OP } diff --git a/docs/README.md b/docs/README.md index bc03615..f77382e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # No Chat Reports -**Current Version:** 1.19.1-rc2-v1.6.0 +**Current Version:** 1.19.1-v1.7.0 **Minecraft Version:** 1.19.x diff --git a/gradle.properties b/gradle.properties index 31c8cbb..9ad907d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.19.1-rc2 -yarn_mappings=1.19.1-rc2+build.1 +minecraft_version=1.19.1 +yarn_mappings=1.19.1+build.1 loader_version=0.14.8 # Mod Properties -mod_version=1.19.1-rc2-v1.6.0 +mod_version=1.19.1-v1.7.0 maven_group=com.aizistral.nochatreports archives_base_name=NoChatReports-FABRIC # Dependencies -fabric_version=0.58.0+1.19.1 +fabric_version=0.58.4+1.19.1 # Publishing curse_id=634062 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/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 pendingEntries; + + private int calculateIndices(List lastSeenEntries, int[] indexArray, @Nullable LastSeenMessages.Entry unseenEntry) { + int value = 0; + int counter = 0; + Arrays.fill(indexArray, NOT_FOUND); + + List 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 validateAndUpdate(LastSeenMessages.Update update) { + EnumSet errors = EnumSet.noneOf(ErrorCondition.class); + LastSeenMessages lastSeenMessages = update.lastSeen(); + LastSeenMessages.Entry unseenEntry = update.lastReceived().orElse(null); + List 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 set = new HashSet(lastSeenMessages.entries().size()); + + for (LastSeenMessages.Entry entry : lastSeenMessages.entries()) { + if (set.add(entry.profileId())) { + continue; + } + + return true; + } + + return false; + } + +} -- cgit v1.2.3