From 021298e6f5eb67b1cb37c0d6fe9f7fca1ab4a66c Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Fri, 16 Oct 2020 14:37:23 +0200 Subject: [PATCH] Moved buttons to widget subfolder, Changed input detection method --- src/main/java/exopandora/worldhandler/event/KeyHandler.java | 6 +++--- .../worldhandler/gui/{ => widget}/button/EnumIcon.java | 0 .../worldhandler/gui/{ => widget}/button/GuiButtonBase.java | 0 .../worldhandler/gui/{ => widget}/button/GuiButtonIcon.java | 0 .../worldhandler/gui/{ => widget}/button/GuiButtonItem.java | 0 .../worldhandler/gui/{ => widget}/button/GuiButtonList.java | 0 .../gui/{ => widget}/button/GuiButtonPiano.java | 0 .../worldhandler/gui/{ => widget}/button/GuiButtonTab.java | 0 .../gui/{ => widget}/button/GuiButtonTooltip.java | 0 .../worldhandler/gui/{ => widget}/button/GuiSlider.java | 0 .../gui/{ => widget}/button/GuiTextFieldTooltip.java | 0 .../gui/{ => widget}/button/LogicSliderAttribute.java | 0 .../gui/{ => widget}/button/LogicSliderSimple.java | 0 13 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/EnumIcon.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonBase.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonIcon.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonItem.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonList.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonPiano.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonTab.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiButtonTooltip.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiSlider.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/GuiTextFieldTooltip.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/LogicSliderAttribute.java (100%) rename src/main/java/exopandora/worldhandler/gui/{ => widget}/button/LogicSliderSimple.java (100%) diff --git a/src/main/java/exopandora/worldhandler/event/KeyHandler.java b/src/main/java/exopandora/worldhandler/event/KeyHandler.java index e2b74bb..c7772b2 100644 --- a/src/main/java/exopandora/worldhandler/event/KeyHandler.java +++ b/src/main/java/exopandora/worldhandler/event/KeyHandler.java @@ -30,15 +30,15 @@ public class KeyHandler { if(Minecraft.getInstance() != null && Minecraft.getInstance().currentScreen == null) { - if(KEY_WORLD_HANDLER.isPressed()) + if(KEY_WORLD_HANDLER.isKeyDown()) { ActionHelper.displayGui(); } - else if(KEY_WORLD_HANDLER_POS1.isPressed() && Config.getSettings().shortcutKeys()) + else if(KEY_WORLD_HANDLER_POS1.isKeyDown() && Config.getSettings().shortcutKeys()) { BlockHelper.setPos1(BlockHelper.getFocusedBlockPos()); } - else if(KEY_WORLD_HANDLER_POS2.isPressed() && Config.getSettings().shortcutKeys()) + else if(KEY_WORLD_HANDLER_POS2.isKeyDown() && Config.getSettings().shortcutKeys()) { BlockHelper.setPos2(BlockHelper.getFocusedBlockPos()); } diff --git a/src/main/java/exopandora/worldhandler/gui/button/EnumIcon.java b/src/main/java/exopandora/worldhandler/gui/widget/button/EnumIcon.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/EnumIcon.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/EnumIcon.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonBase.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonBase.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonBase.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonBase.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonIcon.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonIcon.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonIcon.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonIcon.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonItem.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonItem.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonItem.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonItem.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonList.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonList.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonList.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonPiano.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonPiano.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonPiano.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonPiano.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTab.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTab.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonTab.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTab.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTooltip.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiButtonTooltip.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiButtonTooltip.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiSlider.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiSlider.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiSlider.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiSlider.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/GuiTextFieldTooltip.java b/src/main/java/exopandora/worldhandler/gui/widget/button/GuiTextFieldTooltip.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/GuiTextFieldTooltip.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/GuiTextFieldTooltip.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/LogicSliderAttribute.java b/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderAttribute.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/LogicSliderAttribute.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderAttribute.java diff --git a/src/main/java/exopandora/worldhandler/gui/button/LogicSliderSimple.java b/src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderSimple.java similarity index 100% rename from src/main/java/exopandora/worldhandler/gui/button/LogicSliderSimple.java rename to src/main/java/exopandora/worldhandler/gui/widget/button/LogicSliderSimple.java