Skip to content

[Savestates] Fixes game hanging when trying to load a nonexistant temp savestate #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ScribbleTAS merged 2 commits into from
Nov 10, 2025
Merged

[Savestates] Fixes game hanging when trying to load a nonexistant temp savestate #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe51d1
[Savestates] Fix game hanging when failing to load a temp savestate
ScribbleTAS Nov 10, 2025
9a74ee3
[VirtualInput] Fix remap warnings when building
ScribbleTAS Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ mod_email=scribble@minecrafttas.com
# TASmod properties
group=com.minecrafttas
artifact=TASmod-1.12.2
version=Beta2
version=Beta2.1
release=false
4 changes: 2 additions & 2 deletions src/main/java/com/minecrafttas/tasmod/mixin/playbackhooks/MixinMinecraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,15 @@ private static void playback_unpressAllKeys(GuiScreen guiScreen) {
KeyBinding.unPressAllKeys();
}

@Redirect(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;next()Z"))
@Redirect(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Mouse;next()Z", remap = false))
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"))
@Redirect(method = "displayGuiScreen", at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Keyboard;next()Z", remap = false))
private static boolean playback_keyboardNext(GuiScreen guiScreen) {
if (guiScreen instanceof SubtickGuiScreen) {
return false;
Expand Down
84 changes: 76 additions & 8 deletions src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateTempHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.minecrafttas.tasmod.savestates.handlers;

import static com.minecrafttas.tasmod.TASmod.LOGGER;
import static com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate.NONE;
import static com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate.PLAYBACK;
import static com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate.RECORDING;
Expand All @@ -12,7 +13,12 @@
import com.minecrafttas.tasmod.events.EventPlaybackServer.EventControllerStateChange;
import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
import com.minecrafttas.tasmod.registries.TASmodPackets;
import com.minecrafttas.tasmod.savestates.SavestateHandlerServer;
import com.minecrafttas.tasmod.savestates.exceptions.SavestateException;
import com.minecrafttas.tasmod.util.Component;

import net.minecraft.util.text.TextFormatting;

/**
* <p>Handles the creation of temporary savestates when recording/playing back a TAS
Expand Down Expand Up @@ -48,23 +54,85 @@ public void onControllerStateChange(TASstate newstate, TASstate oldstate) {
if (newstate == RECORDING && createState) {
logger.info("Creating temporary savestate");
createState = false;
handler.saveStateTemp((paths) -> {
try {
handler.saveStateTemp((paths) -> {
try {
TASmod.server.sendToAll(new TASmodBufferBuilder(SAVESTATE_CLEAR_SCREEN));
} catch (Exception e) {
logger.catching(e);
}
});
} catch (SavestateException e) {
TASmod.getServerInstance().getServer().getPlayerList().sendMessage(Component.translatable(e.getMessage()).withStyle(TextFormatting.RED).build());

try {
TASmod.server.sendToAll(new TASmodBufferBuilder(SAVESTATE_CLEAR_SCREEN));
} catch (Exception e) {
TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.TICKRATE_0_WARN));
TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.CLEAR_SCREEN));
} catch (Exception e1) {
logger.catching(e);
}
});

LOGGER.error("Failed to create a temp savestate");
LOGGER.catching(e);
} catch (Exception e) {
Throwable cause = e.getCause();
if (cause == null) {
cause = e;
}
TASmod.getServerInstance().getPlayerList().sendMessage(Component.translatable("msg.tasmod.savestate.failure", e.getMessage()).withStyle(TextFormatting.RED).build());

try {
TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.TICKRATE_0_WARN));
TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.CLEAR_SCREEN));
} catch (Exception e1) {
logger.catching(e);
}

LOGGER.error("Failed to create a temp savestate");
LOGGER.catching(e);
} finally {
handler.resetState();
}
} else if (newstate == PLAYBACK) {
logger.info("Loading temporary savestate");
createState = false;
handler.loadStateTemp((paths) -> {
try {
handler.loadStateTemp((paths) -> {
try {
TASmod.server.sendToAll(new TASmodBufferBuilder(SAVESTATE_CLEAR_SCREEN));
} catch (Exception e) {
logger.catching(e);
}
});
} catch (SavestateException e) {
TASmod.getServerInstance().getServer().getPlayerList().sendMessage(Component.translatable(e.getMessage()).withStyle(TextFormatting.RED).build());

try {
TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.CLEAR_SCREEN));
} catch (Exception e1) {
logger.catching(e);
}

LOGGER.error("Failed to load a temp savestate");
LOGGER.catching(e);
} catch (Exception e) {
Throwable cause = e.getCause();
if (cause == null) {
cause = e;
}
TASmod.getServerInstance().getPlayerList().sendMessage(Component.translatable("msg.tasmod.savestate.failure", e.getMessage()).withStyle(TextFormatting.RED).build());

try {
TASmod.server.sendToAll(new TASmodBufferBuilder(SAVESTATE_CLEAR_SCREEN));
} catch (Exception e) {
TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.CLEAR_SCREEN));
} catch (Exception e1) {
logger.catching(e);
}
});

LOGGER.error("Failed to load a temp savestate");
LOGGER.catching(e);
} finally {
handler.resetState();
}
}
}

Expand Down