Merge remote-tracking branch 'upstream/master'

cev-api · cev-api · commit d67e0d8950e4 · 2025-11-16T20:22:15.000+10:00
diff --git a/.github/workflows/auto_snapshot_update.yml b/.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 }}"
 
diff --git a/scripts/update_version_constants.py b/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,
 	)
diff --git a/src/main/java/net/wurstclient/hacks/SafeWalkHack.java b/src/main/java/net/wurstclient/hacks/SafeWalkHack.java
@@ -81,7 +81,7 @@ private void setSneaking(boolean sneaking)
 		IKeyBinding sneakKey = IKeyBinding.get(MC.options.keyShift);
 		
 		if(sneaking)
-			sneakKey.setPressed(true);
+			sneakKey.setDown(true);
 		else
 			sneakKey.resetPressedState();
 		
diff --git a/src/main/java/net/wurstclient/hacks/SneakHack.java b/src/main/java/net/wurstclient/hacks/SneakHack.java
@@ -83,7 +83,7 @@ public void onPreMotion()
 			if(offWhileFlying.isChecked() && isFlying())
 				sneakKey.resetPressedState();
 			else
-				sneakKey.setPressed(true);
+				sneakKey.setDown(true);
 			break;
 			
 			case PACKET:
diff --git a/src/main/java/net/wurstclient/mixin/KeyBindingMixin.java b/src/main/java/net/wurstclient/mixin/KeyBindingMixin.java
@@ -29,7 +29,7 @@ public abstract class KeyBindingMixin implements IKeyBinding
 	@Override
 	@Unique
 	@Deprecated // use IKeyBinding.resetPressedState() instead
