Skip to content

fix(GUIMove): restrict Inventory mode to container screens and respect skip() for key suppression #6726

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
MineGame159 merged 2 commits into from
Oct 17, 2026
Merged

fix(GUIMove): restrict Inventory mode to container screens and respect skip() for key suppression #6726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
250663c
fix(GUIMove): restrict Inventory mode to container screens and respec…
Eccys Oct 17, 2026
6e11f66
Skip focused text boxes and release held movement keys on skip transi…
Eccys Oct 17, 2026
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
63 changes: 50 additions & 13 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/movement/GUIMove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import meteordevelopment.meteorclient.events.meteor.KeyInputEvent;
import meteordevelopment.meteorclient.events.meteor.MouseClickEvent;
import meteordevelopment.meteorclient.events.render.Render3DEvent;
import meteordevelopment.meteorclient.gui.GuiKeyEvents;
import meteordevelopment.meteorclient.gui.WidgetScreen;
import meteordevelopment.meteorclient.mixin.CreativeModeInventoryScreenAccessor;
import meteordevelopment.meteorclient.settings.*;
Expand All @@ -19,7 +20,9 @@
import meteordevelopment.meteorclient.utils.misc.input.KeyAction;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.screens.ChatScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.*;
import net.minecraft.util.Mth;
import net.minecraft.world.item.CreativeModeTabs;
Expand Down Expand Up @@ -87,12 +90,26 @@ public enum Screens {
.build()
);

private boolean wasSkipped = true;

public GUIMove() {
super(Categories.Movement, "gui-move", "Allows you to perform various actions while in GUIs.");
}

@Override
public void onActivate() {
wasSkipped = true;
}

@Override
public void onDeactivate() {
wasSkipped = true;
unpress();
}

private void unpress() {
if (mc == null || mc.options == null) return;

mc.options.keyUp.setDown(false);
mc.options.keyDown.setDown(false);
mc.options.keyLeft.setDown(false);
Expand All @@ -104,11 +121,11 @@ public void onDeactivate() {
}

public boolean disableSpace() {
return isActive() && jump.get() && mc.options.keyJump.isDefault();
return isActive() && jump.get() && mc.options.keyJump.isDefault() && !skip();
}

public boolean disableArrows() {
return isActive() && arrowsRotate.get();
return isActive() && arrowsRotate.get() && !skip();
}

@EventHandler
Expand All @@ -122,7 +139,7 @@ private void onButton(MouseClickEvent event) {
}

private void onInput(int key, KeyAction action) {
if (skip()) return;
if (checkSkip()) return;

pass(mc.options.keyUp, key, action);
pass(mc.options.keyDown, key, action);
Expand All @@ -136,7 +153,7 @@ private void onInput(int key, KeyAction action) {

@EventHandler
private void onRender3D(Render3DEvent event) {
if (skip()) return;
if (checkSkip()) return;

float rotationDelta = Math.min((float) (rotateSpeed.get() * event.frameTime * 20f), 100);

Expand Down Expand Up @@ -175,15 +192,35 @@ private void pass(KeyMapping bind, int key, KeyAction action) {
if (action == KeyAction.Release) bind.setDown(false);
}

private boolean checkSkip() {
if (skip()) {
if (!wasSkipped) {
wasSkipped = true;
if (mc != null && mc.gui != null && mc.gui.screen() != null) unpress();
}
return true;
}

wasSkipped = false;
return false;
}

public boolean skip() {
if (mc.gui.screen() == null ||
(mc.gui.screen() instanceof CreativeModeInventoryScreen && CreativeModeInventoryScreenAccessor.meteor$getSelectedTab() == CreativeModeTabs.searchTab())
|| mc.gui.screen() instanceof ChatScreen
|| mc.gui.screen() instanceof SignEditScreen
|| mc.gui.screen() instanceof AnvilScreen
|| mc.gui.screen() instanceof AbstractCommandBlockEditScreen
|| mc.gui.screen() instanceof StructureBlockEditScreen) return true;
if (screens.get() == Screens.GUI && !(mc.gui.screen() instanceof WidgetScreen)) return true;
return screens.get() == Screens.Inventory && mc.gui.screen() instanceof WidgetScreen;
return mc == null || mc.gui == null || skip(mc.gui.screen());
}

public boolean skip(Screen screen) {
if (screen == null
|| !GuiKeyEvents.canUseKeys
|| (screen instanceof CreativeModeInventoryScreen && CreativeModeInventoryScreenAccessor.meteor$getSelectedTab() == CreativeModeTabs.searchTab())
|| screen instanceof ChatScreen
|| screen instanceof AbstractSignEditScreen
|| screen instanceof AnvilScreen
|| screen instanceof AbstractCommandBlockEditScreen
|| screen instanceof StructureBlockEditScreen
|| (screen.getFocused() instanceof EditBox editBox && editBox.canConsumeInput())) return true;
if (screens.get() == Screens.GUI) return !(screen instanceof WidgetScreen);
if (screens.get() == Screens.Inventory) return !(screen instanceof AbstractContainerScreen<?>);
return !(screen instanceof WidgetScreen || screen instanceof AbstractContainerScreen<?>);
}
}
Loading