[VirtualInput] Fix recording/playing back gui inputs not working correctly

.github/workflows/build.yml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17 for x64
+    - name: Set up JDK 23 for x64
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '23'
         distribution: 'temurin'
         architecture: x64
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
       with:
-        gradle-version: 8.10.2
+        gradle-version: 8.13
     - name: Build TASmod with Gradle
       run: gradle build
     - name: Upload Test Report

.github/workflows/buildandupload.yml

@@ -11,16 +11,16 @@ jobs:
     if: github.repository == 'MinecraftTAS/TASmod'
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17 for x64
+    - name: Set up JDK 23 for x64
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '23'
         distribution: 'temurin'
         architecture: x64
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
       with:
-        gradle-version: 8.10.2
+        gradle-version: 8.13
     - name: Build TASmod with Gradle
       run: gradle build
     - name: Upload artifact

.github/workflows/release.yml

@@ -10,13 +10,13 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: '22'
+          java-version: '23'
           distribution: 'temurin'
           architecture: x64
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 8.10.2
+          gradle-version: 8.13
       - name: Setup workspace
         run: gradle build -Prelease=true
       - name: Upload assets

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G
 
 # Fabric properties
 minecraft_version=1.12.2
-loader_version=0.16.9
-loom_version=1.8-SNAPSHOT
+loader_version=0.16.10
+loom_version=1.10-SNAPSHOT
 
 # Mod properties
 mod_name=Tool-Assisted Speedrun Mod

src/main/java/com/minecrafttas/tasmod/events/EventPlaybackClient.java

@@ -3,7 +3,7 @@
 import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
