[Savestates] Turn off rename gui

Author: ScribbleTAS

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

@@ -1,5 +1,7 @@
 package com.minecrafttas.tasmod.mixin.playbackhooks;
 
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -8,6 +10,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.minecrafttas.tasmod.TASmodClient;
+import com.minecrafttas.tasmod.virtual.SubtickGuiScreen;
 import com.minecrafttas.tasmod.virtual.VirtualInput;
 import com.minecrafttas.tasmod.virtual.VirtualInput.VirtualKeyboardInput;
 import com.minecrafttas.tasmod.virtual.VirtualInput.VirtualMouseInput;
@@ -16,6 +19,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.settings.KeyBinding;
 
 @Mixin(Minecraft.class)
 public class MixinMinecraft {
@@ -158,4 +162,29 @@ public int playback_redirectGetEventDWheel() {
 		return TASmodClient.virtual.MOUSE.getEventMouseScrollWheel();
 	}
 
+	// ============================ DisplayGui
+
+	@Redirect(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/settings/KeyBinding;unPressAllKeys()V"))
+	private static void playback_unpressAllKeys(GuiScreen guiScreen) {
+		if (guiScreen instanceof SubtickGuiScreen) {
+			return;
+		}
+		KeyBinding.unPressAllKeys();
+	}
+
+	@Redirect(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;next()Z"))
+	private static boolean playback_mouseNext(GuiScreen guiScreen) {
+		if (guiScreen instanceof SubtickGuiScreen) {
+			return false;
+		}
+		return Mouse.next();
+	}
+
+	@Redirect(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Keyboard;next()Z"))
+	private static boolean playback_keyboardNext(GuiScreen guiScreen) {
+		if (guiScreen instanceof SubtickGuiScreen) {
+			return false;
+		}
+		return Keyboard.next();
+	}
 }

src/main/java/com/minecrafttas/tasmod/registries/TASmodKeybinds.java

@@ -46,6 +46,7 @@ public enum TASmodKeybinds implements KeybindID {
 		TASmodClient.virtual.CAMERA_ANGLE.updateNextCameraAngle(0, 45);
 	}),
 	TEST1("Various Testing", "TASmod", Keyboard.KEY_F12, () -> {
+		Minecraft.getMinecraft().displayGuiScreen(null);
 	}, VirtualKeybindings::isKeyDown),
 	TEST2("Various Testing2", "TASmod", Keyboard.KEY_F7, () -> {
 	}, VirtualKeybindings::isKeyDown);

src/main/java/com/minecrafttas/tasmod/registries/TASmodPackets.java

@@ -4,6 +4,7 @@
 import com.minecrafttas.mctcommon.networking.Client.Side;
 import com.minecrafttas.mctcommon.networking.CompactPacketHandler;
 import com.minecrafttas.mctcommon.networking.interfaces.PacketID;
+import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
@@ -106,7 +107,7 @@ public enum TASmodPackets implements PacketID {
 	SAVESTATE_CLEAR_SCREEN(Side.CLIENT, (buf, clientID) -> {
 		Minecraft mc = Minecraft.getMinecraft();
 		if (mc.currentScreen instanceof GuiSavestate || mc.currentScreen instanceof GuiDownloadTerrain) {
-			mc.addScheduledTask(() -> {
+			TASmod.gameLoopSchedulerServer.add(() -> {
 				mc.displayGuiScreen(null);
 			});
 		}

src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java

@@ -457,7 +457,8 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 					 * Once the player is done renaming the savestate, the screens are cleared for all players.
 					 */
 					try {
-						TASmod.server.sendTo(player, new TASmodBufferBuilder(TASmodPackets.SAVESTATE_RENAME_SCREEN).writeInt(paths.getSavestate().index));
+						// TODO Currently desyncs the savestates... Bigger investigation necessary
+//						TASmod.server.sendTo(player, new TASmodBufferBuilder(TASmodPackets.SAVESTATE_RENAME_SCREEN).writeInt(paths.getSavestate().index));
 					} catch (Exception e) {
 						LOGGER.catching(e);
 					}

src/main/java/com/minecrafttas/tasmod/savestates/gui/GuiSavestateRename.java

@@ -75,7 +75,6 @@ private void renameAndExit() {
 		} catch (Exception e) {
 			TASmod.LOGGER.catching(e);
 		}
-		mc.displayGuiScreen(null);
 	}
 
 	@Override
@@ -85,6 +84,12 @@ public void updateScreen() {
 
 	@Override
 	public void onGuiClosed() {
+		TASmodClient.virtual.clearNext();
 		Keyboard.enableRepeatEvents(false);
 	}
+
+	@Override
+	public boolean doesGuiPauseGame() {
+		return false;
+	}
 }

src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateGuiHandlerClient.java

@@ -10,6 +10,7 @@
 import com.minecrafttas.mctcommon.networking.exception.WrongSideException;
 import com.minecrafttas.mctcommon.networking.interfaces.ClientPacketHandler;
 import com.minecrafttas.mctcommon.networking.interfaces.PacketID;
+import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
 import com.minecrafttas.tasmod.registries.TASmodPackets;
 import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateState;
@@ -44,20 +45,18 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 			case SAVESTATE_LOADING_SCREEN:
 				// Open Savestate screen
 				SavestateState state = TASmodBufferBuilder.readEnum(SavestateState.class, buf);
-				mc.addScheduledTask(() -> {
 
-					String msg = "";
-					if (state == SavestateState.SAVING)
-						msg = "gui.tasmod.savestate.save.start";
-					else if (state == SavestateState.LOADING)
-						msg = "gui.tasmod.savestate.load.start";
+				String msg = "";
+				if (state == SavestateState.SAVING)
+					msg = "gui.tasmod.savestate.save.start";
+				else if (state == SavestateState.LOADING)
+					msg = "gui.tasmod.savestate.load.start";
 
-					mc.displayGuiScreen(new GuiSavestate(Component.translatable(msg).withStyle(TextFormatting.YELLOW).build()));
-				});
+				mc.displayGuiScreen(new GuiSavestate(Component.translatable(msg).withStyle(TextFormatting.YELLOW).build()));
 				break;
 			case SAVESTATE_RENAME_SCREEN:
 				int index = TASmodBufferBuilder.readInt(buf);
-				mc.addScheduledTask(() -> {
+				TASmodClient.tickSchedulerClient.add(() -> {
 					displayGuiRename(index);
 				});
 				break;

src/main/java/com/minecrafttas/tasmod/virtual/SubtickGuiScreen.java

@@ -1,5 +1,7 @@
 package com.minecrafttas.tasmod.virtual;
 
+import org.lwjgl.input.Keyboard;
+
 import net.minecraft.client.gui.GuiScreen;
 
 /**
@@ -28,4 +30,9 @@ public void keyTyped(char c, int i) {
 	public void mouseClicked(int i, int j, int k) {
 		super.mouseClicked(i, j, k);
 	}
+
+	@Override
+	public void onGuiClosed() {
+		Keyboard.enableRepeatEvents(false);
+	}
 }