Skip to content

[Savestates] Fix GuiRenameScreen desyncing #276

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 1 commit into from
Oct 24, 2025
Merged

[Savestates] Fix GuiRenameScreen desyncing #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,7 @@ 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 {
// TODO Currently desyncs the savestates... Bigger investigation necessary
// TASmod.server.sendTo(player, new TASmodBufferBuilder(TASmodPackets.SAVESTATE_RENAME_SCREEN).writeInt(paths.getSavestate().index));
TASmod.server.sendTo(player, new TASmodBufferBuilder(TASmodPackets.SAVESTATE_RENAME_SCREEN).writeInt(paths.getSavestate().index));
} catch (Exception e) {
LOGGER.catching(e);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateGuiHandlerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ else if (state == SavestateState.LOADING)
break;
case SAVESTATE_RENAME_SCREEN:
int index = TASmodBufferBuilder.readInt(buf);
mc.displayGuiScreen(null);
TASmodClient.tickSchedulerClient.add(() -> {
displayGuiRename(index);
});
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/com/minecrafttas/tasmod/virtual/VirtualInterpolationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,10 @@ public class VirtualInterpolationHandler implements EventVirtualInput.EventVirtu
* Is updated in {@link #onVirtualCameraTick()}
*/
private final List<VirtualCameraAngle> cameraAngleStates = new ArrayList<>();
// private int debugFinalIndex = 0;

@Override
public VirtualMouse onVirtualMouseTick(VirtualMouse vmouse) {
this.nextMouse = vmouse;
// if (TASmodClient.controller.isPlayingback()) {
// System.out.println(debugFinalIndex == mousePointerInterpolationStates.size() - 1);
// }
mousePointerStates.clear();
TASmodClient.controller.getNextMouse().getStates(mousePointerStates);
return null;
Expand Down Expand Up @@ -69,7 +65,6 @@ public MouseInterpolation getInterpolatedMouseCursor(float partialTick, boolean
if (enable && !mousePointerStates.isEmpty()) {
partialTick = dynamicallyRound(partialTick, TASmodClient.tickratechanger.ticksPerSecond);
int index = (int) MathHelper.clampedLerp(0, mousePointerStates.size() - 1, partialTick); // Get interpolate index
// debugFinalIndex = index;
VirtualMouse interpolatedCamera = mousePointerStates.get(index);

interpolatedPointerX = interpolatedCamera.getCursorX();
Expand All @@ -79,7 +74,7 @@ public MouseInterpolation getInterpolatedMouseCursor(float partialTick, boolean
Minecraft mc = Minecraft.getMinecraft();
GuiScreenDuck gui = (GuiScreenDuck) mc.currentScreen;

if (gui != null) {
if (gui != null && !(mc.currentScreen instanceof SubtickGuiScreen)) {
interpolatedPointerX = gui.rescaleX(PointerNormalizer.reapplyScalingX(interpolatedPointerX));
interpolatedPointerY = gui.rescaleY(PointerNormalizer.reapplyScalingY(interpolatedPointerY));
}
Expand Down