Migrate to official mappings

Author: Alexander01998

.github/workflows/auto_snapshot_update.yml

@@ -61,15 +61,14 @@ jobs:
 
     - name: Migrate mappings
       run: |
-        ./gradlew migrateMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
-        ./gradlew migrateTestMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
-        ./gradlew migrateClassTweakerMappings --mappings ${{ inputs.yarn_mappings }} --overrideInputsIHaveABackup
+        ./gradlew migrateMappings --mappings "net.minecraft:mappings:${{ inputs.mc_version }}" --overrideInputsIHaveABackup
+        ./gradlew migrateGametestMappings --mappings "net.minecraft:mappings:${{ inputs.mc_version }}" --overrideInputsIHaveABackup
+        ./gradlew migrateClassTweakerMappings --mappings "net.minecraft:mappings:${{ inputs.mc_version }}" --overrideInputsIHaveABackup
 
     - name: Update version constants
       run: |
         python scripts/update_version_constants.py \
           "${{ inputs.mc_version }}" \
-          "${{ inputs.yarn_mappings }}" \
           "${{ inputs.fabric_loader }}" \
           "${{ inputs.fapi_version }}"
 

build.gradle

@@ -40,7 +40,7 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 

scripts/update_version_constants.py

@@ -2,7 +2,7 @@
 import re
 
 
-def update_gradle_properties(mc_version, yarn_mappings, fabric_loader, fapi_version):
+def update_gradle_properties(mc_version, fabric_loader, fapi_version):
 	print("Updating gradle.properties...")
 
 	# Read gradle.properties
