mirror of
http://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8.git
synced 2025-04-29 01:51:58 -05:00
0aeb0ccac5
When you enter fullscreen via F11 or video settings you can now use regular ESC again to pause and unpause the game and close your inventory and use CTRL as the sprint key without closing the tab. This greatly improves user experience when you are a new player and don't understand yet that regular vanilla ESC and CTRL+W messes up the game.
68 lines
1.9 KiB
Java
68 lines
1.9 KiB
Java
|
|
# Eagler Context Redacted Diff
|
|
# Copyright (c) 2023 lax1dude. All rights reserved.
|
|
|
|
# Version: 1.0
|
|
# Author: lax1dude
|
|
|
|
> DELETE 2 @ 2 : 4
|
|
|
|
> INSERT 1 : 9 @ 1
|
|
|
|
+
|
|
+ import com.google.common.collect.Sets;
|
|
+
|
|
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
|
+ import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
|
|
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
|
|
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
|
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
|
|
|
|
> DELETE 2 @ 2 : 4
|
|
|
|
> DELETE 1 @ 1 : 2
|
|
|
|
> DELETE 8 @ 8 : 9
|
|
|
|
> INSERT 81 : 82 @ 81
|
|
|
|
+ GlStateManager.enableAlpha();
|
|
|
|
> CHANGE 107 : 108 @ 107 : 108
|
|
|
|
~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1);
|
|
|
|
> CHANGE 56 : 57 @ 56 : 57
|
|
|
|
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
|
|
|
> CHANGE 235 : 239 @ 235 : 237
|
|
|
|
~ protected void keyTyped(char parChar1, int parInt1) {
|
|
~ if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
|
|
~ || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode()
|
|
~ || (parInt1 == 1 && (this.mc.gameSettings.keyBindClose.getKeyCode() == 0 || this.mc.areKeysLocked()))) {
|
|
|
|
> CHANGE 1 : 3 @ 1 : 9
|
|
|
|
~ if (this.mc.currentScreen == null) {
|
|
~ this.mc.setIngameFocus();
|
|
|
|
> INSERT 1 : 12 @ 1
|
|
|
|
+ } else if (parInt1 == 1) {
|
|
+ showingCloseKey = System.currentTimeMillis();
|
|
+ } else {
|
|
+ this.checkHotbarKeys(parInt1);
|
|
+ if (this.theSlot != null && this.theSlot.getHasStack()) {
|
|
+ if (parInt1 == this.mc.gameSettings.keyBindPickBlock.getKeyCode()) {
|
|
+ this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, 0, 3);
|
|
+ } else if (parInt1 == this.mc.gameSettings.keyBindDrop.getKeyCode()) {
|
|
+ this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
|
|
+ }
|
|
+ }
|
|
|
|
> DELETE 1 @ 1 : 2
|
|
|
|
> EOF
|