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

@@ -29,7 +29,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/main/java/net/wurstclient/Feature.java

@@ -13,7 +13,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 import net.wurstclient.event.EventManager;
 import net.wurstclient.keybinds.PossibleKeybind;
 import net.wurstclient.mixinterface.IMinecraftClient;
@@ -24,7 +24,7 @@ public abstract class Feature
 {
 	protected static final WurstClient WURST = WurstClient.INSTANCE;
 	protected static final EventManager EVENTS = WURST.getEventManager();
-	protected static final MinecraftClient MC = WurstClient.MC;
+	protected static final Minecraft MC = WurstClient.MC;
 	protected static final IMinecraftClient IMC = WurstClient.IMC;
 
 	private final LinkedHashMap<String, Setting> settings =

src/main/java/net/wurstclient/FriendsList.java

@@ -15,8 +15,8 @@
 
 import com.google.gson.JsonArray;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 import net.wurstclient.commands.FriendsCmd;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.util.json.JsonException;
@@ -52,7 +52,7 @@ public void removeAllAndSave()
 
 	public void middleClick(Entity entity)
 	{
-		if(entity == null || !(entity instanceof PlayerEntity))
+		if(entity == null || !(entity instanceof Player))
 			return;
 
 		FriendsCmd friendsCmd = WurstClient.INSTANCE.getCmds().friendsCmd;

src/main/java/net/wurstclient/RotationFaker.java

@@ -7,8 +7,8 @@
  */
 package net.wurstclient;
 
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.phys.Vec3;
 import net.wurstclient.events.PostMotionListener;
 import net.wurstclient.events.PreMotionListener;
 import net.wurstclient.util.Rotation;
@@ -29,11 +29,11 @@ public void onPreMotion()
 		if(!fakeRotation)
 			return;
 
-		ClientPlayerEntity player = WurstClient.MC.player;
-		realYaw = player.getYaw();
-		realPitch = player.getPitch();
-		player.setYaw(serverYaw);
-		player.setPitch(serverPitch);
+		LocalPlayer player = WurstClient.MC.player;
+		realYaw = player.getYRot();
+		realPitch = player.getXRot();
+		player.setYRot(serverYaw);
+		player.setXRot(serverPitch);
 	}
 
 	@Override
@@ -42,50 +42,50 @@ public void onPostMotion()
 		if(!fakeRotation)
 			return;
 
-		ClientPlayerEntity player = WurstClient.MC.player;
-		player.setYaw(realYaw);
-		player.setPitch(realPitch);
+		LocalPlayer player = WurstClient.MC.player;
+		player.setYRot(realYaw);
+		player.setXRot(realPitch);
 		fakeRotation = false;
 	}
 
-	public void faceVectorPacket(Vec3d vec)
+	public void faceVectorPacket(Vec3 vec)
 	{
 		Rotation needed = RotationUtils.getNeededRotations(vec);
-		ClientPlayerEntity player = WurstClient.MC.player;
+		LocalPlayer player = WurstClient.MC.player;
 
 		fakeRotation = true;
 		serverYaw =
-			RotationUtils.limitAngleChange(player.getYaw(), needed.yaw());
+			RotationUtils.limitAngleChange(player.getYRot(), needed.yaw());
 		serverPitch = needed.pitch();
 	}
 
-	public void faceVectorClient(Vec3d vec)
+	public void faceVectorClient(Vec3 vec)
 	{
 		Rotation needed = RotationUtils.getNeededRotations(vec);
 
-		ClientPlayerEntity player = WurstClient.MC.player;
-		player.setYaw(
-			RotationUtils.limitAngleChange(player.getYaw(), needed.yaw()));
-		player.setPitch(needed.pitch());
+		LocalPlayer player = WurstClient.MC.player;
+		player.setYRot(
+			RotationUtils.limitAngleChange(player.getYRot(), needed.yaw()));
+		player.setXRot(needed.pitch());
 	}
 
-	public void faceVectorClientIgnorePitch(Vec3d vec)
+	public void faceVectorClientIgnorePitch(Vec3 vec)
 	{
 		Rotation needed = RotationUtils.getNeededRotations(vec);
 
-		ClientPlayerEntity player = WurstClient.MC.player;
-		player.setYaw(
-			RotationUtils.limitAngleChange(player.getYaw(), needed.yaw()));
-		player.setPitch(0);
+		LocalPlayer player = WurstClient.MC.player;
+		player.setYRot(
+			RotationUtils.limitAngleChange(player.getYRot(), needed.yaw()));
+		player.setXRot(0);
 	}
 
 	public float getServerYaw()
 	{
-		return fakeRotation ? serverYaw : WurstClient.MC.player.getYaw();
+		return fakeRotation ? serverYaw : WurstClient.MC.player.getYRot();
 	}
 
 	public float getServerPitch()
 	{
-		return fakeRotation ? serverPitch : WurstClient.MC.player.getPitch();
+		return fakeRotation ? serverPitch : WurstClient.MC.player.getXRot();
 	}
 }

src/main/java/net/wurstclient/WurstClient.java

@@ -14,7 +14,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 import net.wurstclient.altmanager.AltManager;
 import net.wurstclient.altmanager.Encryption;
 import net.wurstclient.analytics.PlausibleAnalytics;
@@ -47,7 +47,7 @@ public enum WurstClient
 {
 	INSTANCE;
 
-	public static MinecraftClient MC;
+	public static Minecraft MC;
 	public static IMinecraftClient IMC;
 
 	public static final String VERSION = "7.51.1";
@@ -80,7 +80,7 @@ public void initialize()
 	{
 		System.out.println("Starting Wurst Client...");
 
-		MC = MinecraftClient.getInstance();
+		MC = Minecraft.getInstance();
 		IMC = (IMinecraftClient)MC;
 		wurstFolder = createWurstFolder();
 
@@ -145,7 +145,7 @@ public void initialize()
 
 	private Path createWurstFolder()
 	{
-		Path dotMinecraftFolder = MC.runDirectory.toPath().normalize();
+		Path dotMinecraftFolder = MC.gameDirectory.toPath().normalize();
 		Path wurstFolder = dotMinecraftFolder.resolve("wurst");
 
 		try