From bec6906b7ec94c536c23b9ca3510c712c5edb6df Mon Sep 17 00:00:00 2001 From: Surya Date: Sun, 30 May 2021 23:47:43 +0530 Subject: [PATCH] Fix config overriding, fix buttons --- .../savecoords/gui/impl/ListViewHandler.java | 5 ++--- .../savecoords/gui/impl/TexturedButton.java | 3 +-- .../savecoords/impl/KeyBindConfiguration.java | 3 ++- .../assets/savecoords/textures/gui/close.png | Bin 183 -> 183 bytes 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java index feb876c..c6d7775 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/ListViewHandler.java @@ -115,7 +115,6 @@ class ListViewHandler extends ViewHandlerBase { this.pingButton = new WButton(new LiteralText("")); this.detailButton = new WButton(new LiteralText("")); - this.deleteButton.setIcon(ResourceUtils.CreateCloseIcon()); this.pingButton.setIcon(ResourceUtils.CreatePingIcon()); this.detailButton.setIcon(ResourceUtils.CreateDetailsIcon()); @@ -124,8 +123,8 @@ class ListViewHandler extends ViewHandlerBase { this.add(location, 4 * 18, 0, 4 * 18, 1 * 18); this.add(coordinates, 3 * 18, 1 * 18, 9 * 18, 1 * 18); this.add(deleteButton, 13 * 18, 0, 1 * 18, 1 * 18); - this.add(pingButton, 1 * 18, 1 * 18, 1 * 18, 1 * 18); - this.add(detailButton, 11 * 18, 0, 1 * 18, 1 * 18); + this.add(pingButton, 11 * 18 - 2, 0, 1 * 18, 1 * 18); + this.add(detailButton, 12 * 18 - 1, 0, 1 * 18, 1 * 18); this.icon.setSize(1 * 15, 1 * 15); this.world.setSize(3 * 18, 1 * 18); diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java index 3edd8d6..da21265 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/gui/impl/TexturedButton.java @@ -24,8 +24,7 @@ public class TexturedButton extends WButton { super.paint(matrices, x, y, mouseX, mouseY); if (texture != null) { - ScreenDrawing.texturedGuiRect(matrices, x + 1, y + 1, getWidth() - 2, getHeight() - 2, texture, -1, -1, - 0xFFFFFF); + ScreenDrawing.texturedGuiRect(matrices, x + 2, y + 2, 14, 16, texture, 0, 0, 0xFFFFFF); } if (getLabel() != null) { diff --git a/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBindConfiguration.java b/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBindConfiguration.java index 0e4ebdd..02891f8 100644 --- a/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBindConfiguration.java +++ b/src/main/java/me/bionicbeanie/mods/savecoords/impl/KeyBindConfiguration.java @@ -28,7 +28,8 @@ class KeyBindConfiguration implements IKeyBindConfiguration { @Override public void setDefaultKeyBinding(int keyCode) { - defaultKeyBinding = createKeyBinding(keyCode); + defaultKeyBinding.setBoundKey(InputUtil.Type.KEYSYM.createFromCode(keyCode)); + KeyBinding.updateKeysByCode(); } private KeyBinding createDefaultKeyBinding(IFileStore fileStore) throws IOException { diff --git a/src/main/resources/assets/savecoords/textures/gui/close.png b/src/main/resources/assets/savecoords/textures/gui/close.png index cfa36444ce94d53c9b2930c2fc56771500d04914..7d450ad269f810b7d9b39275be172c9091d07d9f 100644 GIT binary patch delta 20 bcmdnaxSer=C)Xhc2EId#q8eTe6N6I#LMH|` delta 20 ccmdnaxSer=C)Z&H2EN0L$MaXDObku|07@$da{vGU