Skip to content

Implement #480 #489

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

Open
JTK222 wants to merge 1 commit into
base: 1.18
Choose a base branch
from
Open

Implement #480 #489

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
4 changes: 2 additions & 2 deletions common/src/main/java/hunternif/mc/impl/atlas/client/KeyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;

import org.lwjgl.glfw.GLFW;

@Environment(EnvType.CLIENT)
public class KeyHandler {
public static final KeyBinding ATLAS_KEYMAPPING = new KeyBinding("key.openatlas.desc", InputUtil.Type.KEYSYM, 77, "key.antiqueatlas.category");
public static final KeyBinding ATLAS_KEYMAPPING = new KeyBinding("key.openatlas.desc", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_M, "key.antiqueatlas.category");

public static void registerBindings() {
KeyMappingRegistry.register(ATLAS_KEYMAPPING);
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/hunternif/mc/impl/atlas/client/gui/GuiAtlas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
setMapScale(mapScale * 2);
} else if (keyCode == GLFW.GLFW_KEY_MINUS || keyCode == GLFW.GLFW_KEY_KP_SUBTRACT) {
setMapScale(mapScale / 2);
} else if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
} else if (keyCode == GLFW.GLFW_KEY_ESCAPE || (AntiqueAtlasMod.CONFIG.itemNeeded &&KeyHandler.ATLAS_KEYMAPPING.matchesKey(keyCode, scanCode))) {
close();
} else {
KeyBinding[] hotbarKeys = MinecraftClient.getInstance().options.hotbarKeys;
Expand Down