+import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
 
 public interface EventPlaybackClient {
 
@@ -53,9 +53,9 @@ public interface EventRecordTick extends EventBase {
 		 * Fired when a tick is being recorded
 		 * 
 		 * @param index     The index of the tick that is being recorded
-		 * @param container The {@link TickContainer} that is being recorded
+		 * @param container The {@link InputContainer} that is being recorded
 		 */
-		public void onRecordTick(long index, TickContainer container);
+		public void onRecordTick(long index, InputContainer container);
 	}
 
 	/**
@@ -68,9 +68,9 @@ public interface EventPlaybackTick extends EventBase {
 		 * Fired when a tick is being recorded
 		 * 
 		 * @param index     The index of the tick that is being recorded
-		 * @param container The {@link TickContainer} that is being recorded
+		 * @param container The {@link InputContainer} that is being recorded
 		 */
-		public void onPlaybackTick(long index, TickContainer container);
+		public void onPlaybackTick(long index, InputContainer container);
 	}
 
 	/**

src/main/java/com/minecrafttas/tasmod/handlers/InterpolationHandler.java

@@ -2,7 +2,7 @@
 
 import com.minecrafttas.mctcommon.events.EventClient.EventCamera;
 import com.minecrafttas.tasmod.TASmodClient;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
+import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.math.MathHelper;
@@ -22,7 +22,7 @@ public class InterpolationHandler implements EventCamera {
 	@Override
 	public CameraData onCameraEvent(CameraData dataIn) {
 		if (TASmodClient.controller.isPlayingback() /*&& ControlByteHandler.shouldInterpolate*/) {
-			TickContainer input = TASmodClient.controller.get();
+			InputContainer input = TASmodClient.controller.get();
 			if (input == null)
 				return dataIn;
 			float nextPitch = input.getCameraAngle().getPitch();

src/main/java/com/minecrafttas/tasmod/mixin/playbackhooks/MixinGuiContainer.java

@@ -13,7 +13,7 @@
 
 @Mixin(GuiContainer.class)
 public class MixinGuiContainer {
-	
+
 	/**
 	 * Redirects the check for {@link VirtualKey#LSHIFT} and {@link VirtualKey#RSHIFT} in mouseClicked
 	 * @param i The keycode to check for
@@ -41,7 +41,7 @@ private boolean redirectIsKeyDown2(int i) {
 	@Redirect(method = "keyTyped", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;closeScreen()V"))
 	public void redirectCloseScreen(EntityPlayerSP player) {
 		Minecraft mc = Minecraft.getMinecraft();
-		if(TASmodClient.virtual.isKeyDown(mc.gameSettings.keyBindInventory.getKeyCode()) && ((GuiContainer)(Object)this).isFocused()) {
+		if (TASmodClient.virtual.isKeyDown(mc.gameSettings.keyBindInventory.getKeyCode()) && ((GuiContainer) (Object) this).isFocused()) {
 			return;
 		}
 		player.closeScreen();

src/main/java/com/minecrafttas/tasmod/mixin/playbackhooks/MixinGuiScreen.java

@@ -1,12 +1,10 @@
 package com.minecrafttas.tasmod.mixin.playbackhooks;
 
+import org.lwjgl.input.Mouse;
 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.At.Shift;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.util.Ducks.GuiScreenDuck;
@@ -19,16 +17,6 @@
 @Mixin(GuiScreen.class)
 public class MixinGuiScreen implements GuiScreenDuck {
 
-	/**
-	 * Run at the start of run handleInput. Runs every tick.
-	 * @see VirtualInput.VirtualKeyboardInput#nextKeyboardTick()
-	 * @param ci CBI
-	 */
-	@Inject(method = "handleInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Keyboard;isCreated()Z", shift = Shift.AFTER, remap = false))
-	public void injectAfterKeyboardCreated(CallbackInfo ci) {
-		TASmodClient.virtual.KEYBOARD.nextKeyboardTick();
-	}
-
 	/**
 	 * Redirects a {@link org.lwjgl.input.Keyboard#next()}. Starts running every tick and continues as long as there are {@link VirtualKeyboardEvent}s in {@link VirtualInput}
 	 * @see VirtualInput.VirtualKeyboardInput#nextKeyboardSubtick()
@@ -60,13 +48,6 @@ public boolean redirectGetEventState() {
 
 	// =====================================================================================================================================
 
-	@Inject(method = "handleInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;isCreated()Z", shift = Shift.AFTER, remap = false))
-	public void injectAfterMouseCreated(CallbackInfo ci) {
-		TASmodClient.virtual.MOUSE.nextMouseTick();
-	}
-
-	// =====================================================================================================================================
-
 	@Redirect(method = "handleInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;next()Z", remap = false))
 	public boolean redirectMouseNext() {
 		return TASmodClient.virtual.MOUSE.nextMouseSubtick();
@@ -84,7 +65,7 @@ public int redirectGetEventButton() {
 	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;getEventButtonState()Z", remap = false))
 	public boolean redirectGetEventButtonState() {
 		if (TASmodClient.controller.isPlayingback()) { // TODO replace with event
-			org.lwjgl.input.Mouse.setCursorPosition(rescaleX(TASmodClient.virtual.MOUSE.getEventCursorX()), rescaleY(TASmodClient.virtual.MOUSE.getEventCursorY()));
+			Mouse.setCursorPosition(rescaleX(TASmodClient.virtual.MOUSE.getEventCursorX()), rescaleY(TASmodClient.virtual.MOUSE.getEventCursorY()));
 		}
 		return TASmodClient.virtual.MOUSE.getEventMouseState();
 	}

src/main/java/com/minecrafttas/tasmod/mixin/playbackhooks/MixinGuiSlot.java

@@ -10,19 +10,22 @@
 
 @Mixin(GuiSlot.class)
 public class MixinGuiSlot {
-	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE",target = "Lorg/lwjgl/input/Mouse;getEventButtonState()Z",ordinal = 0, remap = false))
+	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;getEventButtonState()Z", ordinal = 0, remap = false))
 	public boolean redirectHandleMouseInput() {
 		return TASmodClient.virtual.MOUSE.getEventMouseState();
 	}
-	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE",target = "Lorg/lwjgl/input/Mouse;getEventButton()I",ordinal = 0, remap = false))
+
+	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;getEventButton()I", ordinal = 0, remap = false))
 	public int redirectHandleMouseInput2() {
 		return TASmodClient.virtual.MOUSE.getEventMouseKey();
 	}
-	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE",target = "Lorg/lwjgl/input/Mouse;isButtonDown(I)Z",ordinal = 0, remap = false))
+
+	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;isButtonDown(I)Z", ordinal = 0, remap = false))
 	public boolean redirectHandleMouseInput3(int i) {
 		return TASmodClient.virtual.isKeyDown(-100);
 	}
-	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE",target = "Lorg/lwjgl/input/Mouse;getEventDWheel()I",ordinal = 0, remap = false))
+
+	@Redirect(method = "handleMouseInput", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;getEventDWheel()I", ordinal = 0, remap = false))
 	public int redirectHandleMouseInput4() {
 		return TASmodClient.virtual.MOUSE.getEventMouseScrollWheel();
 	}

src/main/java/com/minecrafttas/tasmod/mixin/playbackhooks/MixinMinecraft.java

@@ -9,6 +9,7 @@
 
 import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.virtual.VirtualInput;
+import com.minecrafttas.tasmod.virtual.VirtualInput.VirtualKeyboardInput;
 import com.minecrafttas.tasmod.virtual.VirtualInput.VirtualMouseInput;
 import com.minecrafttas.tasmod.virtual.event.VirtualKeyboardEvent;
 import com.minecrafttas.tasmod.virtual.event.VirtualMouseEvent;
@@ -23,7 +24,7 @@ public class MixinMinecraft {
 	private GuiScreen currentScreen;
 
 	/**
-	 * Runs every frame.
+	 * <p>Runs every frame.
 	 * @see VirtualInput#update(GuiScreen)
 	 * @param ci CBI
 	 */
@@ -32,30 +33,29 @@ public void playback_injectRunGameLoop(CallbackInfo ci) {
 		TASmodClient.virtual.update(currentScreen);
 	}
 
-	// ============================ Keyboard
-
 	/**
-	 * Run at the start of run tick keyboard. Runs every tick.
-	 * @see VirtualInput.VirtualKeyboardInput#nextKeyboardTick()
+	 * <p>Runs every tick.
+	 * 
+	 * <p>Fills the keyboard and the mouse with the inputs that will be<br>
+	 * executed in {@link #playback_redirectKeyboardNext()} and {@link #playback_redirectMouseNext()} respectively.
+	 * @see VirtualKeyboardInput#nextKeyboardTick()
+	 * @see VirtualMouseInput#nextMouseTick()
 	 * @param ci CBI
 	 */
-	@Inject(method = "runTickKeyboard", at = @At(value = "HEAD"))
-	public void playback_injectRunTickKeyboard(CallbackInfo ci) {
+	@Inject(method = "runTick", at = @At(value = "HEAD"))
+	public void playback_injectRunTick(CallbackInfo ci) {
 		/*
-		 * This "currentScreen == null" (and the one in runTickMouse) fixes
-		 * a particularly interesting bug where subticks are not recorded in GuiScreens...
-		 * 
-		 * The reason this failed is because nextKeyboardTick is called twice in a row,
-		 * when a gui screen is open. The subticks are cleared after calling this
-		 * once, so having it be called twice essentially removes subticks alltogether.
+		 * Both of these were previously in injectRunTickKeyboard/Mouse
+		 * but moved to the beginning of runTick to fix #224
 		 */
-		if (currentScreen == null) {
-			TASmodClient.virtual.KEYBOARD.nextKeyboardTick();
-		}
+		TASmodClient.virtual.KEYBOARD.nextKeyboardTick();
+		TASmodClient.virtual.MOUSE.nextMouseTick();
 	}
 
+	// ============================ Keyboard
+
 	/**
-	 * Redirects a {@link org.lwjgl.input.Keyboard#next()}. Starts running every tick and continues as long as there are {@link VirtualKeyboardEvent}s in {@link VirtualInput}
+	 * <p>Redirects a {@link org.lwjgl.input.Keyboard#next()}. Starts running every tick and continues as long as there are {@link VirtualKeyboardEvent}s in {@link VirtualInput}
 	 * @see VirtualInput.VirtualKeyboardInput#nextKeyboardSubtick()
 	 * @return If {@link VirtualKeyboardEvent}s are present in {@link VirtualInput}
 	 */
@@ -124,18 +124,6 @@ public char playback_redirectGetEventCharacterDPK() {
 
 	// ============================ Mouse
 
-	/**
-	 * Run at the start of run tick mouse. Runs every tick.
-	 * @see VirtualInput.VirtualMouseInput#nextMouseTick()
-	 * @param ci CBI
-	 */
-	@Inject(method = "runTickMouse", at = @At(value = "HEAD"))
-	public void playback_injectRunTickMouse(CallbackInfo ci) {
-		if (currentScreen == null) {
-			TASmodClient.virtual.MOUSE.nextMouseTick();
-		}
-	}
-
 	/**
 	 * Redirects a {@link org.lwjgl.input.Mouse#next()}. Starts running every tick and continues as long as there are {@link VirtualMouseEvent}s in {@link VirtualInput}
 	 * @see VirtualInput.VirtualMouseInput#nextMouseSubtick()