@@ -12,7 +12,6 @@ def update_gradle_properties(mc_version, yarn_mappings, fabric_loader, fapi_vers
 	# Define replacements
 	replacements = {
 		"minecraft_version": lambda v: mc_version,
-		"yarn_mappings": lambda v: yarn_mappings,
 		"loader_version": lambda v: fabric_loader,
 		"fabric_version": lambda v: fapi_version,
 		"mod_version": lambda v: v[: v.index("MC") + 2] + mc_version,
@@ -70,14 +69,12 @@ def update_mc_version_constant(mc_version):
 if __name__ == "__main__":
 	parser = argparse.ArgumentParser()
 	parser.add_argument("mc_version", help="Minecraft version")
-	parser.add_argument("yarn_mappings", help="Yarn mappings version")
 	parser.add_argument("fabric_loader", help="Fabric Loader version")
 	parser.add_argument("fapi_version", help="Fabric API version")
 	args = parser.parse_args()
 
 	update_gradle_properties(
 		args.mc_version,
-		args.yarn_mappings,
 		args.fabric_loader,
 		args.fapi_version,
 	)

src/gametest/java/net/wurstclient/gametest/WurstClientTestHelper.java

@@ -24,6 +24,7 @@
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.system.MemoryUtil;
 
+import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
@@ -34,12 +35,11 @@
 import net.fabricmc.fabric.api.client.gametest.v1.screenshot.TestScreenshotComparisonAlgorithm.RawImage;
 import net.fabricmc.fabric.impl.client.gametest.screenshot.TestScreenshotComparisonAlgorithms.RawImageImpl;
 import net.fabricmc.fabric.impl.client.gametest.threading.ThreadingImpl;
-import net.minecraft.block.Block;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.texture.NativeImage;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
 
 public enum WurstClientTestHelper
 {
@@ -99,7 +99,7 @@ public static void assertScreenshotEquals(ClientGameTestContext context,
 
 	private static boolean[][] alphaChannelToMask(NativeImage template)
 	{
-		if(!template.getFormat().hasAlpha())
+		if(!template.format().hasAlpha())
 		{
 			int width = template.getWidth();
 			int height = template.getHeight();
@@ -115,15 +115,15 @@ private static boolean[][] alphaChannelToMask(NativeImage template)
 		boolean[][] mask = new boolean[width][height];
 
 		int size = width * height;
-		int alphaOffset = template.getFormat().getAlphaOffset() / 8;
-		int channelCount = template.getFormat().getChannelCount();
+		int alphaOffset = template.format().alphaOffset() / 8;
+		int channelCount = template.format().components();
 
 		for(int i = 0; i < size; i++)
 		{
 			int x = i % width;
 			int y = i / width;
 			int alpha = MemoryUtil.memGetByte(
-				template.pointer + i * channelCount + alphaOffset) & 0xff;
+				template.pixels + i * channelCount + alphaOffset) & 0xff;
 			mask[x][y] = alpha > 127;
 		}
 
@@ -172,7 +172,7 @@ public static NativeImage downloadImage(String url)
 	public static void hideSplashTexts(ClientGameTestContext context)
 	{
 		context.runOnClient(mc -> {
-			mc.options.getHideSplashTexts().setValue(true);
+			mc.options.hideSplashTexts().set(true);
 		});
 	}
 
@@ -183,20 +183,20 @@ public static void hideSplashTexts(ClientGameTestContext context)
 	public static void waitForTitleScreenFade(ClientGameTestContext context)
 	{
 		context.waitFor(mc -> {
-			if(!(mc.currentScreen instanceof TitleScreen titleScreen))
+			if(!(mc.screen instanceof TitleScreen titleScreen))
 				return false;
 
-			return !titleScreen.doBackgroundFade;
+			return !titleScreen.fading;
 		});
 	}
 
 	public static void runCommand(TestServerContext server, String command)
 	{
 		String commandWithPlayer = "execute as @p at @s run " + command;
 		server.runOnServer(mc -> {
-			ParseResults<ServerCommandSource> results =
-				mc.getCommandManager().getDispatcher().parse(commandWithPlayer,
-					mc.getCommandSource());
+			ParseResults<CommandSourceStack> results =
+				mc.getCommands().getDispatcher().parse(commandWithPlayer,
+					mc.createCommandSourceStack());
 
 			if(!results.getExceptions().isEmpty())
 			{
@@ -208,7 +208,7 @@ public static void runCommand(TestServerContext server, String command)
 				throw new RuntimeException(errors.toString());
 			}
 
-			mc.getCommandManager().execute(results, commandWithPlayer);
+			mc.getCommands().performCommand(results, commandWithPlayer);
 		});
 	}
 
@@ -288,14 +288,14 @@ public static String tryUploadToImgur(Path imagePath)
 	public static void waitForBlock(ClientGameTestContext context, int relX,
 		int relY, int relZ, Block block)
 	{
-		context.waitFor(mc -> mc.world
-			.getBlockState(mc.player.getBlockPos().add(relX, relY, relZ))
+		context.waitFor(mc -> mc.level
+			.getBlockState(mc.player.blockPosition().offset(relX, relY, relZ))
 			.getBlock() == block);
 	}
 
 	public static void clearChat(ClientGameTestContext context)
 	{
-		context.runOnClient(mc -> mc.inGameHud.getChatHud().clear(true));
+		context.runOnClient(mc -> mc.gui.getChat().clearMessages(true));
 	}
 
 	public static void clearInventory(ClientGameTestContext context)
@@ -308,7 +308,7 @@ public static void clearInventory(ClientGameTestContext context)
 
 	public static void clearParticles(ClientGameTestContext context)
 	{
-		context.runOnClient(mc -> mc.particleManager.clearParticles());
+		context.runOnClient(mc -> mc.particleEngine.clearParticles());
 	}
 
 	public static void clearToasts(ClientGameTestContext context)
@@ -320,8 +320,8 @@ public static void assertOneItemInSlot(ClientGameTestContext context,
 		int slot, Item item)
 	{
 		ItemStack stack = context
-			.computeOnClient(mc -> mc.player.getInventory().getStack(slot));
-		if(!stack.isOf(item) || stack.getCount() != 1)
+			.computeOnClient(mc -> mc.player.getInventory().getItem(slot));
+		if(!stack.is(item) || stack.getCount() != 1)
 			throw new RuntimeException(
 				"Expected 1 " + item.getName().getString() + " at slot " + slot
 					+ ", found " + stack.getCount() + " "
@@ -332,7 +332,7 @@ public static void assertNoItemInSlot(ClientGameTestContext context,
 		int slot)
 	{
 		ItemStack stack = context
-			.computeOnClient(mc -> mc.player.getInventory().getStack(slot));
+			.computeOnClient(mc -> mc.player.getInventory().getItem(slot));
 		if(!stack.isEmpty())
 			throw new RuntimeException("Expected no item in slot " + slot
 				+ ", found " + stack.getCount() + " "

src/gametest/java/net/wurstclient/gametest/WurstTest.java

@@ -24,12 +24,12 @@
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
 import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldBuilder;
 import net.minecraft.SharedConstants;
-import net.minecraft.block.Blocks;
-import net.minecraft.client.gui.screen.world.WorldCreator;
-import net.minecraft.world.GameRules;
-import net.minecraft.world.gen.chunk.FlatChunkGenerator;
-import net.minecraft.world.gen.chunk.FlatChunkGeneratorConfig;
-import net.minecraft.world.gen.chunk.FlatChunkGeneratorLayer;
+import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
+import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
 import net.wurstclient.gametest.tests.*;
 
 public class WurstTest implements FabricClientGameTest
@@ -55,10 +55,10 @@ public void runTest(ClientGameTestContext context)
 		LOGGER.info("Creating test world");
 		TestWorldBuilder worldBuilder = context.worldBuilder();
 		worldBuilder.adjustSettings(creator -> {
-			String mcVersion = SharedConstants.getGameVersion().getName();
-			creator.setWorldName("E2E Test " + mcVersion);
-			creator.setGameMode(WorldCreator.Mode.CREATIVE);
-			creator.getGameRules().get(GameRules.SEND_COMMAND_FEEDBACK)
+			String mcVersion = SharedConstants.getCurrentVersion().getName();
+			creator.setName("E2E Test " + mcVersion);
+			creator.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);
+			creator.getGameRules().getRule(GameRules.RULE_SENDCOMMANDFEEDBACK)
 				.set(false, null);
 			applyFlatPresetWithSmoothStone(creator);
 		});
@@ -138,19 +138,19 @@ private void testInWorld(ClientGameTestContext context,
 	}
 
 	// because the grass texture is randomized and smooth stone isn't
-	private void applyFlatPresetWithSmoothStone(WorldCreator creator)
+	private void applyFlatPresetWithSmoothStone(WorldCreationUiState creator)
 	{
-		FlatChunkGeneratorConfig config =
-			((FlatChunkGenerator)creator.getGeneratorOptionsHolder()
-				.selectedDimensions().getChunkGenerator()).getConfig();
-		
-		List<FlatChunkGeneratorLayer> layers =
-			List.of(new FlatChunkGeneratorLayer(1, Blocks.BEDROCK),
-				new FlatChunkGeneratorLayer(2, Blocks.DIRT),
-				new FlatChunkGeneratorLayer(1, Blocks.SMOOTH_STONE));
-		
-		creator.applyModifier((drm, dorHolder) -> dorHolder.with(drm,
-			new FlatChunkGenerator(config.with(layers,
-				config.getStructureOverrides(), config.getBiome()))));
+		FlatLevelGeneratorSettings config = ((FlatLevelSource)creator
+			.getSettings().selectedDimensions().overworld()).settings();
+		
+		List<FlatLayerInfo> layers =
+			List.of(new FlatLayerInfo(1, Blocks.BEDROCK),
+				new FlatLayerInfo(2, Blocks.DIRT),
+				new FlatLayerInfo(1, Blocks.SMOOTH_STONE));
+		
+		creator.updateDimensions(
+			(drm, dorHolder) -> dorHolder.replaceOverworldGenerator(drm,
+				new FlatLevelSource(config.withBiomeAndLayers(layers,
+					config.structureOverrides(), config.getBiome()))));
 	}
 }

src/gametest/java/net/wurstclient/gametest/mixin/ScreenMixin.java

@@ -13,15 +13,15 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.gui.AbstractParentElement;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.Drawable;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.util.Colors;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Renderable;
+import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.util.CommonColors;
 
 @Mixin(Screen.class)
-public abstract class ScreenMixin extends AbstractParentElement
-	implements Drawable
+public abstract class ScreenMixin extends AbstractContainerEventHandler
+	implements Renderable
 {
 	@Shadow
 	public int width;
@@ -32,13 +32,11 @@ public abstract class ScreenMixin extends AbstractParentElement
 	 * Replaces the panorama background with a gray background to make test
 	 * screenshots consistent.
 	 */
-	@Inject(at = @At("HEAD"),
-		method = "renderPanoramaBackground",
-		cancellable = true)
-	public void renderPanoramaBackground(DrawContext context, float deltaTicks,
+	@Inject(at = @At("HEAD"), method = "renderPanorama", cancellable = true)
+	public void renderPanoramaBackground(GuiGraphics context, float deltaTicks,
 		CallbackInfo ci)
 	{
-		context.fill(0, 0, width, height, Colors.GRAY);
+		context.fill(0, 0, width, height, CommonColors.GRAY);
 		ci.cancel();
 	}
 }

src/gametest/java/net/wurstclient/gametest/mixin/TitleScreenMixin.java

@@ -12,17 +12,17 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.text.Text;
-import net.minecraft.util.Colors;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.CommonColors;
 import net.wurstclient.WurstClient;
 
 @Mixin(TitleScreen.class)
 public abstract class TitleScreenMixin extends Screen
 {
-	private TitleScreenMixin(WurstClient wurst, Text title)
+	private TitleScreenMixin(WurstClient wurst, Component title)
 	{
 		super(title);
 	}
@@ -31,13 +31,11 @@ private TitleScreenMixin(WurstClient wurst, Text title)
 	 * Replaces the panorama background with a gray background to make test
 	 * screenshots consistent.
 	 */
-	@Inject(at = @At("HEAD"),
-		method = "renderPanoramaBackground",
-		cancellable = true)
-	public void renderPanoramaBackground(DrawContext context, float deltaTicks,
+	@Inject(at = @At("HEAD"), method = "renderPanorama", cancellable = true)
+	public void renderPanoramaBackground(GuiGraphics context, float deltaTicks,
 		CallbackInfo ci)
 	{
-		context.fill(0, 0, width, height, Colors.GRAY);
+		context.fill(0, 0, width, height, CommonColors.GRAY);
 		ci.cancel();
 	}
 }