-	public void wurst_resetPressedState()
+	public void resetPressedState()
 	{
 		Window window = WurstClient.MC.getWindow();
 		int code = key.getValue();
@@ -43,7 +43,7 @@ public void wurst_resetPressedState()
 	@Override
 	@Unique
 	@Deprecated // use IKeyBinding.simulatePress() instead
-	public void wurst_simulatePress(boolean pressed)
+	public void simulatePress(boolean pressed)
 	{
 		Minecraft mc = WurstClient.MC;
 		Window window = mc.getWindow();
diff --git a/src/main/java/net/wurstclient/mixinterface/IKeyBinding.java b/src/main/java/net/wurstclient/mixinterface/IKeyBinding.java
@@ -11,53 +11,37 @@
 
 public interface IKeyBinding
 {
-	/**
-	 * Resets the pressed state to whether or not the user is actually pressing
-	 * this key on their keyboard.
-	 */
-	public default void resetPressedState()
+	static IKeyBinding get(KeyMapping key)
 	{
-		wurst_resetPressedState();
+		return (IKeyBinding)key;
 	}
 	
-	/**
-	 * Simulates the user pressing this key on their keyboard or mouse. This is
-	 * much more aggressive than using {@link #setPressed(boolean)} and should
-	 * be used sparingly.
-	 */
-	public default void simulatePress(boolean pressed)
+	default KeyMapping asVanilla()
 	{
-		wurst_simulatePress(pressed);
+		return (KeyMapping)this;
 	}
 	
-	public default void setPressed(boolean pressed)
+	default void setPressed(boolean value)
 	{
-		asVanilla().setDown(pressed);
+		asVanilla().setDown(value);
 	}
 	
-	public default KeyMapping asVanilla()
+	default boolean isPressed()
 	{
-		return (KeyMapping)this;
+		return asVanilla().isDown();
+	}
+	
+	default void setDown(boolean value)
+	{
+		setPressed(value);
 	}
 	
-	/**
-	 * Returns the given KeyBinding object as an IKeyBinding, allowing you to
-	 * access the resetPressedState() method.
-	 */
-	public static IKeyBinding get(KeyMapping kb)
+	default boolean isDown()
 	{
-		return (IKeyBinding)kb;
+		return isPressed();
 	}
 	
-	/**
-	 * @deprecated Use {@link #resetPressedState()} instead.
-	 */
-	@Deprecated
-	public void wurst_resetPressedState();
+	void resetPressedState();
 	
-	/**
-	 * @deprecated Use {@link #simulatePress()} instead.
-	 */
-	@Deprecated
-	public void wurst_simulatePress(boolean pressed);
+	void simulatePress(boolean pressed);
 }
diff --git a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java
@@ -13,6 +13,8 @@
 
 import org.lwjgl.glfw.GLFW;
 
+import com.mojang.blaze3d.platform.InputConstants;
+
 import net.fabricmc.fabric.api.client.screen.v1.Screens;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
diff --git a/src/main/resources/wurst.accesswidener b/src/main/resources/wurst.accesswidener
@@ -33,9 +33,9 @@ accessible	field	net/minecraft/client/multiplayer/MultiPlayerGameMode	destroyPro
 accessible	field	net/minecraft/client/renderer/RenderType$CompositeRenderType	state	Lnet/minecraft/client/renderer/RenderType$CompositeState;
 accessible	field	net/minecraft/client/renderer/RenderType$CompositeRenderType	renderPipeline	Lcom/mojang/blaze3d/pipeline/RenderPipeline;
 accessible	field	net/minecraft/client/renderer/RenderType$CompositeState	outputState	Lnet/minecraft/client/renderer/RenderStateShard$OutputStateShard;
-accessible	field	net/minecraft/client/gui/components/toasts/ToastManager	queued	Ljava/util/Deque;
-accessible	field	net/minecraft/client/gui/components/BossHealthOverlay	events	Ljava/util/Map;
+accessible	field	net/minecraft/client/gui/components/toasts/ToastManager	queued	Ljava/util/Deque;
+accessible	field	net/minecraft/client/gui/components/BossHealthOverlay	events	Ljava/util/Map;
 accessible	field	net/minecraft/world/entity/Entity	stuckSpeedMultiplier	Lnet/minecraft/world/phys/Vec3;
 accessible	field	net/minecraft/world/entity/LivingEntity	equipment	Lnet/minecraft/world/entity/EntityEquipment;
 accessible	field	net/minecraft/world/entity/LivingEntity	jumping	Z
-accessible	field	net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket	sectionPos	Lnet/minecraft/core/SectionPos;
+accessible	field	net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket	sectionPos	Lnet/minecraft/core/SectionPos;

Original file line number	Diff line number	Diff line change
`@@ -11,53 +11,37 @@`
`11`	`11`
`12`	`12`	`public interface IKeyBinding`
`13`	`13`	`{`
`14`		`- /**`
`15`		`- * Resets the pressed state to whether or not the user is actually pressing`
`16`		`- * this key on their keyboard.`
`17`		`- */`
`18`		`- public default void resetPressedState()`
	`14`	`+ static IKeyBinding get(KeyMapping key)`
`19`	`15`	`{`
`20`		`- wurst_resetPressedState();`
	`16`	`+ return (IKeyBinding)key;`
`21`	`17`	`}`
`22`	`18`
`23`		`- /**`
`24`		`- * Simulates the user pressing this key on their keyboard or mouse. This is`
`25`		`- * much more aggressive than using {@link #setPressed(boolean)} and should`
`26`		`- * be used sparingly.`
`27`		`- */`
`28`		`- public default void simulatePress(boolean pressed)`
	`19`	`+ default KeyMapping asVanilla()`
`29`	`20`	`{`
`30`		`- wurst_simulatePress(pressed);`
	`21`	`+ return (KeyMapping)this;`
`31`	`22`	`}`
`32`	`23`
`33`		`- public default void setPressed(boolean pressed)`
	`24`	`+ default void setPressed(boolean value)`
`34`	`25`	`{`
`35`		`- asVanilla().setDown(pressed);`
	`26`	`+ asVanilla().setDown(value);`
`36`	`27`	`}`
`37`	`28`
`38`		`- public default KeyMapping asVanilla()`
	`29`	`+ default boolean isPressed()`
`39`	`30`	`{`
`40`		`- return (KeyMapping)this;`
	`31`	`+ return asVanilla().isDown();`
	`32`	`+ }`
	`33`	`+`
	`34`	`+ default void setDown(boolean value)`
	`35`	`+ {`
	`36`	`+ setPressed(value);`
`41`	`37`	`}`
`42`	`38`
`43`		`- /**`
`44`		`- * Returns the given KeyBinding object as an IKeyBinding, allowing you to`
`45`		`- * access the resetPressedState() method.`
`46`		`- */`
`47`		`- public static IKeyBinding get(KeyMapping kb)`
	`39`	`+ default boolean isDown()`
`48`	`40`	`{`
`49`		`- return (IKeyBinding)kb;`
	`41`	`+ return isPressed();`
`50`	`42`	`}`
`51`	`43`
`52`		`- /**`
`53`		`- * @deprecated Use {@link #resetPressedState()} instead.`
`54`		`- */`
`55`		`- @Deprecated`
`56`		`- public void wurst_resetPressedState();`
	`44`	`+ void resetPressedState();`
`57`	`45`
`58`		`- /**`
`59`		`- * @deprecated Use {@link #simulatePress()} instead.`
`60`		`- */`
`61`		`- @Deprecated`
`62`		`- public void wurst_simulatePress(boolean pressed);`
	`46`	`+ void simulatePress(boolean pressed);`
`63`	`47`	`}`