Merge remote-tracking branch 'upstream/26.1' into 26.1

Author: cev-api

.github/workflows/dependency_graph.yml

@@ -24,10 +24,10 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v6
 
-    - name: Set up Java 21
+    - name: Set up Java 25
       uses: actions/setup-java@v5
       with:
-        java-version: "21"
+        java-version: "25"
         distribution: "microsoft"
 
     - name: Grant execute permission for gradlew

.github/workflows/gradle.yml

@@ -38,10 +38,10 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v6
 
-    - name: Set up Java 21
+    - name: Set up Java 25
       uses: actions/setup-java@v5
       with:
-        java-version: "21"
+        java-version: "25"
         distribution: "microsoft"
 
     - name: Grant execute permission for gradlew

.github/workflows/publish.yml

@@ -44,10 +44,10 @@ jobs:
         # Include all tags in case the new tag already exists.
         fetch-tags: true
 
-    - name: Set up Java 21
+    - name: Set up Java 25
       uses: actions/setup-java@v5
       with:
-        java-version: "21"
+        java-version: "25"
         distribution: "microsoft"
 
     - name: Grant execute permission for gradlew

README.md

@@ -1,4 +1,4 @@
-# Wurst Client v7.53 (MC1.21.11) - Modified by CevAPI 
+# Wurst Client v7.53 (MC26.1) - Modified by CevAPI 
 
 ![CevAPI Logo](https://i.imgur.com/kBIn9Ab.png)
 
@@ -12,7 +12,9 @@
 - [1.21.1 - Not Updated](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.1)
 - [1.21.8 - Not Updated](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.8)
 - [1.21.10 - Not Updated](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.10)
-- [1.21.11 - Latest/Recommended (Based on 1.21.10)](https://github.com/cev-api/Wurst7-CevAPI/tree/master)
+- [1.21.11 - Recommended](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.11)
+- [26.1 - Latest](https://github.com/cev-api/Wurst7-CevAPI/tree/master)
+
 
 ### Download
 Pre-compiled copies are available on the [Release Page](https://github.com/cev-api/Wurst7-CevAPI/releases). 

build.gradle

@@ -5,8 +5,8 @@ buildscript {
 }
 
 plugins {
-	id "fabric-loom" version "${loom_version}"
-	id "com.diffplug.spotless" version "8.4.0"
+	id "net.fabricmc.fabric-loom" version "${loom_version}"
+	id "com.diffplug.spotless" version "8.3.0"
 }
 
 def ENV = System.getenv()
@@ -64,23 +64,20 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	// Use Fabric Loader JUnit only for gametests, not for plain unit tests
-	// Standard JUnit for unit tests
-	testImplementation "org.junit.jupiter:junit-jupiter:5.10.2"
-	testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.10.2"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	testImplementation "org.junit.jupiter:junit-jupiter:5.13.4"
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// net.wurstclient.ai.PathPos extends net.minecraft.util.math.BlockPos,
 	// which uses javax.annotation.concurrent.Immutable, which is part of
 	// the JSR305 library.
 	//
 	// In other words, Wurst won't compile without this library,
 	// even though it's Minecraft that actually uses it.
-	modImplementation "com.google.code.findbugs:jsr305:3.0.2"
+	implementation "com.google.code.findbugs:jsr305:3.0.2"
 }
 
 fabricApi.configureTests {
@@ -232,9 +229,8 @@ tasks.configureEach {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.20.5 (24w14a) upwards uses Java 21.
-	it.options.release = 21
-	it.options.compilerArgs += "-Xlint:deprecation"
+	// Minecraft 26.1 (26.1-snapshot-1) upwards uses Java 25.
+	it.options.release = 25
 }
 
 java {
@@ -243,8 +239,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
@@ -259,8 +255,9 @@ jar {
 	exclude("intentionally_untranslated.json")
 }
 
-tasks.named("remapJar") {
-	archiveVersion = "${project.version}_v${forkReleaseVersion}"
+tasks.configureEach {
+	if(name == "remapJar")
+		archiveVersion = "${project.version}_v${forkReleaseVersion}"
 }
 
 import com.diffplug.spotless.generic.LicenseHeaderStep
@@ -287,9 +284,6 @@ spotless {
 
 test {
 	useJUnitPlatform()
-	// Ensure Fabric Loader JUnit can see the test classes as a classpath group
-	// to avoid "hasn't been exposed to the game" errors in-dev.
-	systemProperty "fabric.classPathGroups", "default,test"
 }
 
 def getGhVersion() {
@@ -341,8 +335,8 @@ task github(dependsOn: build) {
 			ghRelease = releaseBuilder.create()
 		}
 
-		ghRelease.uploadAsset(remapJar.archiveFile.get().getAsFile(), "application/java-archive")
-		ghRelease.uploadAsset(remapSourcesJar.archiveFile.get().getAsFile(), "application/java-archive")
+		ghRelease.uploadAsset(jar.archiveFile.get().getAsFile(), "application/java-archive")
+		ghRelease.uploadAsset(sourcesJar.archiveFile.get().getAsFile(), "application/java-archive")
 	}
 }
 

gradle.properties

@@ -6,16 +6,15 @@ org.gradle.configuration-cache=true
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.3
+minecraft_version=26.1
 loader_version=0.18.4
-loom_version=1.14-SNAPSHOT
+loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.140.2+1.21.11
+fabric_api_version=0.144.0+26.1
 
 # Mod Properties
-mod_version=v7.53-CevAPI-MC1.21.11
+mod_version=v7.53-CevAPI-MC26.1
 fork_release_version=0.48
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
@@ -25,6 +24,6 @@ mod_loader=Fabric
 gh_repo_id=cev-api/Wurst7-CevAPI
 
 # Dependencies
-# check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.11
+# check at https://modrinth.com/mod/sodium/versions?l=fabric&g=26.1
 sodium_version=mc1.21.11-0.8.6-fabric
-do_mod_compat_test=true
+do_mod_compat_test=false

src/gametest/java/net/wurstclient/gametest/SingleplayerTest.java

@@ -14,7 +14,7 @@
 
 import net.fabricmc.fabric.api.client.gametest.v1.TestInput;
 import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
-import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientWorldContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerContext;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
 import net.minecraft.world.item.Item;
@@ -26,7 +26,7 @@ public abstract class SingleplayerTest
 	protected final ClientGameTestContext context;
 	protected final TestSingleplayerContext spContext;
 	protected final TestInput input;
-	protected final TestClientWorldContext world;
+	protected final TestClientLevelContext world;
 	protected final TestServerContext server;
 	protected final Logger logger = WurstTest.LOGGER;
 
@@ -36,7 +36,7 @@ public SingleplayerTest(ClientGameTestContext context,
 		this.context = context;
 		this.spContext = spContext;
 		this.input = context.getInput();
-		this.world = spContext.getClientWorld();
+		this.world = spContext.getClientLevel();
 		this.server = spContext.getServer();
 	}
 
@@ -48,7 +48,7 @@ public final void run()
 		runImpl();
 		assertScreenshotEquals(
 			getClass().getSimpleName().toLowerCase() + "_cleanup",
-			"https://i.imgur.com/i2Nr9is.png");
+			"https://i.imgur.com/XF1SILt.png");
 	}
 
 	/**
@@ -117,10 +117,10 @@ protected final void assertOneItemInSlot(int slot, Item item)
 		ItemStack stack = context
 			.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() + " "
-					+ stack.getItem().getName().getString() + " instead");
+			throw new RuntimeException("Expected 1 "
+				+ item.getName(item.getDefaultInstance()).getString()
+				+ " at slot " + slot + ", found " + stack.getCount() + " "
+				+ stack.getItemName().getString() + " instead");
 	}
 
 	protected final void assertScreenshotEquals(String fileName,
@@ -154,6 +154,6 @@ protected final void assertNoItemInSlot(int slot)
 		if(!stack.isEmpty())
 			throw new RuntimeException("Expected no item in slot " + slot
 				+ ", found " + stack.getCount() + " "
-				+ stack.getItem().getName().getString() + " instead");
+				+ stack.getItemName().getString() + " instead");
 	}
 }

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

@@ -280,5 +280,4 @@ public static String tryUploadToImgur(Path imagePath)
 			return null;
 		}
 	}
-	
 }

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

@@ -19,7 +19,7 @@
 import net.fabricmc.fabric.api.client.gametest.v1.FabricClientGameTest;
 import net.fabricmc.fabric.api.client.gametest.v1.TestInput;
 import net.fabricmc.fabric.api.client.gametest.v1.context.ClientGameTestContext;
-import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientWorldContext;
+import net.fabricmc.fabric.api.client.gametest.v1.context.TestClientLevelContext;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestServerContext;
 import net.fabricmc.fabric.api.client.gametest.v1.context.TestSingleplayerContext;
 import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldBuilder;
@@ -80,7 +80,7 @@ private void testInWorld(ClientGameTestContext context,
 		TestSingleplayerContext spContext)
 	{
 		TestInput input = context.getInput();
-		TestClientWorldContext world = spContext.getClientWorld();
+		TestClientLevelContext world = spContext.getClientLevel();
 		TestServerContext server = spContext.getServer();
 
 		// Disable chunk fade

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

@@ -7,7 +7,13 @@
  */
 package net.wurstclient.gametest.mixin;
 
-import net.minecraft.client.gui.GuiGraphics;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.screens.Screen;
@@ -31,9 +37,9 @@ public abstract class ScreenMixin extends AbstractContainerEventHandler
 	 * Replaces the panorama background with a gray background to make test
 	 * screenshots consistent.
 	 */
-	@Inject(method = "renderPanorama", at = @At("HEAD"), cancellable = true)
-	public void renderPanoramaBackground(GuiGraphics context, float deltaTicks,
-		CallbackInfo ci)
+	@Inject(method = "extractPanorama", at = @At("HEAD"), cancellable = true)
+	public void renderPanoramaBackground(GuiGraphicsExtractor context,
+		float deltaTicks, CallbackInfo ci)
 	{
 		context.fill(0, 0, width, height, CommonColors.GRAY);
 		ci.cancel();