From e61d2459d9eb60ab5186e216a41392061247869b Mon Sep 17 00:00:00 2001 From: hsgamer Date: Fri, 21 Feb 2025 19:00:48 +0700 Subject: [PATCH] move GUIElement as root class of gui common --- .../bukkit/gui/holder/listener/BukkitInventoryListener.java | 2 +- .../hscore/minecraft/gui/common/{element => }/GUIElement.java | 2 +- .../me/hsgamer/hscore/minecraft/gui/common/button/Button.java | 2 +- .../hsgamer/hscore/minecraft/gui/common/button/ButtonMap.java | 2 +- .../hscore/minecraft/gui/common/element/package-info.java | 4 ---- .../me/hsgamer/hscore/minecraft/gui/holder/GUIHolder.java | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) rename minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/{element => }/GUIElement.java (83%) delete mode 100644 minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/package-info.java diff --git a/bukkit/gui/holder/src/main/java/me/hsgamer/hscore/bukkit/gui/holder/listener/BukkitInventoryListener.java b/bukkit/gui/holder/src/main/java/me/hsgamer/hscore/bukkit/gui/holder/listener/BukkitInventoryListener.java index 7e56f28f8..1e93e8190 100644 --- a/bukkit/gui/holder/src/main/java/me/hsgamer/hscore/bukkit/gui/holder/listener/BukkitInventoryListener.java +++ b/bukkit/gui/holder/src/main/java/me/hsgamer/hscore/bukkit/gui/holder/listener/BukkitInventoryListener.java @@ -5,7 +5,7 @@ import me.hsgamer.hscore.bukkit.gui.holder.BukkitGUIHolder; import me.hsgamer.hscore.bukkit.gui.holder.event.BukkitCloseEvent; import me.hsgamer.hscore.bukkit.gui.holder.event.BukkitOpenEvent; -import me.hsgamer.hscore.minecraft.gui.common.element.GUIElement; +import me.hsgamer.hscore.minecraft.gui.common.GUIElement; import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.bukkit.event.EventPriority; diff --git a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/GUIElement.java b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/GUIElement.java similarity index 83% rename from minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/GUIElement.java rename to minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/GUIElement.java index 3307e00b5..782be9824 100644 --- a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/GUIElement.java +++ b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/GUIElement.java @@ -1,4 +1,4 @@ -package me.hsgamer.hscore.minecraft.gui.common.element; +package me.hsgamer.hscore.minecraft.gui.common; /** * An element of the GUI diff --git a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/Button.java b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/Button.java index f086b2904..1a31491b6 100644 --- a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/Button.java +++ b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/Button.java @@ -1,6 +1,6 @@ package me.hsgamer.hscore.minecraft.gui.common.button; -import me.hsgamer.hscore.minecraft.gui.common.element.GUIElement; +import me.hsgamer.hscore.minecraft.gui.common.GUIElement; import me.hsgamer.hscore.minecraft.gui.common.inventory.InventoryContext; import me.hsgamer.hscore.minecraft.gui.common.item.ActionItem; import org.jetbrains.annotations.NotNull; diff --git a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/ButtonMap.java b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/ButtonMap.java index aa1621237..890d50423 100644 --- a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/ButtonMap.java +++ b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/button/ButtonMap.java @@ -1,6 +1,6 @@ package me.hsgamer.hscore.minecraft.gui.common.button; -import me.hsgamer.hscore.minecraft.gui.common.element.GUIElement; +import me.hsgamer.hscore.minecraft.gui.common.GUIElement; import me.hsgamer.hscore.minecraft.gui.common.inventory.InventoryContext; import me.hsgamer.hscore.minecraft.gui.common.item.ActionItem; import org.jetbrains.annotations.NotNull; diff --git a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/package-info.java b/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/package-info.java deleted file mode 100644 index 5f68ffb6a..000000000 --- a/minecraft/gui/common/src/main/java/me/hsgamer/hscore/minecraft/gui/common/element/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * The package for the elements of the GUI - */ -package me.hsgamer.hscore.minecraft.gui.common.element; \ No newline at end of file diff --git a/minecraft/gui/holder/src/main/java/me/hsgamer/hscore/minecraft/gui/holder/GUIHolder.java b/minecraft/gui/holder/src/main/java/me/hsgamer/hscore/minecraft/gui/holder/GUIHolder.java index 80db53c0d..605c7d703 100644 --- a/minecraft/gui/holder/src/main/java/me/hsgamer/hscore/minecraft/gui/holder/GUIHolder.java +++ b/minecraft/gui/holder/src/main/java/me/hsgamer/hscore/minecraft/gui/holder/GUIHolder.java @@ -1,7 +1,7 @@ package me.hsgamer.hscore.minecraft.gui.holder; import me.hsgamer.hscore.minecraft.gui.common.button.ButtonMap; -import me.hsgamer.hscore.minecraft.gui.common.element.GUIElement; +import me.hsgamer.hscore.minecraft.gui.common.GUIElement; import me.hsgamer.hscore.minecraft.gui.common.event.ClickEvent; import me.hsgamer.hscore.minecraft.gui.common.inventory.InventoryContext; import me.hsgamer.hscore.minecraft.gui.common.item.ActionItem;