Skip to content

Strengthen Ender Utilities GUI crash protection. #915

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
ACGaming merged 1 commit into from
Sep 3, 2026
Merged

Strengthen Ender Utilities GUI crash protection. #915

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
11 changes: 9 additions & 2 deletions ...java/mod/acgaming/universaltweaks/mods/enderutilities/mixin/UTGuiEnderUtilitiesMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@
public abstract class UTGuiEnderUtilitiesMixin
{
/**
* @reason Stop processing slot hotkeys after the GUI has been closed.
* @reason Stop processing the close key itself and any later key events
* queued for this GUI after it has already been closed.
*/
@Inject(method = "keyTyped", at = @At("HEAD"), cancellable = true, require = 0, remap = true)
@Inject(method = "keyTyped", at = @At("HEAD"), cancellable = true, require = 1, remap = true)
private void utStopKeyHandlingAfterClose(char typedChar, int keyCode, CallbackInfo ci)
{
Minecraft mc = Minecraft.getMinecraft();

if (mc.player == null || mc.currentScreen != (Object) this)
{
ci.cancel();
return;
}

if (keyCode == Keyboard.KEY_ESCAPE || mc.gameSettings.keyBindInventory.isActiveAndMatches(keyCode))
{
mc.player.closeScreen();
Expand Down
Loading