summaryrefslogtreecommitdiffstats
path: root/src/test/java/com
diff options
context:
space:
mode:
authorAizistral2022-10-31 20:28:53 +0100
committerAizistral2022-10-31 20:28:53 +0100
commitd80460d3b6e3b7d6ff09bbcc50840f8da4932fd9 (patch)
tree8a91dc4cf1245ee61e505e60cfc14a05b545ebe0 /src/test/java/com
parentd081e49c2fa3208090a905dd57611e8ab3c78fa5 (diff)
This is not going to be easy
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java7
-rw-r--r--src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java80
-rw-r--r--src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java2
-rw-r--r--src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java133
4 files changed, 42 insertions, 180 deletions
diff --git a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java
index cd29454..3d04e27 100644
--- a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java
+++ b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java
@@ -2,7 +2,6 @@ package com.aizistral.nochatreports.debug;
import java.util.UUID;
-import com.aizistral.nochatreports.NoChatReports;
import com.mojang.authlib.minecraft.BanDetails;
import net.fabricmc.api.ModInitializer;
@@ -21,9 +20,9 @@ public final class NoChatReportsDebug implements ModInitializer {
private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) {
server.execute(() -> {
UnrealPlayer player = new UnrealPlayer(UUID.fromString("069a79f4-44e9-4726-a5be-fca90e38aaf5"), "Notch");
- player.join(server, handler);
+ //player.join(server, handler);
Component component = Component.Serializer.fromJson("{\"translate\":\"%s\",\"with\":[{\"extra\":[{\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/tell Aizistral \"},\"hoverEvent\":{\"action\":\"show_entity\",\"contents\":{\"id\":\"bfa45411-874a-4ee0-b3bd-00c716059d95\",\"name\":{\"text\":\"Aizistral\"},\"type\":\"minecraft:player\"}},\"insertion\":\"Aizistral\",\"text\":\"Aizistral\"},{\"text\":\"> \"},{\"text\":\"['(9^~©²~.2>5¶(4,+:.9!¿¿\"}],\"text\":\"<\"},{\"text\":\"['(9^~©²~.2>5¶(4,+:.9!¿¿\"}]}");
- player.sendSystem(server, handler, component);
+ //player.sendSystem(server, handler, component);
//player.sendMessage(server, handler, "This message is so real and legit", null);
@@ -32,7 +31,7 @@ public final class NoChatReportsDebug implements ModInitializer {
//UnrealPlayer.DEFAULT.sendMessage(server, handler, "gOODBYE LOL", null);
//UnrealPlayer.DEFAULT.leave(server, handler);
- NoChatReports.LOGGER.info("Unreal player deployed");
+ //NoChatReports.LOGGER.info("Unreal player deployed");
});
}
diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java
index 3b000d9..dd8b3ad 100644
--- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java
+++ b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java
@@ -8,7 +8,6 @@ import javax.annotation.Nullable;
import com.mojang.authlib.GameProfile;
-import net.minecraft.network.chat.ChatMessageContent;
import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.FilterMask;
@@ -16,11 +15,8 @@ import net.minecraft.network.chat.LastSeenMessages;
import net.minecraft.network.chat.MessageSignature;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.network.chat.SignedMessageBody;
-import net.minecraft.network.chat.SignedMessageHeader;
import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket;
-import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket;
import net.minecraft.network.protocol.game.ClientboundSystemChatPacket;
-import net.minecraft.network.protocol.game.ClientboundPlayerInfoPacket.Action;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -45,43 +41,43 @@ public class UnrealPlayer {
this.name = name;
}
- public void join(MinecraftServer server, ServerGamePacketListenerImpl connection) {
- ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.ADD_PLAYER,
- this.getPlayer(server));
- connection.send(packet);
- }
-
- public void leave(MinecraftServer server, ServerGamePacketListenerImpl connection) {
- ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.REMOVE_PLAYER,
- this.getPlayer(server));
- connection.send(packet);
- }
-
- public ServerPlayer getPlayer(MinecraftServer server) {
- return new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null);
- }
-
- public void sendSystem(MinecraftServer server, ServerGamePacketListenerImpl connection, Component message) {
- ServerPlayer player = this.getPlayer(server);
- ClientboundSystemChatPacket packet = new ClientboundSystemChatPacket(message, false);
- connection.send(packet);
- }
-
- public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message, @Nullable String unsigned) {
- ServerPlayer player = this.getPlayer(server);
- ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(new PlayerChatMessage(
- 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(), FilterMask.PASS_THROUGH),
- ChatType.bind(ChatType.CHAT, player).toNetwork(server.registryAccess()));
-
-
- // new ClientboundPlayerChatPacket(Component.literal(message),
- // unsigned != null ? Optional.of(Component.literal(unsigned)) : Optional.empty(), 0,
- // new ChatSender(this.id, Component.literal(this.name)), Instant.now(),
- // Crypt.SaltSignaturePair.EMPTY);
- connection.send(packet);
- }
+ // public void join(MinecraftServer server, ServerGamePacketListenerImpl connection) {
+ // ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.ADD_PLAYER,
+ // this.getPlayer(server));
+ // connection.send(packet);
+ // }
+ //
+ // public void leave(MinecraftServer server, ServerGamePacketListenerImpl connection) {
+ // ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.REMOVE_PLAYER,
+ // this.getPlayer(server));
+ // connection.send(packet);
+ // }
+ //
+ // public ServerPlayer getPlayer(MinecraftServer server) {
+ // return new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null);
+ // }
+ //
+ // public void sendSystem(MinecraftServer server, ServerGamePacketListenerImpl connection, Component message) {
+ // ServerPlayer player = this.getPlayer(server);
+ // ClientboundSystemChatPacket packet = new ClientboundSystemChatPacket(message, false);
+ // connection.send(packet);
+ // }
+ //
+ // public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message, @Nullable String unsigned) {
+ // ServerPlayer player = this.getPlayer(server);
+ // ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(new PlayerChatMessage(
+ // 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(), FilterMask.PASS_THROUGH),
+ // ChatType.bind(ChatType.CHAT, player).toNetwork(server.registryAccess()));
+ //
+ //
+ // // new ClientboundPlayerChatPacket(Component.literal(message),
+ // // unsigned != null ? Optional.of(Component.literal(unsigned)) : Optional.empty(), 0,
+ // // new ChatSender(this.id, Component.literal(this.name)), Instant.now(),
+ // // Crypt.SaltSignaturePair.EMPTY);
+ // connection.send(packet);
+ // }
}
diff --git a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java
index aa16ae1..a3e7339 100644
--- a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java
+++ b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java
@@ -29,7 +29,7 @@ public class MixinAbuseReportSenderServices {
@Overwrite
public CompletableFuture<Unit> send(UUID uuid, AbuseReport abuseReport) {
- AbuseReportRequest abuseReportRequest = new AbuseReportRequest(uuid,
+ AbuseReportRequest abuseReportRequest = new AbuseReportRequest(1, uuid,
abuseReport, this.environment.clientInfo(), this.environment.thirdPartyServerInfo(),
this.environment.realmInfo());
ReportWriter.saveReport(abuseReportRequest);
diff --git a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java
deleted file mode 100644
index ace6058..0000000
--- a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinLastSeenMessageValidator.java
+++ /dev/null
@@ -1,133 +0,0 @@
-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;
- }
-
-}