From 1775cf5d77ed7f4e14562b6155bd4d388ca5d1fa Mon Sep 17 00:00:00 2001 From: zenfyr Date: Tue, 9 Jun 2026 12:01:29 +0700 Subject: [PATCH] testmod: port to 1.21.10 --- .../pulsar/test/autotest/BaseGameTest.java | 7 +++---- .../test/autotest/CreativeTabBuilderTest.java | 2 +- .../test/autotest/ServerReloadersEventTest.java | 9 ++++++--- .../client/CreativeTabAnimationTest.java | 12 +++++------- .../test/client/FabricClientTestHelper.java | 1 + .../pulsar/test/client/PulsarTestmodClient.java | 17 ++++++++++------- .../pulsar/test/server/ServerTestContext.java | 6 ++++-- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/BaseGameTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/BaseGameTest.java index 4461089..61a9e44 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/BaseGameTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/BaseGameTest.java @@ -2,20 +2,19 @@ package dev.zenfyr.pulsar.test.autotest; import com.mojang.logging.LogUtils; import dev.zenfyr.pulsar.test.util.Utils; -import net.fabricmc.fabric.api.gametest.v1.FabricGameTest; -import net.minecraft.gametest.framework.GameTest; +import net.fabricmc.fabric.api.gametest.v1.GameTest; import net.minecraft.gametest.framework.GameTestHelper; import org.spongepowered.asm.mixin.MixinEnvironment; public class BaseGameTest { - @GameTest(template = FabricGameTest.EMPTY_STRUCTURE) + @GameTest() public void mixinAudit(GameTestHelper helper) { MixinEnvironment.getCurrentEnvironment().audit(); helper.succeed(); } - @GameTest(template = FabricGameTest.EMPTY_STRUCTURE) + @GameTest() public void applyLateChecks(GameTestHelper helper) { Utils.runChecks(LogUtils.getLogger()); helper.succeed(); diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java index 878b0a6..a2c0f18 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java @@ -14,7 +14,7 @@ public class CreativeTabBuilderTest implements ModInitializer { @Override public void onInitialize() { - tab = CreativeModeTabBuilder.create(new ResourceLocation("pulsar", "test-tab")) + tab = CreativeModeTabBuilder.create(ResourceLocation.fromNamespaceAndPath("pulsar", "test-tab")) .entries(entries -> { entries.appendStacks( List.of(Items.APPLE.getDefaultInstance(), Items.CALCITE.getDefaultInstance()), true); diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java index 3e77d2e..9793a0c 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java @@ -8,13 +8,14 @@ import java.util.Objects; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener; import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; public class ServerReloadersEventTest implements ModInitializer { public static final ReloaderType TYPE = - ReloaderType.create(new ResourceLocation("pulsar", "test-reloader")); + ReloaderType.create(ResourceLocation.fromNamespaceAndPath("pulsar", "test-reloader")); private static String trigger = null; @Override @@ -47,8 +48,10 @@ public class ServerReloadersEventTest implements ModInitializer { context.reloader(TYPE).getFabricId(), context .registryAccess() - .registryOrThrow(Registries.DIMENSION_TYPE) - .get(new ResourceLocation("overworld"))); + .lookupOrThrow(Registries.DIMENSION_TYPE) + .get(ResourceKey.create( + Registries.DIMENSION_TYPE, + ResourceLocation.withDefaultNamespace("overworld")))); } } } diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java index da2fd03..cbd3ecb 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java @@ -1,6 +1,5 @@ package dev.zenfyr.pulsar.test.autotest.client; -import com.mojang.math.Axis; import dev.zenfyr.pulsar.creativetab.CreativeModeTabAnimaton; import dev.zenfyr.pulsar.test.autotest.CreativeTabBuilderTest; import dev.zenfyr.pulsar.test.client.ClientTestContext; @@ -9,7 +8,6 @@ import dev.zenfyr.pulsar.test.util.AutoTest; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.impl.client.itemgroup.CreativeGuiExtensions; import net.minecraft.Util; import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen; import net.minecraft.world.item.Items; @@ -22,11 +20,11 @@ public class CreativeTabAnimationTest implements ClientModInitializer, ClientTes var stack = Items.SPRUCE_SIGN.getDefaultInstance(); CreativeModeTabAnimaton.setIconAnimation( CreativeTabBuilderTest.tab, (group, context, itemX, itemY, selected, isTopRow) -> { - context.pose().pushPose(); - context.pose().translate(itemX, itemY, 100); - context.pose().mulPose(Axis.ZN.rotationDegrees(Util.getMillis() * 0.05f)); + context.pose().pushMatrix(); + context.pose().translate(itemX, itemY); + context.pose().rotate(Util.getMillis() * 0.05f); context.renderItem(stack, -8, -8); - context.pose().popPose(); + context.pose().popMatrix(); }); } @@ -36,7 +34,7 @@ public class CreativeTabAnimationTest implements ClientModInitializer, ClientTes minecraft.player, minecraft.level.enabledFeatures(), false)); context.waitForLevelTicks(10); context.executeForScreen(CreativeModeInventoryScreen.class, (client, screen) -> { - ((CreativeGuiExtensions) screen).fabric_nextPage(); + screen.switchToNextPage(); return null; }); context.takeScreenshot("creative-tab-animation"); diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/client/FabricClientTestHelper.java b/src/testmod/java/dev/zenfyr/pulsar/test/client/FabricClientTestHelper.java index f4307b0..ec96ca4 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/client/FabricClientTestHelper.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/client/FabricClientTestHelper.java @@ -73,6 +73,7 @@ public final class FabricClientTestHelper { FabricLoader.getInstance().getGameDir().toFile(), name + "-" + Utils.STAMP + ".png", client.getMainRenderTarget(), + 1, (message) -> {}); return null; }); diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java b/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java index 27d0cf0..21ae78a 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java @@ -12,6 +12,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.core.registries.Registries; import net.minecraft.world.Difficulty; +import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.GameType; import net.minecraft.world.level.LevelSettings; @@ -61,20 +62,22 @@ public class PulsarTestmodClient implements ClientModInitializer { false, Difficulty.PEACEFUL, true, - new GameRules(), + new GameRules(FeatureFlagSet.of()), WorldDataConfiguration.DEFAULT), new WorldOptions(0, true, false), registryManager -> registryManager - .registryOrThrow(Registries.WORLD_PRESET) - .getHolderOrThrow(WorldPresets.FLAT) + .lookupOrThrow(Registries.WORLD_PRESET) + .getOrThrow(WorldPresets.FLAT) .value() - .createWorldDimensions()); + .createWorldDimensions(), + new TitleScreen()); } else { - client.createWorldOpenFlows().loadLevel(new TitleScreen(), levelName); + client.createWorldOpenFlows().openWorld(levelName, () -> Minecraft.getInstance() + .setScreen(new TitleScreen())); } } catch (Throwable t) { CrashReport report = CrashReport.forThrowable(t, "Setting tests world"); - Minecraft.crash(report); + Minecraft.crash(Minecraft.getInstance(), Minecraft.getInstance().gameDirectory, report); } })); @@ -83,7 +86,7 @@ public class PulsarTestmodClient implements ClientModInitializer { log.info("Started client test."); ClientTestContext context = new ClientTestContext(Minecraft.getInstance()); context.waitForLevelTicks(200); - GLFW.glfwShowWindow(context.client().getWindow().getWindow()); + GLFW.glfwShowWindow(context.client().getWindow().handle()); FabricLoader.getInstance() .invokeEntrypoints( diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/server/ServerTestContext.java b/src/testmod/java/dev/zenfyr/pulsar/test/server/ServerTestContext.java index 2490c25..f2a460e 100644 --- a/src/testmod/java/dev/zenfyr/pulsar/test/server/ServerTestContext.java +++ b/src/testmod/java/dev/zenfyr/pulsar/test/server/ServerTestContext.java @@ -12,8 +12,10 @@ import net.minecraft.server.MinecraftServer; public record ServerTestContext(MinecraftServer server) implements TestContext { public void sendCommand(String command) { - submitAndWait(server -> - server.getCommands().performPrefixedCommand(server.createCommandSourceStack(), command)); + submitAndWait(server -> { + server.getCommands().performPrefixedCommand(server.createCommandSourceStack(), command); + return null; + }); } public void waitForOverworldTicks(long ticks) { -- 2.51.2