From bad8f89ba242d15327c77ab504ea147a6e37cb13 Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Tue, 2 Feb 2021 21:10:08 +0100 Subject: [PATCH] Renamed to InvUI --- .gitignore | 2 +- README.md | 2 +- pom.xml | 2 +- .../{invgui/InvGui.java => invui/InvUI.java} | 16 +++++------ .../animation/Animation.java | 6 ++-- .../animation/impl/BaseAnimation.java | 14 +++++----- .../animation/impl/ColumnAnimation.java | 2 +- .../impl/HorizontalSnakeAnimation.java | 2 +- .../animation/impl/RandomAnimation.java | 4 +-- .../animation/impl/RowAnimation.java | 2 +- .../animation/impl/SequentialAnimation.java | 4 +-- .../animation/impl/SoundAnimation.java | 2 +- .../impl/SplitSequentialAnimation.java | 2 +- .../impl/VerticalSnakeAnimation.java | 2 +- .../studiocode/{invgui => invui}/gui/GUI.java | 14 +++++----- .../{invgui => invui}/gui/GUIParent.java | 2 +- .../{invgui => invui}/gui/SlotElement.java | 6 ++-- .../gui/builder/GUIBuilder.java | 10 +++---- .../gui/builder/PagedGUIBuilder.java | 16 +++++------ .../gui/builder/TabGUIBuilder.java | 14 +++++----- .../{invgui => invui}/gui/impl/BaseGUI.java | 18 ++++++------ .../gui/impl/IndexedGUI.java | 28 +++++++++---------- .../{invgui => invui}/gui/impl/PagedGUI.java | 10 +++---- .../{invgui => invui}/gui/impl/SimpleGUI.java | 2 +- .../gui/impl/SimplePagedGUIs.java | 12 ++++---- .../gui/impl/SimplePagedItemsGUI.java | 14 +++++----- .../gui/impl/SimpleTabGUI.java | 10 +++---- .../{invgui => invui}/gui/impl/TabGUI.java | 8 +++--- .../{invgui => invui}/item/Item.java | 6 ++-- .../item/impl/AutoCycleItem.java | 10 +++---- .../item/impl/AutoUpdateItem.java | 10 +++---- .../{invgui => invui}/item/impl/BaseItem.java | 6 ++-- .../item/impl/CommandItem.java | 6 ++-- .../item/impl/CycleItem.java | 6 ++-- .../item/impl/FunctionItem.java | 4 +-- .../item/impl/SimpleItem.java | 6 ++-- .../item/impl/SupplierItem.java | 4 +-- .../item/impl/pagedgui/BackItem.java | 8 +++--- .../item/impl/pagedgui/ForwardItem.java | 8 +++--- .../item/impl/tabgui/TabItem.java | 8 +++--- .../item/itembuilder/ItemBuilder.java | 12 ++++---- .../resourcepack/CustomItem.java | 8 +++--- .../resourcepack/ForceResourcePack.java | 8 +++--- .../{invgui => invui}/util/ArrayUtils.java | 2 +- .../util/MojangApiUtils.java | 2 +- .../{invgui => invui}/util/Pair.java | 2 +- .../{invgui => invui}/util/SlotUtils.java | 2 +- .../{invgui => invui}/util/WebUtils.java | 2 +- .../util/reflection/ReflectionRegistry.java | 4 +-- .../util/reflection/ReflectionUtils.java | 4 +-- .../virtualinventory/VirtualInventory.java | 14 +++++----- .../VirtualInventoryManager.java | 8 +++--- .../event/ItemUpdateEvent.java | 4 +-- .../{invgui => invui}/window/Window.java | 18 ++++++------ .../window/WindowManager.java | 8 +++--- .../window/impl/BaseWindow.java | 22 +++++++-------- .../impl/combined/BaseCombinedWindow.java | 10 +++---- .../combinedgui/CombinedGUIWindow.java | 10 +++---- .../combinedgui/SimpleCombinedGUIWindow.java | 4 +-- .../splitgui/SimpleSplitGUIWindow.java | 4 +-- .../combined/splitgui/SplitGUIWindow.java | 10 +++---- .../window/impl/single/SimpleWindow.java | 4 +-- .../window/impl/single/SingleWindow.java | 8 +++--- 63 files changed, 239 insertions(+), 239 deletions(-) rename src/main/java/de/studiocode/{invgui/InvGui.java => invui/InvUI.java} (61%) rename src/main/java/de/studiocode/{invgui => invui}/animation/Animation.java (92%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/BaseAnimation.java (90%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/ColumnAnimation.java (94%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/HorizontalSnakeAnimation.java (95%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/RandomAnimation.java (88%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/RowAnimation.java (94%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/SequentialAnimation.java (85%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/SoundAnimation.java (89%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/SplitSequentialAnimation.java (93%) rename src/main/java/de/studiocode/{invgui => invui}/animation/impl/VerticalSnakeAnimation.java (95%) rename src/main/java/de/studiocode/{invgui => invui}/gui/GUI.java (97%) rename src/main/java/de/studiocode/{invgui => invui}/gui/GUIParent.java (91%) rename src/main/java/de/studiocode/{invgui => invui}/gui/SlotElement.java (95%) rename src/main/java/de/studiocode/{invgui => invui}/gui/builder/GUIBuilder.java (95%) rename src/main/java/de/studiocode/{invgui => invui}/gui/builder/PagedGUIBuilder.java (90%) rename src/main/java/de/studiocode/{invgui => invui}/gui/builder/TabGUIBuilder.java (87%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/BaseGUI.java (90%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/IndexedGUI.java (94%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/PagedGUI.java (91%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/SimpleGUI.java (77%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/SimplePagedGUIs.java (77%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/SimplePagedItemsGUI.java (78%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/SimpleTabGUI.java (80%) rename src/main/java/de/studiocode/{invgui => invui}/gui/impl/TabGUI.java (88%) rename src/main/java/de/studiocode/{invgui => invui}/item/Item.java (93%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/AutoCycleItem.java (78%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/AutoUpdateItem.java (62%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/BaseItem.java (83%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/CommandItem.java (83%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/CycleItem.java (91%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/FunctionItem.java (88%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/SimpleItem.java (82%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/SupplierItem.java (86%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/pagedgui/BackItem.java (72%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/pagedgui/ForwardItem.java (73%) rename src/main/java/de/studiocode/{invgui => invui}/item/impl/tabgui/TabItem.java (75%) rename src/main/java/de/studiocode/{invgui => invui}/item/itembuilder/ItemBuilder.java (95%) rename src/main/java/de/studiocode/{invgui => invui}/resourcepack/CustomItem.java (94%) rename src/main/java/de/studiocode/{invgui => invui}/resourcepack/ForceResourcePack.java (91%) rename src/main/java/de/studiocode/{invgui => invui}/util/ArrayUtils.java (95%) rename src/main/java/de/studiocode/{invgui => invui}/util/MojangApiUtils.java (98%) rename src/main/java/de/studiocode/{invgui => invui}/util/Pair.java (92%) rename src/main/java/de/studiocode/{invgui => invui}/util/SlotUtils.java (98%) rename src/main/java/de/studiocode/{invgui => invui}/util/WebUtils.java (94%) rename src/main/java/de/studiocode/{invgui => invui}/util/reflection/ReflectionRegistry.java (87%) rename src/main/java/de/studiocode/{invgui => invui}/util/reflection/ReflectionUtils.java (96%) rename src/main/java/de/studiocode/{invgui => invui}/virtualinventory/VirtualInventory.java (97%) rename src/main/java/de/studiocode/{invgui => invui}/virtualinventory/VirtualInventoryManager.java (91%) rename src/main/java/de/studiocode/{invgui => invui}/virtualinventory/event/ItemUpdateEvent.java (97%) rename src/main/java/de/studiocode/{invgui => invui}/window/Window.java (90%) rename src/main/java/de/studiocode/{invgui => invui}/window/WindowManager.java (94%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/BaseWindow.java (91%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/combined/BaseCombinedWindow.java (93%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/combined/combinedgui/CombinedGUIWindow.java (82%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java (88%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/combined/splitgui/SimpleSplitGUIWindow.java (87%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/combined/splitgui/SplitGUIWindow.java (86%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/single/SimpleWindow.java (90%) rename src/main/java/de/studiocode/{invgui => invui}/window/impl/single/SingleWindow.java (91%) diff --git a/.gitignore b/.gitignore index 5bc51b6..b1b60b1 100644 --- a/.gitignore +++ b/.gitignore @@ -56,5 +56,5 @@ target/ # Testing src/test/ -src/main/java/de/studiocode/invgui/InvGuiPlugin.java +src/main/java/de/studiocode/invui/InvUIPlugin.java src/main/resources/plugin.yml diff --git a/README.md b/README.md index a78d30d..4c1922d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# InvGui +# InvUI An unfinished Spigot Inventory API diff --git a/pom.xml b/pom.xml index 97ab308..043363d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 de.studiocode - InvGUI + InvUI 0.1-SNAPSHOT diff --git a/src/main/java/de/studiocode/invgui/InvGui.java b/src/main/java/de/studiocode/invui/InvUI.java similarity index 61% rename from src/main/java/de/studiocode/invgui/InvGui.java rename to src/main/java/de/studiocode/invui/InvUI.java index 2dad311..46fa296 100644 --- a/src/main/java/de/studiocode/invgui/InvGui.java +++ b/src/main/java/de/studiocode/invui/InvUI.java @@ -1,26 +1,26 @@ -package de.studiocode.invgui; +package de.studiocode.invui; -import de.studiocode.invgui.util.reflection.ReflectionUtils; +import de.studiocode.invui.util.reflection.ReflectionUtils; import org.bukkit.plugin.Plugin; import java.util.ArrayList; import java.util.List; -import static de.studiocode.invgui.util.reflection.ReflectionRegistry.PLUGIN_CLASS_LOADER_PLUGIN_FIELD; +import static de.studiocode.invui.util.reflection.ReflectionRegistry.PLUGIN_CLASS_LOADER_PLUGIN_FIELD; -public class InvGui { +public class InvUI { - private static InvGui instance; + private static InvUI instance; private final List disableHandlers = new ArrayList<>(); private final Plugin plugin; - public InvGui() { + public InvUI() { this.plugin = ReflectionUtils.getFieldValue(PLUGIN_CLASS_LOADER_PLUGIN_FIELD, getClass().getClassLoader()); } - public static InvGui getInstance() { - return instance == null ? instance = new InvGui() : instance; + public static InvUI getInstance() { + return instance == null ? instance = new InvUI() : instance; } public Plugin getPlugin() { diff --git a/src/main/java/de/studiocode/invgui/animation/Animation.java b/src/main/java/de/studiocode/invui/animation/Animation.java similarity index 92% rename from src/main/java/de/studiocode/invgui/animation/Animation.java rename to src/main/java/de/studiocode/invui/animation/Animation.java index 1c32657..cdfc84d 100644 --- a/src/main/java/de/studiocode/invgui/animation/Animation.java +++ b/src/main/java/de/studiocode/invui/animation/Animation.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.animation; +package de.studiocode.invui.animation; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.window.Window; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/animation/impl/BaseAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/BaseAnimation.java similarity index 90% rename from src/main/java/de/studiocode/invgui/animation/impl/BaseAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/BaseAnimation.java index c0f8243..1552808 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/BaseAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/BaseAnimation.java @@ -1,10 +1,10 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; -import de.studiocode.invgui.InvGui; -import de.studiocode.invgui.animation.Animation; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.util.SlotUtils; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.InvUI; +import de.studiocode.invui.animation.Animation; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.util.SlotUtils; +import de.studiocode.invui.window.Window; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; @@ -69,7 +69,7 @@ public abstract class BaseAnimation implements Animation { @Override public void start() { - task = Bukkit.getScheduler().runTaskTimer(InvGui.getInstance().getPlugin(), () -> { + task = Bukkit.getScheduler().runTaskTimer(InvUI.getInstance().getPlugin(), () -> { // if there are no viewers for more than 3 ticks, the animation can be cancelled if (getCurrentViewers().isEmpty()) { noViewerTicks++; diff --git a/src/main/java/de/studiocode/invgui/animation/impl/ColumnAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/ColumnAnimation.java similarity index 94% rename from src/main/java/de/studiocode/invgui/animation/impl/ColumnAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/ColumnAnimation.java index c13eb10..78c6fda 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/ColumnAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/ColumnAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; public class ColumnAnimation extends SoundAnimation { diff --git a/src/main/java/de/studiocode/invgui/animation/impl/HorizontalSnakeAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/HorizontalSnakeAnimation.java similarity index 95% rename from src/main/java/de/studiocode/invgui/animation/impl/HorizontalSnakeAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/HorizontalSnakeAnimation.java index f6459fa..314daa5 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/HorizontalSnakeAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/HorizontalSnakeAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; public class HorizontalSnakeAnimation extends SoundAnimation { diff --git a/src/main/java/de/studiocode/invgui/animation/impl/RandomAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/RandomAnimation.java similarity index 88% rename from src/main/java/de/studiocode/invgui/animation/impl/RandomAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/RandomAnimation.java index 2b10e13..3c3d203 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/RandomAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/RandomAnimation.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; -import de.studiocode.invgui.item.Item; +import de.studiocode.invui.item.Item; import java.util.List; import java.util.Random; diff --git a/src/main/java/de/studiocode/invgui/animation/impl/RowAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/RowAnimation.java similarity index 94% rename from src/main/java/de/studiocode/invgui/animation/impl/RowAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/RowAnimation.java index e898060..4fbb948 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/RowAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/RowAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; public class RowAnimation extends SoundAnimation { diff --git a/src/main/java/de/studiocode/invgui/animation/impl/SequentialAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/SequentialAnimation.java similarity index 85% rename from src/main/java/de/studiocode/invgui/animation/impl/SequentialAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/SequentialAnimation.java index a773f8f..cb9a2de 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/SequentialAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/SequentialAnimation.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; -import de.studiocode.invgui.item.Item; +import de.studiocode.invui.item.Item; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/animation/impl/SoundAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/SoundAnimation.java similarity index 89% rename from src/main/java/de/studiocode/invgui/animation/impl/SoundAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/SoundAnimation.java index 9833dff..2156bad 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/SoundAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/SoundAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; import org.bukkit.Sound; diff --git a/src/main/java/de/studiocode/invgui/animation/impl/SplitSequentialAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/SplitSequentialAnimation.java similarity index 93% rename from src/main/java/de/studiocode/invgui/animation/impl/SplitSequentialAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/SplitSequentialAnimation.java index 89c1954..6113f46 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/SplitSequentialAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/SplitSequentialAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/animation/impl/VerticalSnakeAnimation.java b/src/main/java/de/studiocode/invui/animation/impl/VerticalSnakeAnimation.java similarity index 95% rename from src/main/java/de/studiocode/invgui/animation/impl/VerticalSnakeAnimation.java rename to src/main/java/de/studiocode/invui/animation/impl/VerticalSnakeAnimation.java index a6b3037..b98d674 100644 --- a/src/main/java/de/studiocode/invgui/animation/impl/VerticalSnakeAnimation.java +++ b/src/main/java/de/studiocode/invui/animation/impl/VerticalSnakeAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.animation.impl; +package de.studiocode.invui.animation.impl; public class VerticalSnakeAnimation extends SoundAnimation { diff --git a/src/main/java/de/studiocode/invgui/gui/GUI.java b/src/main/java/de/studiocode/invui/gui/GUI.java similarity index 97% rename from src/main/java/de/studiocode/invgui/gui/GUI.java rename to src/main/java/de/studiocode/invui/gui/GUI.java index 642ebe4..24375d8 100644 --- a/src/main/java/de/studiocode/invgui/gui/GUI.java +++ b/src/main/java/de/studiocode/invui/gui/GUI.java @@ -1,11 +1,11 @@ -package de.studiocode.invgui.gui; +package de.studiocode.invui.gui; -import de.studiocode.invgui.animation.Animation; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.gui.impl.*; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.virtualinventory.VirtualInventory; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.animation.Animation; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.gui.impl.*; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.virtualinventory.VirtualInventory; +import de.studiocode.invui.window.Window; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/gui/GUIParent.java b/src/main/java/de/studiocode/invui/gui/GUIParent.java similarity index 91% rename from src/main/java/de/studiocode/invgui/gui/GUIParent.java rename to src/main/java/de/studiocode/invui/gui/GUIParent.java index f271e8b..1c18cfc 100644 --- a/src/main/java/de/studiocode/invgui/gui/GUIParent.java +++ b/src/main/java/de/studiocode/invui/gui/GUIParent.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.gui; +package de.studiocode.invui.gui; public interface GUIParent { diff --git a/src/main/java/de/studiocode/invgui/gui/SlotElement.java b/src/main/java/de/studiocode/invui/gui/SlotElement.java similarity index 95% rename from src/main/java/de/studiocode/invgui/gui/SlotElement.java rename to src/main/java/de/studiocode/invui/gui/SlotElement.java index 4a66e8f..5f80e2f 100644 --- a/src/main/java/de/studiocode/invgui/gui/SlotElement.java +++ b/src/main/java/de/studiocode/invui/gui/SlotElement.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.gui; +package de.studiocode.invui.gui; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.virtualinventory.VirtualInventory; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.inventory.ItemStack; import java.util.UUID; diff --git a/src/main/java/de/studiocode/invgui/gui/builder/GUIBuilder.java b/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java similarity index 95% rename from src/main/java/de/studiocode/invgui/gui/builder/GUIBuilder.java rename to src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java index 74a650a..d12ffd9 100644 --- a/src/main/java/de/studiocode/invgui/gui/builder/GUIBuilder.java +++ b/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java @@ -1,9 +1,9 @@ -package de.studiocode.invgui.gui.builder; +package de.studiocode.invui.gui.builder; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.gui.impl.SimpleGUI; -import de.studiocode.invgui.item.Item; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.gui.impl.SimpleGUI; +import de.studiocode.invui.item.Item; import org.bukkit.inventory.ShapedRecipe; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/studiocode/invgui/gui/builder/PagedGUIBuilder.java b/src/main/java/de/studiocode/invui/gui/builder/PagedGUIBuilder.java similarity index 90% rename from src/main/java/de/studiocode/invgui/gui/builder/PagedGUIBuilder.java rename to src/main/java/de/studiocode/invui/gui/builder/PagedGUIBuilder.java index 2eeb593..60cf52f 100644 --- a/src/main/java/de/studiocode/invgui/gui/builder/PagedGUIBuilder.java +++ b/src/main/java/de/studiocode/invui/gui/builder/PagedGUIBuilder.java @@ -1,12 +1,12 @@ -package de.studiocode.invgui.gui.builder; +package de.studiocode.invui.gui.builder; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.gui.impl.PagedGUI; -import de.studiocode.invgui.gui.impl.SimplePagedGUIs; -import de.studiocode.invgui.gui.impl.SimplePagedItemsGUI; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.gui.impl.PagedGUI; +import de.studiocode.invui.gui.impl.SimplePagedGUIs; +import de.studiocode.invui.gui.impl.SimplePagedItemsGUI; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/gui/builder/TabGUIBuilder.java b/src/main/java/de/studiocode/invui/gui/builder/TabGUIBuilder.java similarity index 87% rename from src/main/java/de/studiocode/invgui/gui/builder/TabGUIBuilder.java rename to src/main/java/de/studiocode/invui/gui/builder/TabGUIBuilder.java index 87bfab1..6e7cf30 100644 --- a/src/main/java/de/studiocode/invgui/gui/builder/TabGUIBuilder.java +++ b/src/main/java/de/studiocode/invui/gui/builder/TabGUIBuilder.java @@ -1,11 +1,11 @@ -package de.studiocode.invgui.gui.builder; +package de.studiocode.invui.gui.builder; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.gui.impl.SimpleTabGUI; -import de.studiocode.invgui.gui.impl.TabGUI; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.gui.impl.SimpleTabGUI; +import de.studiocode.invui.gui.impl.TabGUI; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.jetbrains.annotations.NotNull; import java.util.LinkedHashMap; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/BaseGUI.java b/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java similarity index 90% rename from src/main/java/de/studiocode/invgui/gui/impl/BaseGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java index 83183ca..4d4a52f 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/BaseGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java @@ -1,13 +1,13 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.gui.SlotElement.LinkedSlotElement; -import de.studiocode.invgui.gui.SlotElement.VISlotElement; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.util.SlotUtils; -import de.studiocode.invgui.virtualinventory.VirtualInventory; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.gui.SlotElement.LinkedSlotElement; +import de.studiocode.invui.gui.SlotElement.VISlotElement; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.util.SlotUtils; +import de.studiocode.invui.virtualinventory.VirtualInventory; import org.jetbrains.annotations.NotNull; import java.util.SortedSet; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/IndexedGUI.java b/src/main/java/de/studiocode/invui/gui/impl/IndexedGUI.java similarity index 94% rename from src/main/java/de/studiocode/invgui/gui/impl/IndexedGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/IndexedGUI.java index d3da316..3fdfe25 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/IndexedGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/IndexedGUI.java @@ -1,18 +1,18 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.animation.Animation; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.GUIParent; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.gui.SlotElement.ItemSlotElement; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.gui.SlotElement.LinkedSlotElement; -import de.studiocode.invgui.gui.SlotElement.VISlotElement; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.util.ArrayUtils; -import de.studiocode.invgui.virtualinventory.VirtualInventory; -import de.studiocode.invgui.virtualinventory.event.ItemUpdateEvent; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.animation.Animation; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.GUIParent; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.gui.SlotElement.ItemSlotElement; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.gui.SlotElement.LinkedSlotElement; +import de.studiocode.invui.gui.SlotElement.VISlotElement; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.util.ArrayUtils; +import de.studiocode.invui.virtualinventory.VirtualInventory; +import de.studiocode.invui.virtualinventory.event.ItemUpdateEvent; +import de.studiocode.invui.window.Window; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/PagedGUI.java b/src/main/java/de/studiocode/invui/gui/impl/PagedGUI.java similarity index 91% rename from src/main/java/de/studiocode/invgui/gui/impl/PagedGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/PagedGUI.java index 8ee8e11..b0d5082 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/PagedGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/PagedGUI.java @@ -1,9 +1,9 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.impl.pagedgui.BackItem; -import de.studiocode.invgui.item.impl.pagedgui.ForwardItem; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.impl.pagedgui.BackItem; +import de.studiocode.invui.item.impl.pagedgui.ForwardItem; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/SimpleGUI.java b/src/main/java/de/studiocode/invui/gui/impl/SimpleGUI.java similarity index 77% rename from src/main/java/de/studiocode/invgui/gui/impl/SimpleGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/SimpleGUI.java index c9f08bc..6c2743d 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/SimpleGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/SimpleGUI.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; public class SimpleGUI extends BaseGUI { diff --git a/src/main/java/de/studiocode/invgui/gui/impl/SimplePagedGUIs.java b/src/main/java/de/studiocode/invui/gui/impl/SimplePagedGUIs.java similarity index 77% rename from src/main/java/de/studiocode/invgui/gui/impl/SimplePagedGUIs.java rename to src/main/java/de/studiocode/invui/gui/impl/SimplePagedGUIs.java index 767315e..085a655 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/SimplePagedGUIs.java +++ b/src/main/java/de/studiocode/invui/gui/impl/SimplePagedGUIs.java @@ -1,10 +1,10 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.item.impl.pagedgui.BackItem; -import de.studiocode.invgui.item.impl.pagedgui.ForwardItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.item.impl.pagedgui.BackItem; +import de.studiocode.invui.item.impl.pagedgui.ForwardItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/SimplePagedItemsGUI.java b/src/main/java/de/studiocode/invui/gui/impl/SimplePagedItemsGUI.java similarity index 78% rename from src/main/java/de/studiocode/invgui/gui/impl/SimplePagedItemsGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/SimplePagedItemsGUI.java index 497cf43..51d6a64 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/SimplePagedItemsGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/SimplePagedItemsGUI.java @@ -1,11 +1,11 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.gui.SlotElement.ItemSlotElement; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.impl.pagedgui.BackItem; -import de.studiocode.invgui.item.impl.pagedgui.ForwardItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.gui.SlotElement.ItemSlotElement; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.impl.pagedgui.BackItem; +import de.studiocode.invui.item.impl.pagedgui.ForwardItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/SimpleTabGUI.java b/src/main/java/de/studiocode/invui/gui/impl/SimpleTabGUI.java similarity index 80% rename from src/main/java/de/studiocode/invgui/gui/impl/SimpleTabGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/SimpleTabGUI.java index f6b86e3..3af5797 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/SimpleTabGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/SimpleTabGUI.java @@ -1,9 +1,9 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.item.impl.tabgui.TabItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.item.impl.tabgui.TabItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/studiocode/invgui/gui/impl/TabGUI.java b/src/main/java/de/studiocode/invui/gui/impl/TabGUI.java similarity index 88% rename from src/main/java/de/studiocode/invgui/gui/impl/TabGUI.java rename to src/main/java/de/studiocode/invui/gui/impl/TabGUI.java index 5bae870..af6cac8 100644 --- a/src/main/java/de/studiocode/invgui/gui/impl/TabGUI.java +++ b/src/main/java/de/studiocode/invui/gui/impl/TabGUI.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.gui.impl; +package de.studiocode.invui.gui.impl; -import de.studiocode.invgui.gui.SlotElement; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.impl.tabgui.TabItem; +import de.studiocode.invui.gui.SlotElement; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.impl.tabgui.TabItem; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/studiocode/invgui/item/Item.java b/src/main/java/de/studiocode/invui/item/Item.java similarity index 93% rename from src/main/java/de/studiocode/invgui/item/Item.java rename to src/main/java/de/studiocode/invui/item/Item.java index c3a245a..2c987b1 100644 --- a/src/main/java/de/studiocode/invgui/item/Item.java +++ b/src/main/java/de/studiocode/invui/item/Item.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.item; +package de.studiocode.invui.item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.window.Window; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/AutoCycleItem.java b/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java similarity index 78% rename from src/main/java/de/studiocode/invgui/item/impl/AutoCycleItem.java rename to src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java index 635a097..afcfdd2 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/AutoCycleItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.InvGui; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.InvUI; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -22,7 +22,7 @@ public class AutoCycleItem extends BaseItem { public AutoCycleItem(int period, ItemBuilder... itemBuilders) { this.itemBuilders = itemBuilders; - task = Bukkit.getScheduler().runTaskTimer(InvGui.getInstance().getPlugin(), this::cycle, 0, period); + task = Bukkit.getScheduler().runTaskTimer(InvUI.getInstance().getPlugin(), this::cycle, 0, period); } public void cancel() { diff --git a/src/main/java/de/studiocode/invgui/item/impl/AutoUpdateItem.java b/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java similarity index 62% rename from src/main/java/de/studiocode/invgui/item/impl/AutoUpdateItem.java rename to src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java index 79d85fa..8f46630 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/AutoUpdateItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.InvGui; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.InvUI; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; @@ -18,7 +18,7 @@ public class AutoUpdateItem extends SupplierItem { public AutoUpdateItem(int period, Supplier builderSupplier) { super(builderSupplier); - task = Bukkit.getScheduler().runTaskTimer(InvGui.getInstance().getPlugin(), this::notifyWindows, 0, period); + task = Bukkit.getScheduler().runTaskTimer(InvUI.getInstance().getPlugin(), this::notifyWindows, 0, period); } public void cancel() { diff --git a/src/main/java/de/studiocode/invgui/item/impl/BaseItem.java b/src/main/java/de/studiocode/invui/item/impl/BaseItem.java similarity index 83% rename from src/main/java/de/studiocode/invgui/item/impl/BaseItem.java rename to src/main/java/de/studiocode/invui/item/impl/BaseItem.java index 1e9b107..1e6631a 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/BaseItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/BaseItem.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.window.Window; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/studiocode/invgui/item/impl/CommandItem.java b/src/main/java/de/studiocode/invui/item/impl/CommandItem.java similarity index 83% rename from src/main/java/de/studiocode/invgui/item/impl/CommandItem.java rename to src/main/java/de/studiocode/invui/item/impl/CommandItem.java index f3d9858..95ea157 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/CommandItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/CommandItem.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/CycleItem.java b/src/main/java/de/studiocode/invui/item/impl/CycleItem.java similarity index 91% rename from src/main/java/de/studiocode/invgui/item/impl/CycleItem.java rename to src/main/java/de/studiocode/invui/item/impl/CycleItem.java index a83d8df..cdc0822 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/CycleItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/CycleItem.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/FunctionItem.java b/src/main/java/de/studiocode/invui/item/impl/FunctionItem.java similarity index 88% rename from src/main/java/de/studiocode/invgui/item/impl/FunctionItem.java rename to src/main/java/de/studiocode/invui/item/impl/FunctionItem.java index e03fb35..a108cb1 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/FunctionItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/FunctionItem.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/SimpleItem.java b/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java similarity index 82% rename from src/main/java/de/studiocode/invgui/item/impl/SimpleItem.java rename to src/main/java/de/studiocode/invui/item/impl/SimpleItem.java index 2c3a653..ed16ae0 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/SimpleItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java @@ -1,7 +1,7 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/SupplierItem.java b/src/main/java/de/studiocode/invui/item/impl/SupplierItem.java similarity index 86% rename from src/main/java/de/studiocode/invgui/item/impl/SupplierItem.java rename to src/main/java/de/studiocode/invui/item/impl/SupplierItem.java index bced03d..e907544 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/SupplierItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/SupplierItem.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.item.impl; +package de.studiocode.invui.item.impl; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/pagedgui/BackItem.java b/src/main/java/de/studiocode/invui/item/impl/pagedgui/BackItem.java similarity index 72% rename from src/main/java/de/studiocode/invgui/item/impl/pagedgui/BackItem.java rename to src/main/java/de/studiocode/invui/item/impl/pagedgui/BackItem.java index 05d7a17..48c320e 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/pagedgui/BackItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/pagedgui/BackItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.item.impl.pagedgui; +package de.studiocode.invui.item.impl.pagedgui; -import de.studiocode.invgui.gui.impl.PagedGUI; -import de.studiocode.invgui.item.impl.FunctionItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.impl.PagedGUI; +import de.studiocode.invui.item.impl.FunctionItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/pagedgui/ForwardItem.java b/src/main/java/de/studiocode/invui/item/impl/pagedgui/ForwardItem.java similarity index 73% rename from src/main/java/de/studiocode/invgui/item/impl/pagedgui/ForwardItem.java rename to src/main/java/de/studiocode/invui/item/impl/pagedgui/ForwardItem.java index 270f07f..18f24e7 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/pagedgui/ForwardItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/pagedgui/ForwardItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.item.impl.pagedgui; +package de.studiocode.invui.item.impl.pagedgui; -import de.studiocode.invgui.gui.impl.PagedGUI; -import de.studiocode.invgui.item.impl.FunctionItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.impl.PagedGUI; +import de.studiocode.invui.item.impl.FunctionItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/impl/tabgui/TabItem.java b/src/main/java/de/studiocode/invui/item/impl/tabgui/TabItem.java similarity index 75% rename from src/main/java/de/studiocode/invgui/item/impl/tabgui/TabItem.java rename to src/main/java/de/studiocode/invui/item/impl/tabgui/TabItem.java index d64de6c..1c0c3e5 100644 --- a/src/main/java/de/studiocode/invgui/item/impl/tabgui/TabItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/tabgui/TabItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.item.impl.tabgui; +package de.studiocode.invui.item.impl.tabgui; -import de.studiocode.invgui.gui.impl.TabGUI; -import de.studiocode.invgui.item.impl.FunctionItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.gui.impl.TabGUI; +import de.studiocode.invui.item.impl.FunctionItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/item/itembuilder/ItemBuilder.java b/src/main/java/de/studiocode/invui/item/itembuilder/ItemBuilder.java similarity index 95% rename from src/main/java/de/studiocode/invgui/item/itembuilder/ItemBuilder.java rename to src/main/java/de/studiocode/invui/item/itembuilder/ItemBuilder.java index 6ceaf1e..9bdc715 100644 --- a/src/main/java/de/studiocode/invgui/item/itembuilder/ItemBuilder.java +++ b/src/main/java/de/studiocode/invui/item/itembuilder/ItemBuilder.java @@ -1,13 +1,13 @@ -package de.studiocode.invgui.item.itembuilder; +package de.studiocode.invui.item.itembuilder; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.PropertyMap; -import de.studiocode.invgui.util.MojangApiUtils; -import de.studiocode.invgui.util.Pair; -import de.studiocode.invgui.util.reflection.ReflectionRegistry; -import de.studiocode.invgui.util.reflection.ReflectionUtils; -import de.studiocode.invgui.window.impl.BaseWindow; +import de.studiocode.invui.util.MojangApiUtils; +import de.studiocode.invui.util.Pair; +import de.studiocode.invui.util.reflection.ReflectionRegistry; +import de.studiocode.invui.util.reflection.ReflectionUtils; +import de.studiocode.invui.window.impl.BaseWindow; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/src/main/java/de/studiocode/invgui/resourcepack/CustomItem.java b/src/main/java/de/studiocode/invui/resourcepack/CustomItem.java similarity index 94% rename from src/main/java/de/studiocode/invgui/resourcepack/CustomItem.java rename to src/main/java/de/studiocode/invui/resourcepack/CustomItem.java index 125f85f..228bb12 100644 --- a/src/main/java/de/studiocode/invgui/resourcepack/CustomItem.java +++ b/src/main/java/de/studiocode/invui/resourcepack/CustomItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.resourcepack; +package de.studiocode.invui.resourcepack; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.impl.SimpleItem; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.impl.SimpleItem; +import de.studiocode.invui.item.itembuilder.ItemBuilder; import org.bukkit.Material; import java.util.HashMap; diff --git a/src/main/java/de/studiocode/invgui/resourcepack/ForceResourcePack.java b/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java similarity index 91% rename from src/main/java/de/studiocode/invgui/resourcepack/ForceResourcePack.java rename to src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java index f2f72ea..fd615d6 100644 --- a/src/main/java/de/studiocode/invgui/resourcepack/ForceResourcePack.java +++ b/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.resourcepack; +package de.studiocode.invui.resourcepack; -import de.studiocode.invgui.InvGui; +import de.studiocode.invui.InvUI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -23,7 +23,7 @@ public class ForceResourcePack implements Listener { private boolean activated; private ForceResourcePack() { - Bukkit.getPluginManager().registerEvents(this, InvGui.getInstance().getPlugin()); + Bukkit.getPluginManager().registerEvents(this, InvUI.getInstance().getPlugin()); Bukkit.getOnlinePlayers().forEach(this::sendResourcePack); } @@ -50,7 +50,7 @@ public class ForceResourcePack implements Listener { private void sendResourcePack(Player player) { player.setResourcePack(resourcePackUrl); - tasks.put(player, Bukkit.getScheduler().runTaskLater(InvGui.getInstance().getPlugin(), + tasks.put(player, Bukkit.getScheduler().runTaskLater(InvUI.getInstance().getPlugin(), () -> kickPlayer(player), 20 * 5)); } diff --git a/src/main/java/de/studiocode/invgui/util/ArrayUtils.java b/src/main/java/de/studiocode/invui/util/ArrayUtils.java similarity index 95% rename from src/main/java/de/studiocode/invgui/util/ArrayUtils.java rename to src/main/java/de/studiocode/invui/util/ArrayUtils.java index 6f522e4..942a6d7 100644 --- a/src/main/java/de/studiocode/invgui/util/ArrayUtils.java +++ b/src/main/java/de/studiocode/invui/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.util; +package de.studiocode.invui.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/studiocode/invgui/util/MojangApiUtils.java b/src/main/java/de/studiocode/invui/util/MojangApiUtils.java similarity index 98% rename from src/main/java/de/studiocode/invgui/util/MojangApiUtils.java rename to src/main/java/de/studiocode/invui/util/MojangApiUtils.java index 266da9f..704fef0 100644 --- a/src/main/java/de/studiocode/invgui/util/MojangApiUtils.java +++ b/src/main/java/de/studiocode/invui/util/MojangApiUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.util; +package de.studiocode.invui.util; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/main/java/de/studiocode/invgui/util/Pair.java b/src/main/java/de/studiocode/invui/util/Pair.java similarity index 92% rename from src/main/java/de/studiocode/invgui/util/Pair.java rename to src/main/java/de/studiocode/invui/util/Pair.java index 5467c08..7774280 100644 --- a/src/main/java/de/studiocode/invgui/util/Pair.java +++ b/src/main/java/de/studiocode/invui/util/Pair.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.util; +package de.studiocode.invui.util; public class Pair { diff --git a/src/main/java/de/studiocode/invgui/util/SlotUtils.java b/src/main/java/de/studiocode/invui/util/SlotUtils.java similarity index 98% rename from src/main/java/de/studiocode/invgui/util/SlotUtils.java rename to src/main/java/de/studiocode/invui/util/SlotUtils.java index a318fb2..0a6ad75 100644 --- a/src/main/java/de/studiocode/invgui/util/SlotUtils.java +++ b/src/main/java/de/studiocode/invui/util/SlotUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.util; +package de.studiocode.invui.util; import java.util.SortedSet; import java.util.TreeSet; diff --git a/src/main/java/de/studiocode/invgui/util/WebUtils.java b/src/main/java/de/studiocode/invui/util/WebUtils.java similarity index 94% rename from src/main/java/de/studiocode/invgui/util/WebUtils.java rename to src/main/java/de/studiocode/invui/util/WebUtils.java index b95112c..92e35c9 100644 --- a/src/main/java/de/studiocode/invgui/util/WebUtils.java +++ b/src/main/java/de/studiocode/invui/util/WebUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.util; +package de.studiocode.invui.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/studiocode/invgui/util/reflection/ReflectionRegistry.java b/src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java similarity index 87% rename from src/main/java/de/studiocode/invgui/util/reflection/ReflectionRegistry.java rename to src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java index 87970a6..9325ca2 100644 --- a/src/main/java/de/studiocode/invgui/util/reflection/ReflectionRegistry.java +++ b/src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.util.reflection; +package de.studiocode.invui.util.reflection; import java.lang.reflect.Field; -import static de.studiocode.invgui.util.reflection.ReflectionUtils.*; +import static de.studiocode.invui.util.reflection.ReflectionUtils.*; public class ReflectionRegistry { diff --git a/src/main/java/de/studiocode/invgui/util/reflection/ReflectionUtils.java b/src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java similarity index 96% rename from src/main/java/de/studiocode/invgui/util/reflection/ReflectionUtils.java rename to src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java index 01d1522..7ada448 100644 --- a/src/main/java/de/studiocode/invgui/util/reflection/ReflectionUtils.java +++ b/src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invgui.util.reflection; +package de.studiocode.invui.util.reflection; import org.bukkit.Bukkit; @@ -6,7 +6,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; -import static de.studiocode.invgui.util.reflection.ReflectionRegistry.*; +import static de.studiocode.invui.util.reflection.ReflectionRegistry.*; public class ReflectionUtils { diff --git a/src/main/java/de/studiocode/invgui/virtualinventory/VirtualInventory.java b/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java similarity index 97% rename from src/main/java/de/studiocode/invgui/virtualinventory/VirtualInventory.java rename to src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java index 31db8ab..341e941 100644 --- a/src/main/java/de/studiocode/invgui/virtualinventory/VirtualInventory.java +++ b/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java @@ -1,10 +1,10 @@ -package de.studiocode.invgui.virtualinventory; +package de.studiocode.invui.virtualinventory; -import de.studiocode.invgui.InvGui; -import de.studiocode.invgui.util.ArrayUtils; -import de.studiocode.invgui.util.Pair; -import de.studiocode.invgui.virtualinventory.event.ItemUpdateEvent; -import de.studiocode.invgui.window.Window; +import de.studiocode.invui.InvUI; +import de.studiocode.invui.util.ArrayUtils; +import de.studiocode.invui.util.Pair; +import de.studiocode.invui.virtualinventory.event.ItemUpdateEvent; +import de.studiocode.invui.window.Window; import org.bukkit.Bukkit; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.entity.Player; @@ -388,7 +388,7 @@ public class VirtualInventory implements ConfigurationSerializable { } private void notifyWindows() { - Bukkit.getScheduler().runTask(InvGui.getInstance().getPlugin(), () -> + Bukkit.getScheduler().runTask(InvUI.getInstance().getPlugin(), () -> windows.forEach(window -> window.handleVirtualInventoryUpdate(this))); } diff --git a/src/main/java/de/studiocode/invgui/virtualinventory/VirtualInventoryManager.java b/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java similarity index 91% rename from src/main/java/de/studiocode/invgui/virtualinventory/VirtualInventoryManager.java rename to src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java index 1f7c8b1..ea8f242 100644 --- a/src/main/java/de/studiocode/invgui/virtualinventory/VirtualInventoryManager.java +++ b/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.virtualinventory; +package de.studiocode.invui.virtualinventory; -import de.studiocode.invgui.InvGui; +import de.studiocode.invui.InvUI; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.jetbrains.annotations.NotNull; @@ -18,7 +18,7 @@ import java.util.UUID; */ public class VirtualInventoryManager { - private static final File SAVE_DIR = new File("plugins/InvGui/VirtualInventory/"); + private static final File SAVE_DIR = new File("plugins/InvUI/VirtualInventory/"); private static VirtualInventoryManager instance; @@ -26,7 +26,7 @@ public class VirtualInventoryManager { private VirtualInventoryManager() { ConfigurationSerialization.registerClass(VirtualInventory.class); - InvGui.getInstance().addDisableHandler(this::serializeAll); + InvUI.getInstance().addDisableHandler(this::serializeAll); deserializeAll(); } diff --git a/src/main/java/de/studiocode/invgui/virtualinventory/event/ItemUpdateEvent.java b/src/main/java/de/studiocode/invui/virtualinventory/event/ItemUpdateEvent.java similarity index 97% rename from src/main/java/de/studiocode/invgui/virtualinventory/event/ItemUpdateEvent.java rename to src/main/java/de/studiocode/invui/virtualinventory/event/ItemUpdateEvent.java index e59b61d..2b7af58 100644 --- a/src/main/java/de/studiocode/invgui/virtualinventory/event/ItemUpdateEvent.java +++ b/src/main/java/de/studiocode/invui/virtualinventory/event/ItemUpdateEvent.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.virtualinventory.event; +package de.studiocode.invui.virtualinventory.event; -import de.studiocode.invgui.virtualinventory.VirtualInventory; +import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/de/studiocode/invgui/window/Window.java b/src/main/java/de/studiocode/invui/window/Window.java similarity index 90% rename from src/main/java/de/studiocode/invgui/window/Window.java rename to src/main/java/de/studiocode/invui/window/Window.java index 84f6a05..29e2cce 100644 --- a/src/main/java/de/studiocode/invgui/window/Window.java +++ b/src/main/java/de/studiocode/invui/window/Window.java @@ -1,13 +1,13 @@ -package de.studiocode.invgui.window; +package de.studiocode.invui.window; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.GUIParent; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.item.itembuilder.ItemBuilder; -import de.studiocode.invgui.virtualinventory.VirtualInventory; -import de.studiocode.invgui.window.impl.combined.combinedgui.SimpleCombinedGUIWindow; -import de.studiocode.invgui.window.impl.combined.splitgui.SimpleSplitGUIWindow; -import de.studiocode.invgui.window.impl.single.SimpleWindow; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.GUIParent; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.virtualinventory.VirtualInventory; +import de.studiocode.invui.window.impl.combined.combinedgui.SimpleCombinedGUIWindow; +import de.studiocode.invui.window.impl.combined.splitgui.SimpleSplitGUIWindow; +import de.studiocode.invui.window.impl.single.SimpleWindow; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/window/WindowManager.java b/src/main/java/de/studiocode/invui/window/WindowManager.java similarity index 94% rename from src/main/java/de/studiocode/invgui/window/WindowManager.java rename to src/main/java/de/studiocode/invui/window/WindowManager.java index 79d337c..7cf8e65 100644 --- a/src/main/java/de/studiocode/invgui/window/WindowManager.java +++ b/src/main/java/de/studiocode/invui/window/WindowManager.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.window; +package de.studiocode.invui.window; -import de.studiocode.invgui.InvGui; +import de.studiocode.invui.InvUI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -28,8 +28,8 @@ public class WindowManager implements Listener { private final List windows = new CopyOnWriteArrayList<>(); private WindowManager() { - Bukkit.getPluginManager().registerEvents(this, InvGui.getInstance().getPlugin()); - InvGui.getInstance().addDisableHandler(() -> windows.forEach(window -> window.close(true))); + Bukkit.getPluginManager().registerEvents(this, InvUI.getInstance().getPlugin()); + InvUI.getInstance().addDisableHandler(() -> windows.forEach(window -> window.close(true))); } /** diff --git a/src/main/java/de/studiocode/invgui/window/impl/BaseWindow.java b/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java similarity index 91% rename from src/main/java/de/studiocode/invgui/window/impl/BaseWindow.java rename to src/main/java/de/studiocode/invui/window/impl/BaseWindow.java index 2ae31cd..e593137 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/BaseWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java @@ -1,14 +1,14 @@ -package de.studiocode.invgui.window.impl; +package de.studiocode.invui.window.impl; -import de.studiocode.invgui.InvGui; -import de.studiocode.invgui.gui.SlotElement.ItemSlotElement; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.gui.SlotElement.VISlotElement; -import de.studiocode.invgui.item.Item; -import de.studiocode.invgui.util.ArrayUtils; -import de.studiocode.invgui.virtualinventory.VirtualInventory; -import de.studiocode.invgui.window.Window; -import de.studiocode.invgui.window.WindowManager; +import de.studiocode.invui.InvUI; +import de.studiocode.invui.gui.SlotElement.ItemSlotElement; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.gui.SlotElement.VISlotElement; +import de.studiocode.invui.item.Item; +import de.studiocode.invui.util.ArrayUtils; +import de.studiocode.invui.virtualinventory.VirtualInventory; +import de.studiocode.invui.window.Window; +import de.studiocode.invui.window.WindowManager; import org.bukkit.Bukkit; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; @@ -86,7 +86,7 @@ public abstract class BaseWindow implements Window { handleClosed(); } else { if (player.equals(getViewer())) - Bukkit.getScheduler().runTaskLater(InvGui.getInstance().getPlugin(), + Bukkit.getScheduler().runTaskLater(InvUI.getInstance().getPlugin(), () -> player.openInventory(getInventories()[0]), 0); } } diff --git a/src/main/java/de/studiocode/invgui/window/impl/combined/BaseCombinedWindow.java b/src/main/java/de/studiocode/invui/window/impl/combined/BaseCombinedWindow.java similarity index 93% rename from src/main/java/de/studiocode/invgui/window/impl/combined/BaseCombinedWindow.java rename to src/main/java/de/studiocode/invui/window/impl/combined/BaseCombinedWindow.java index e3e1db2..7be35d3 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/combined/BaseCombinedWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/combined/BaseCombinedWindow.java @@ -1,9 +1,9 @@ -package de.studiocode.invgui.window.impl.combined; +package de.studiocode.invui.window.impl.combined; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.gui.SlotElement.VISlotElement; -import de.studiocode.invgui.util.SlotUtils; -import de.studiocode.invgui.window.impl.BaseWindow; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.gui.SlotElement.VISlotElement; +import de.studiocode.invui.util.SlotUtils; +import de.studiocode.invui.window.impl.BaseWindow; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invgui/window/impl/combined/combinedgui/CombinedGUIWindow.java b/src/main/java/de/studiocode/invui/window/impl/combined/combinedgui/CombinedGUIWindow.java similarity index 82% rename from src/main/java/de/studiocode/invgui/window/impl/combined/combinedgui/CombinedGUIWindow.java rename to src/main/java/de/studiocode/invui/window/impl/combined/combinedgui/CombinedGUIWindow.java index f184e5c..cbc32c5 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/combined/combinedgui/CombinedGUIWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/combined/combinedgui/CombinedGUIWindow.java @@ -1,9 +1,9 @@ -package de.studiocode.invgui.window.impl.combined.combinedgui; +package de.studiocode.invui.window.impl.combined.combinedgui; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.util.SlotUtils; -import de.studiocode.invgui.window.impl.combined.BaseCombinedWindow; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.util.SlotUtils; +import de.studiocode.invui.window.impl.combined.BaseCombinedWindow; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/de/studiocode/invgui/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java b/src/main/java/de/studiocode/invui/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java similarity index 88% rename from src/main/java/de/studiocode/invgui/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java rename to src/main/java/de/studiocode/invui/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java index f0da1c5..32c1449 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/combined/combinedgui/SimpleCombinedGUIWindow.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.window.impl.combined.combinedgui; +package de.studiocode.invui.window.impl.combined.combinedgui; -import de.studiocode.invgui.gui.GUI; +import de.studiocode.invui.gui.GUI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/de/studiocode/invgui/window/impl/combined/splitgui/SimpleSplitGUIWindow.java b/src/main/java/de/studiocode/invui/window/impl/combined/splitgui/SimpleSplitGUIWindow.java similarity index 87% rename from src/main/java/de/studiocode/invgui/window/impl/combined/splitgui/SimpleSplitGUIWindow.java rename to src/main/java/de/studiocode/invui/window/impl/combined/splitgui/SimpleSplitGUIWindow.java index 0532a31..a7feeb5 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/combined/splitgui/SimpleSplitGUIWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/combined/splitgui/SimpleSplitGUIWindow.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.window.impl.combined.splitgui; +package de.studiocode.invui.window.impl.combined.splitgui; -import de.studiocode.invgui.gui.GUI; +import de.studiocode.invui.gui.GUI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/de/studiocode/invgui/window/impl/combined/splitgui/SplitGUIWindow.java b/src/main/java/de/studiocode/invui/window/impl/combined/splitgui/SplitGUIWindow.java similarity index 86% rename from src/main/java/de/studiocode/invgui/window/impl/combined/splitgui/SplitGUIWindow.java rename to src/main/java/de/studiocode/invui/window/impl/combined/splitgui/SplitGUIWindow.java index 2072831..dff012c 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/combined/splitgui/SplitGUIWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/combined/splitgui/SplitGUIWindow.java @@ -1,9 +1,9 @@ -package de.studiocode.invgui.window.impl.combined.splitgui; +package de.studiocode.invui.window.impl.combined.splitgui; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.util.SlotUtils; -import de.studiocode.invgui.window.impl.combined.BaseCombinedWindow; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.util.SlotUtils; +import de.studiocode.invui.window.impl.combined.BaseCombinedWindow; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/de/studiocode/invgui/window/impl/single/SimpleWindow.java b/src/main/java/de/studiocode/invui/window/impl/single/SimpleWindow.java similarity index 90% rename from src/main/java/de/studiocode/invgui/window/impl/single/SimpleWindow.java rename to src/main/java/de/studiocode/invui/window/impl/single/SimpleWindow.java index cf628fd..b7831c0 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/single/SimpleWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/single/SimpleWindow.java @@ -1,6 +1,6 @@ -package de.studiocode.invgui.window.impl.single; +package de.studiocode.invui.window.impl.single; -import de.studiocode.invgui.gui.GUI; +import de.studiocode.invui.gui.GUI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; diff --git a/src/main/java/de/studiocode/invgui/window/impl/single/SingleWindow.java b/src/main/java/de/studiocode/invui/window/impl/single/SingleWindow.java similarity index 91% rename from src/main/java/de/studiocode/invgui/window/impl/single/SingleWindow.java rename to src/main/java/de/studiocode/invui/window/impl/single/SingleWindow.java index 2b13cf0..48595d0 100644 --- a/src/main/java/de/studiocode/invgui/window/impl/single/SingleWindow.java +++ b/src/main/java/de/studiocode/invui/window/impl/single/SingleWindow.java @@ -1,8 +1,8 @@ -package de.studiocode.invgui.window.impl.single; +package de.studiocode.invui.window.impl.single; -import de.studiocode.invgui.gui.GUI; -import de.studiocode.invgui.gui.SlotElement.ItemStackHolder; -import de.studiocode.invgui.window.impl.BaseWindow; +import de.studiocode.invui.gui.GUI; +import de.studiocode.invui.gui.SlotElement.ItemStackHolder; +import de.studiocode.invui.window.impl.BaseWindow; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryClickEvent;