Skip to content

Commit 53d7b83

Browse files
committed
✅ Upgrade integration testing for 1.21.11
1 parent 06be2cc commit 53d7b83

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
}
2525

2626
minecraftRemapper {
27-
version = "1.21.9"
27+
version = "1.21.11"
2828
directionType = 'CLIENT'
2929
includeRemappedJarDependency = true
3030
includeLibrariesDependency = true

core/src/integrationTest/java/net/transferproxy/test/IntegrationHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private StartedMinecraft<TestAgent> launchMinecraft() {
178178
.authentication(Auth.byUsername(PLAYER_NAME))
179179
.gameArguments(List.of("--offlineDeveloperMode"))
180180
.processDirectory(this.cacheDirectory)
181-
.inheritIO(false))
181+
.inheritIO(true))
182182
.start();
183183
}
184184

core/src/integrationTest/java/net/transferproxy/test/agent/TestAgentImpl.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@
2828
import net.minecraft.client.Options;
2929
import net.minecraft.client.gui.screens.ConnectScreen;
3030
import net.minecraft.client.gui.screens.TitleScreen;
31+
import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
3132
import net.minecraft.client.multiplayer.ServerData;
3233
import net.minecraft.client.multiplayer.ServerStatusPinger;
3334
import net.minecraft.client.multiplayer.resolver.ServerAddress;
3435
import net.minecraft.server.level.ParticleStatus;
36+
import net.minecraft.server.network.EventLoopGroupHolder;
3537
import net.minecraft.world.entity.HumanoidArm;
3638
import net.minecraft.world.entity.player.ChatVisiblity;
3739
import net.minecraft.world.entity.player.PlayerModelPart;
@@ -57,7 +59,7 @@ public void connect(final String host, final int port) throws RemoteException {
5759
Minecraft.getInstance().schedule(() -> {
5860
final Minecraft minecraft = Minecraft.getInstance();
5961
final ServerAddress address = new ServerAddress(host, port);
60-
ConnectScreen.startConnecting(minecraft.screen,
62+
ConnectScreen.startConnecting(new JoinMultiplayerScreen(new TitleScreen()),
6163
minecraft,
6264
address,
6365
new ServerData("Test", address.toString(), ServerData.Type.OTHER),
@@ -88,8 +90,11 @@ public SimpleStatusResponse requestStatus(final String host, final int port) thr
8890
final ServerData serverData = new ServerData("Test", host + ":" + port, ServerData.Type.OTHER);
8991
final CompletableFuture<SimpleStatusResponse> future = new CompletableFuture<>();
9092
try {
91-
this.serverStatusPinger.pingServer(serverData, () -> {
92-
}, new StatusResponseCallback(serverData, future));
93+
this.serverStatusPinger.pingServer(serverData,
94+
() -> {
95+
},
96+
new StatusResponseCallback(serverData, future),
97+
EventLoopGroupHolder.remote(Minecraft.getInstance().options.useNativeTransport()));
9398
} catch (final UnknownHostException e) {
9499
future.completeExceptionally(e);
95100
}

0 commit comments

Comments
 (0)