From 0ae63b0b07cd61c204383c6c59bd643e80a32c86 Mon Sep 17 00:00:00 2001 From: RealMangoRage Date: Sun, 30 Apr 2023 14:57:52 -0700 Subject: [PATCH] Fixes ChatScreen calling .setScreen (#9443) Fix test compile failures also. --- .../client/gui/screens/ChatScreen.java.patch | 11 +++++++ .../debug/chat/ClientCommandTest.java | 6 +++- .../debug/client/TestScreen.java | 32 +++++++++++++++++++ .../debug/world/LoginPacketSplitTest.java | 5 +-- 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 patches/minecraft/net/minecraft/client/gui/screens/ChatScreen.java.patch create mode 100644 src/test/java/net/minecraftforge/debug/client/TestScreen.java diff --git a/patches/minecraft/net/minecraft/client/gui/screens/ChatScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/screens/ChatScreen.java.patch new file mode 100644 index 0000000000..779ef5682f --- /dev/null +++ b/patches/minecraft/net/minecraft/client/gui/screens/ChatScreen.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/client/gui/screens/ChatScreen.java ++++ b/net/minecraft/client/gui/screens/ChatScreen.java +@@ -225,7 +_,7 @@ + this.f_96541_.f_91074_.f_108617_.m_246175_(p_242400_); + } + +- return true; ++ return f_96541_.f_91080_ == this; // FORGE: Prevent closing the screen if another screen has been opened. + } + } + diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java index a85da5b25f..0266952819 100644 --- a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java @@ -16,6 +16,7 @@ import net.minecraft.commands.arguments.TeamArgument; import net.minecraft.commands.arguments.coordinates.BlockPosArgument; import net.minecraft.commands.synchronization.SuggestionProviders; import net.minecraft.network.chat.Component; +import net.minecraftforge.debug.client.TestScreen; import net.minecraftforge.client.event.RegisterClientCommandsEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; @@ -104,7 +105,10 @@ public class ClientCommandTest .executes((context) -> { context.getSource().sendSuccess(Component.literal("Executed command"), false); return 1; - }))); + })) + // Used for testing the screen after using commands + .then(Commands.literal("screentest") + .executes((stack) -> TestScreen.open()))); // Used for testing that client command redirects can only be used with client commands LiteralArgumentBuilder fork = Commands.literal("clientcommandfork"); diff --git a/src/test/java/net/minecraftforge/debug/client/TestScreen.java b/src/test/java/net/minecraftforge/debug/client/TestScreen.java new file mode 100644 index 0000000000..d2dc6d3b25 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/client/TestScreen.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.debug.client; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.brigadier.Command; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; + +public class TestScreen extends Screen +{ + public static int open() + { + Minecraft.getInstance().setScreen(new TestScreen()); + return Command.SINGLE_SUCCESS; + } + + public TestScreen() + { + super(Component.literal("testscreen")); + } + + @Override + public void render(PoseStack PoseStack, int MouseX, int MouseY, float PartialTick) + { + renderBackground(PoseStack); + } +} diff --git a/src/test/java/net/minecraftforge/debug/world/LoginPacketSplitTest.java b/src/test/java/net/minecraftforge/debug/world/LoginPacketSplitTest.java index 53d9ab599d..03f6d2c17e 100644 --- a/src/test/java/net/minecraftforge/debug/world/LoginPacketSplitTest.java +++ b/src/test/java/net/minecraftforge/debug/world/LoginPacketSplitTest.java @@ -66,6 +66,7 @@ import java.util.stream.Collectors; * To test if the packet is too large simply remove the login packet from the {@link net.minecraftforge.network.filters.ForgeConnectionNetworkFilter} * and try connecting again. You should see the connection fail. */ + @Mod(LoginPacketSplitTest.MOD_ID) public class LoginPacketSplitTest { @@ -133,7 +134,7 @@ public class LoginPacketSplitTest record RegistryData(Registry registry) { } - buf.writeWithCodec(RecordCodecBuilder.create(in -> in.group( + buf.writeJsonWithCodec(RecordCodecBuilder.create(in -> in.group( RegistryCodecs.networkCodec(BIG_DATA, Lifecycle.stable(), BigData.CODEC).fieldOf("registry").forGetter(RegistryData::registry) ).apply(in, RegistryData::new)), new RegistryData(dummyRegistry)); // RegistryCodecs.networkCodec returns a list codec, and writeWithNbt doesn't like non-compounds @@ -174,7 +175,7 @@ public class LoginPacketSplitTest final JsonObject mcmeta = new JsonObject(); final JsonObject packJson = new JsonObject(); packJson.addProperty("description", "A virtual resource pack."); - packJson.addProperty("pack_format", SharedConstants.getCurrentVersion().getPackVersion(com.mojang.bridge.game.PackType.DATA)); + packJson.addProperty("pack_format", SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA)); mcmeta.add("pack", packJson); putRoot("pack.mcmeta", mcmeta);