From a6a3bb65d8dbe0ec8de6c2f1d4ae77553a2bd3bf Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 6 Jul 2022 23:42:05 +0200 Subject: More testmod --- .../nochatreports/debug/NoChatReportsDebug.java | 19 ++++++++++++++++--- .../aizistral/nochatreports/debug/UnrealPlayer.java | 9 ++++++--- .../nochatreports/debug/mixins/MixinMinecraft.java | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 src/test/java/com/aizistral/nochatreports/debug/mixins/MixinMinecraft.java (limited to 'src/test/java/com') diff --git a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java index 467d913..fa8a588 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java +++ b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java @@ -9,6 +9,7 @@ import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.network.ServerChannelHandler; import com.mojang.authlib.GameProfile; +import com.mojang.authlib.minecraft.BanDetails; import com.mojang.authlib.minecraft.UserApiService; import net.fabricmc.api.ClientModInitializer; @@ -18,6 +19,7 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.reporting.ChatReportScreen; import net.minecraft.client.multiplayer.chat.LoggedChat; @@ -38,11 +40,22 @@ public class NoChatReportsDebug implements ModInitializer { private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) { server.execute(() -> { - UnrealPlayer.DEFAULT.join(server, handler); - UnrealPlayer.DEFAULT.sendMessage(server, handler, "Helo"); - UnrealPlayer.DEFAULT.sendMessage(server, handler, "I am fake af"); + UnrealPlayer player = new UnrealPlayer(UUID.randomUUID(), "Notch"); + player.join(server, handler); + //player.sendMessage(server, handler, "This message is so real and legit", null); + + //UnrealPlayer.DEFAULT.join(server, handler); + //UnrealPlayer.DEFAULT.sendMessage(server, handler, "I'm definitely not gay", "§8I§a'§bM §cG§dA§eY"); + //UnrealPlayer.DEFAULT.sendMessage(server, handler, "gOODBYE LOL", null); + //UnrealPlayer.DEFAULT.leave(server, handler); NoChatReports.LOGGER.info("Unreal player deployed"); }); } + + public static BanDetails getFakeBan() { + return new BanDetails(UUID.fromString(Minecraft.getInstance().getUser().getUuid()), + null, null, null); + } + } diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java index d28f07e..fd9774a 100644 --- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java +++ b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java @@ -4,6 +4,8 @@ import java.time.Instant; import java.util.Optional; import java.util.UUID; +import javax.annotation.Nullable; + import com.mojang.authlib.GameProfile; import net.minecraft.network.chat.ChatSender; @@ -48,10 +50,11 @@ public class UnrealPlayer { connection.send(packet); } - public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message) { + public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message, @Nullable String unsigned) { ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(Component.literal(message), - Optional.empty(), 0, new ChatSender(this.id, Component.literal(this.name)), Instant.now(), - Crypt.SaltSignaturePair.EMPTY); + 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/MixinMinecraft.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinMinecraft.java new file mode 100644 index 0000000..de36f8f --- /dev/null +++ b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinMinecraft.java @@ -0,0 +1,19 @@ +package com.aizistral.nochatreports.debug.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import com.aizistral.nochatreports.debug.NoChatReportsDebug; +import com.mojang.authlib.minecraft.BanDetails; + +import net.minecraft.client.Minecraft; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Overwrite + public BanDetails multiplayerBan() { + return NoChatReportsDebug.getFakeBan(); + } + +} -- cgit v1.2.3