From 9b03a9a2db95307d492c3a6e7b9901e05ac07709 Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Sat, 28 Jan 2023 15:41:10 +0100 Subject: [PATCH] Change package from de.studiocode to xyz.xenondevs --- README.md | 2 +- inventoryaccess/inventory-access-r1/pom.xml | 6 +- .../r1/AnvilInventoryImpl.java | 8 +- .../r1/CartographyInventoryImpl.java | 8 +- .../r1/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r1/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r1/PlayerUtilsImpl.java | 12 +-- inventoryaccess/inventory-access-r10/pom.xml | 6 +- .../r10/AnvilInventoryImpl.java | 6 +- .../r10}/CartographyInventoryImpl.java | 8 +- .../r10/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r10}/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r10}/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access-r11/pom.xml | 6 +- .../r11/AnvilInventoryImpl.java | 6 +- .../r11}/CartographyInventoryImpl.java | 8 +- .../r11/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r11}/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r11}/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access-r12/pom.xml | 6 +- .../r12/AnvilInventoryImpl.java | 6 +- .../r12/CartographyInventoryImpl.java | 8 +- .../r12/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r12/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r12/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access-r2/pom.xml | 6 +- .../r2/AnvilInventoryImpl.java | 8 +- .../r2/CartographyInventoryImpl.java | 8 +- .../r2/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r2/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r2/PlayerUtilsImpl.java | 12 +-- inventoryaccess/inventory-access-r3/pom.xml | 6 +- .../r3/AnvilInventoryImpl.java | 6 +- .../r3/CartographyInventoryImpl.java | 8 +- .../r3/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r3/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r3/PlayerUtilsImpl.java | 12 +-- inventoryaccess/inventory-access-r4/pom.xml | 6 +- .../r4/AnvilInventoryImpl.java | 6 +- .../r4/CartographyInventoryImpl.java | 8 +- .../r4/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r4/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r4/PlayerUtilsImpl.java | 12 +-- inventoryaccess/inventory-access-r5/pom.xml | 6 +- .../r5/AnvilInventoryImpl.java | 6 +- .../r5/CartographyInventoryImpl.java | 8 +- .../r5/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r5/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r5/PlayerUtilsImpl.java | 12 +-- inventoryaccess/inventory-access-r6/pom.xml | 6 +- .../r6/AnvilInventoryImpl.java | 6 +- .../r6/CartographyInventoryImpl.java | 8 +- .../r6}/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r6}/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r6/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access-r7/pom.xml | 6 +- .../r7/AnvilInventoryImpl.java | 6 +- .../r7/CartographyInventoryImpl.java | 8 +- .../r7}/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r7}/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r7/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access-r8/pom.xml | 6 +- .../r8/AnvilInventoryImpl.java | 6 +- .../r8/CartographyInventoryImpl.java | 8 +- .../r8/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r8/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r8/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access-r9/pom.xml | 6 +- .../r9/AnvilInventoryImpl.java | 6 +- .../r9/CartographyInventoryImpl.java | 8 +- .../r9/InventoryUtilsImpl.java | 6 +- .../inventoryaccess/r9/ItemUtilsImpl.java | 10 +-- .../inventoryaccess/r9/PlayerUtilsImpl.java | 14 +-- inventoryaccess/inventory-access/pom.xml | 4 +- .../inventoryaccess/InventoryAccess.java | 16 ++-- .../abstraction/inventory/AnvilInventory.java | 2 +- .../inventory/CartographyInventory.java | 2 +- .../abstraction/util/InventoryUtils.java | 4 +- .../abstraction/util/ItemUtils.java | 4 +- .../abstraction/util/PlayerUtils.java | 8 +- .../component/AdventureComponentWrapper.java | 2 +- .../component/BaseComponentWrapper.java | 2 +- .../component/ComponentWrapper.java | 2 +- .../inventoryaccess/map/MapIcon.java | 6 +- .../inventoryaccess/map/MapPatch.java | 2 +- .../inventoryaccess/util/DataUtils.java | 2 +- .../util/ReflectionRegistry.java | 4 +- .../inventoryaccess/util/ReflectionUtils.java | 13 ++- .../inventoryaccess/util/VersionUtils.java | 2 +- .../version/InventoryAccessRevision.java | 4 +- invui-kotlin/pom.xml | 6 +- .../xenondevs}/invui/Guis.kt | 4 +- .../xenondevs}/invui/ItemBuilders.kt | 6 +- .../xenondevs}/invui/Items.kt | 2 +- .../xenondevs}/invui/VirtualInventories.kt | 2 +- .../xenondevs}/invui/Windows.kt | 6 +- .../invui/adventure/AdventureItemBuilders.kt | 4 +- .../adventure/AdventureWindowContexts.kt | 4 +- invui-resourcepack/pom.xml | 6 +- .../invui/resourcepack/ForceResourcePack.java | 18 ++-- .../xenondevs}/invui/resourcepack/Icon.java | 8 +- .../auth/AuthenticationService.java | 2 +- .../auth/AuthenticationServiceManager.java | 6 +- .../invui/resourcepack/auth/impl/AuthMe.java | 4 +- invui/pom.xml | 30 +++---- .../window/type/context/WindowContext.java | 4 - .../xenondevs}/invui/InvUI.java | 6 +- .../xenondevs}/invui/animation/Animation.java | 6 +- .../invui/animation/impl/BaseAnimation.java | 12 +-- .../invui/animation/impl/ColumnAnimation.java | 2 +- .../impl/HorizontalSnakeAnimation.java | 2 +- .../invui/animation/impl/RandomAnimation.java | 4 +- .../invui/animation/impl/RowAnimation.java | 2 +- .../animation/impl/SequentialAnimation.java | 4 +- .../invui/animation/impl/SoundAnimation.java | 2 +- .../impl/SplitSequentialAnimation.java | 2 +- .../impl/VerticalSnakeAnimation.java | 2 +- .../xenondevs}/invui/gui/AbstractGui.java | 89 +++++++++---------- .../invui/gui/AbstractPagedGui.java | 10 +-- .../invui/gui/AbstractScrollGui.java | 10 +-- .../xenondevs}/invui/gui/AbstractTabGui.java | 4 +- .../xenondevs}/invui/gui/Gui.java | 20 ++--- .../xenondevs}/invui/gui/GuiParent.java | 2 +- .../xenondevs}/invui/gui/PagedGui.java | 10 +-- .../xenondevs}/invui/gui/ScrollGui.java | 14 +-- .../xenondevs}/invui/gui/SlotElement.java | 8 +- .../xenondevs}/invui/gui/TabGui.java | 6 +- .../invui/gui/builder/GuiBuilder.java | 20 ++--- .../invui/gui/builder/GuiContext.java | 10 +-- .../invui/gui/builder/guitype/GuiType.java | 16 ++-- .../gui/builder/guitype/NormalGUIType.java | 8 +- .../gui/builder/guitype/PagedGUIsGUIType.java | 10 +-- .../builder/guitype/PagedItemsGUIType.java | 10 +-- .../builder/guitype/ScrollGUIsGUIType.java | 10 +-- .../builder/guitype/ScrollItemsGUIType.java | 10 +-- .../gui/builder/guitype/ScrollVIGUIType.java | 10 +-- .../invui/gui/builder/guitype/TabGUIType.java | 10 +-- .../invui/gui/impl/NormalGuiImpl.java | 8 +- .../invui/gui/impl/PagedItemsGuiImpl.java | 17 ++-- .../invui/gui/impl/PagedNestedGuiImpl.java | 14 +-- .../invui/gui/impl/ScrollItemsGuiImpl.java | 12 +-- .../invui/gui/impl/ScrollNestedGuiImpl.java | 12 +-- .../invui/gui/impl/ScrollVIGuiImpl.java | 12 +-- .../xenondevs}/invui/gui/impl/TabGuiImpl.java | 17 ++-- .../invui/gui/structure/Ingredient.java | 4 +- .../invui/gui/structure/IngredientList.java | 6 +- .../invui/gui/structure/Marker.java | 2 +- .../invui/gui/structure/Markers.java | 8 +- .../invui/gui/structure/Structure.java | 18 ++-- .../gui/structure/VISlotElementSupplier.java | 8 +- .../xenondevs}/invui/item/Click.java | 2 +- .../xenondevs}/invui/item/Item.java | 4 +- .../xenondevs}/invui/item/ItemProvider.java | 4 +- .../xenondevs}/invui/item/ItemWrapper.java | 2 +- .../invui/item/builder/BaseItemBuilder.java | 16 ++-- .../invui/item/builder/ItemBuilder.java | 2 +- .../invui/item/builder/PotionBuilder.java | 2 +- .../invui/item/builder/SkullBuilder.java | 8 +- .../xenondevs}/invui/item/impl/AsyncItem.java | 10 +-- .../invui/item/impl/AutoCycleItem.java | 10 +-- .../invui/item/impl/AutoUpdateItem.java | 10 +-- .../xenondevs}/invui/item/impl/BaseItem.java | 8 +- .../invui/item/impl/CommandItem.java | 6 +- .../xenondevs}/invui/item/impl/CycleItem.java | 6 +- .../invui/item/impl/SimpleItem.java | 8 +- .../invui/item/impl/SuppliedItem.java | 6 +- .../item/impl/controlitem/ControlItem.java | 10 +-- .../invui/item/impl/controlitem/PageItem.java | 6 +- .../item/impl/controlitem/ScrollItem.java | 6 +- .../invui/item/impl/controlitem/TabItem.java | 6 +- .../xenondevs}/invui/util/ArrayUtils.java | 2 +- .../xenondevs}/invui/util/ColorPalette.java | 2 +- .../xenondevs}/invui/util/ComponentUtils.java | 2 +- .../xenondevs}/invui/util/DataUtils.java | 2 +- .../xenondevs}/invui/util/IOUtils.java | 2 +- .../xenondevs}/invui/util/InventoryUtils.java | 6 +- .../xenondevs}/invui/util/MathUtils.java | 2 +- .../xenondevs}/invui/util/MojangApiUtils.java | 2 +- .../xenondevs}/invui/util/Pair.java | 2 +- .../xenondevs}/invui/util/Point2D.java | 2 +- .../xenondevs}/invui/util/SlotUtils.java | 2 +- .../virtualinventory/StackSizeProvider.java | 2 +- .../virtualinventory/VirtualInventory.java | 18 ++-- .../VirtualInventoryManager.java | 8 +- .../event/InventoryUpdatedEvent.java | 4 +- .../event/ItemUpdateEvent.java | 4 +- .../event/PlayerUpdateReason.java | 2 +- .../virtualinventory/event/UpdateEvent.java | 4 +- .../virtualinventory/event/UpdateReason.java | 2 +- .../invui/window/AbstractDoubleWindow.java | 14 +-- .../invui/window/AbstractMergedWindow.java | 14 +-- .../invui/window/AbstractSingleWindow.java | 14 +-- .../invui/window/AbstractSplitWindow.java | 14 +-- .../invui/window/AbstractWindow.java | 73 ++++++++------- .../xenondevs}/invui/window/AnvilWindow.java | 2 +- .../invui/window/CartographyWindow.java | 6 +- .../xenondevs}/invui/window/Window.java | 6 +- .../invui/window/WindowManager.java | 4 +- .../window/impl/AnvilSingleWindowImpl.java | 14 +-- .../window/impl/AnvilSplitWindowImpl.java | 14 +-- .../impl/CartographySingleWindowImpl.java | 20 ++--- .../impl/CartographySplitWindowImpl.java | 24 ++--- .../window/impl/NormalMergedWindowImpl.java | 10 +-- .../window/impl/NormalSingleWindowImpl.java | 10 +-- .../window/impl/NormalSplitWindowImpl.java | 10 +-- .../invui/window/type/WindowType.java | 14 +-- .../type/context/AbstractWindowContext.java | 6 +- .../context/AnvilSingleWindowContext.java | 6 +- .../type/context/AnvilSplitWindowContext.java | 6 +- .../CartographySingleWindowContext.java | 6 +- .../CartographySplitWindowContext.java | 6 +- .../context/NormalCombinedWindowContext.java | 6 +- .../context/NormalSingleWindowContext.java | 6 +- .../context/NormalSplitWindowContext.java | 6 +- .../window/type/context/WindowContext.java | 4 + pom.xml | 4 +- 216 files changed, 883 insertions(+), 894 deletions(-) rename inventoryaccess/inventory-access-r1/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r1/AnvilInventoryImpl.java (96%) rename inventoryaccess/inventory-access-r1/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r1/CartographyInventoryImpl.java (94%) rename inventoryaccess/inventory-access-r1/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r1/InventoryUtilsImpl.java (95%) rename inventoryaccess/inventory-access-r1/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r1/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r1/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r1/PlayerUtilsImpl.java (88%) rename inventoryaccess/inventory-access-r10/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r10/AnvilInventoryImpl.java (97%) rename inventoryaccess/{inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11 => inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10}/CartographyInventoryImpl.java (95%) rename inventoryaccess/inventory-access-r10/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r10/InventoryUtilsImpl.java (95%) rename inventoryaccess/{inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11 => inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10}/ItemUtilsImpl.java (90%) rename inventoryaccess/{inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11 => inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10}/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r11/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r11/AnvilInventoryImpl.java (97%) rename inventoryaccess/{inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10 => inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11}/CartographyInventoryImpl.java (95%) rename inventoryaccess/inventory-access-r11/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r11/InventoryUtilsImpl.java (95%) rename inventoryaccess/{inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10 => inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11}/ItemUtilsImpl.java (90%) rename inventoryaccess/{inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10 => inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11}/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r12/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r12/AnvilInventoryImpl.java (97%) rename inventoryaccess/inventory-access-r12/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r12/CartographyInventoryImpl.java (95%) rename inventoryaccess/inventory-access-r12/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r12/InventoryUtilsImpl.java (95%) rename inventoryaccess/inventory-access-r12/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r12/ItemUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r12/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r12/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r2/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r2/AnvilInventoryImpl.java (96%) rename inventoryaccess/inventory-access-r2/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r2/CartographyInventoryImpl.java (94%) rename inventoryaccess/inventory-access-r2/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r2/InventoryUtilsImpl.java (94%) rename inventoryaccess/inventory-access-r2/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r2/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r2/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r2/PlayerUtilsImpl.java (88%) rename inventoryaccess/inventory-access-r3/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r3/AnvilInventoryImpl.java (96%) rename inventoryaccess/inventory-access-r3/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r3/CartographyInventoryImpl.java (94%) rename inventoryaccess/inventory-access-r3/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r3/InventoryUtilsImpl.java (94%) rename inventoryaccess/inventory-access-r3/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r3/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r3/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r3/PlayerUtilsImpl.java (89%) rename inventoryaccess/inventory-access-r4/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r4/AnvilInventoryImpl.java (96%) rename inventoryaccess/inventory-access-r4/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r4/CartographyInventoryImpl.java (94%) rename inventoryaccess/inventory-access-r4/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r4/InventoryUtilsImpl.java (94%) rename inventoryaccess/inventory-access-r4/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r4/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r4/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r4/PlayerUtilsImpl.java (89%) rename inventoryaccess/inventory-access-r5/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r5/AnvilInventoryImpl.java (96%) rename inventoryaccess/inventory-access-r5/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r5/CartographyInventoryImpl.java (94%) rename inventoryaccess/inventory-access-r5/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r5/InventoryUtilsImpl.java (94%) rename inventoryaccess/inventory-access-r5/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r5/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r5/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r5/PlayerUtilsImpl.java (89%) rename inventoryaccess/inventory-access-r6/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r6/AnvilInventoryImpl.java (97%) rename inventoryaccess/inventory-access-r6/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r6/CartographyInventoryImpl.java (95%) rename inventoryaccess/{inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7 => inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6}/InventoryUtilsImpl.java (95%) rename inventoryaccess/{inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7 => inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6}/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r6/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r6/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r7/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r7/AnvilInventoryImpl.java (97%) rename inventoryaccess/inventory-access-r7/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r7/CartographyInventoryImpl.java (95%) rename inventoryaccess/{inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6 => inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7}/InventoryUtilsImpl.java (95%) rename inventoryaccess/{inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6 => inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7}/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r7/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r7/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r8/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r8/AnvilInventoryImpl.java (97%) rename inventoryaccess/inventory-access-r8/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r8/CartographyInventoryImpl.java (95%) rename inventoryaccess/inventory-access-r8/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r8/InventoryUtilsImpl.java (95%) rename inventoryaccess/inventory-access-r8/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r8/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r8/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r8/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access-r9/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r9/AnvilInventoryImpl.java (97%) rename inventoryaccess/inventory-access-r9/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r9/CartographyInventoryImpl.java (95%) rename inventoryaccess/inventory-access-r9/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r9/InventoryUtilsImpl.java (95%) rename inventoryaccess/inventory-access-r9/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r9/ItemUtilsImpl.java (91%) rename inventoryaccess/inventory-access-r9/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/r9/PlayerUtilsImpl.java (90%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/InventoryAccess.java (87%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/abstraction/inventory/AnvilInventory.java (94%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/abstraction/inventory/CartographyInventory.java (92%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/abstraction/util/InventoryUtils.java (93%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/abstraction/util/ItemUtils.java (95%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/abstraction/util/PlayerUtils.java (91%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/component/AdventureComponentWrapper.java (90%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/component/BaseComponentWrapper.java (90%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/component/ComponentWrapper.java (61%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/map/MapIcon.java (95%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/map/MapPatch.java (94%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/util/DataUtils.java (92%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/util/ReflectionRegistry.java (91%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/util/ReflectionUtils.java (89%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/util/VersionUtils.java (98%) rename inventoryaccess/inventory-access/src/main/java/{de/studiocode => xyz/xenondevs}/inventoryaccess/version/InventoryAccessRevision.java (92%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/Guis.kt (96%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/ItemBuilders.kt (66%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/Items.kt (84%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/VirtualInventories.kt (93%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/Windows.kt (66%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/adventure/AdventureItemBuilders.kt (85%) rename invui-kotlin/src/main/kotlin/{de/studiocode => xyz/xenondevs}/invui/adventure/AdventureWindowContexts.kt (68%) rename invui-resourcepack/src/main/java/{de/studiocode => xyz/xenondevs}/invui/resourcepack/ForceResourcePack.java (92%) rename invui-resourcepack/src/main/java/{de/studiocode => xyz/xenondevs}/invui/resourcepack/Icon.java (94%) rename invui-resourcepack/src/main/java/{de/studiocode => xyz/xenondevs}/invui/resourcepack/auth/AuthenticationService.java (86%) rename invui-resourcepack/src/main/java/{de/studiocode => xyz/xenondevs}/invui/resourcepack/auth/AuthenticationServiceManager.java (93%) rename invui-resourcepack/src/main/java/{de/studiocode => xyz/xenondevs}/invui/resourcepack/auth/impl/AuthMe.java (70%) delete mode 100644 invui/src/main/java/de/studiocode/invui/window/type/context/WindowContext.java rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/InvUI.java (91%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/Animation.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/BaseAnimation.java (92%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/ColumnAnimation.java (94%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/HorizontalSnakeAnimation.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/RandomAnimation.java (88%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/RowAnimation.java (94%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/SequentialAnimation.java (85%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/SoundAnimation.java (89%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/SplitSequentialAnimation.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/animation/impl/VerticalSnakeAnimation.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/AbstractGui.java (87%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/AbstractPagedGui.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/AbstractScrollGui.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/AbstractTabGui.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/Gui.java (96%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/GuiParent.java (92%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/PagedGui.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/ScrollGui.java (92%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/SlotElement.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/TabGui.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/GuiBuilder.java (89%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/GuiContext.java (79%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/GuiType.java (69%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/NormalGUIType.java (60%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/PagedGUIsGUIType.java (59%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/PagedItemsGUIType.java (59%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/ScrollGUIsGUIType.java (59%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/ScrollItemsGUIType.java (59%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/ScrollVIGUIType.java (59%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/builder/guitype/TabGUIType.java (57%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/NormalGuiImpl.java (83%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/PagedItemsGuiImpl.java (82%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/PagedNestedGuiImpl.java (87%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/ScrollItemsGuiImpl.java (88%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/ScrollNestedGuiImpl.java (89%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/ScrollVIGuiImpl.java (89%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/impl/TabGuiImpl.java (85%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/structure/Ingredient.java (92%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/structure/IngredientList.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/structure/Marker.java (84%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/structure/Markers.java (76%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/structure/Structure.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/gui/structure/VISlotElementSupplier.java (80%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/Click.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/Item.java (96%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/ItemProvider.java (92%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/ItemWrapper.java (96%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/builder/BaseItemBuilder.java (96%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/builder/ItemBuilder.java (96%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/builder/PotionBuilder.java (98%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/builder/SkullBuilder.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/AsyncItem.java (88%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/AutoCycleItem.java (89%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/AutoUpdateItem.java (84%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/BaseItem.java (85%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/CommandItem.java (85%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/CycleItem.java (94%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/SimpleItem.java (87%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/SuppliedItem.java (89%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/controlitem/ControlItem.java (75%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/controlitem/PageItem.java (83%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/controlitem/ScrollItem.java (85%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/item/impl/controlitem/TabItem.java (81%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/ArrayUtils.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/ColorPalette.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/ComponentUtils.java (96%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/DataUtils.java (98%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/IOUtils.java (91%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/InventoryUtils.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/MathUtils.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/MojangApiUtils.java (98%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/Pair.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/Point2D.java (88%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/util/SlotUtils.java (99%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/StackSizeProvider.java (74%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/VirtualInventory.java (98%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/VirtualInventoryManager.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/event/InventoryUpdatedEvent.java (92%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/event/ItemUpdateEvent.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/event/PlayerUpdateReason.java (90%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/event/UpdateEvent.java (97%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/virtualinventory/event/UpdateReason.java (77%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/AbstractDoubleWindow.java (93%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/AbstractMergedWindow.java (84%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/AbstractSingleWindow.java (90%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/AbstractSplitWindow.java (87%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/AbstractWindow.java (81%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/AnvilWindow.java (70%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/CartographyWindow.java (76%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/Window.java (95%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/WindowManager.java (98%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/AnvilSingleWindowImpl.java (77%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/AnvilSplitWindowImpl.java (78%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/CartographySingleWindowImpl.java (82%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/CartographySplitWindowImpl.java (78%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/NormalMergedWindowImpl.java (76%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/NormalSingleWindowImpl.java (60%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/impl/NormalSplitWindowImpl.java (62%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/WindowType.java (94%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/AbstractWindowContext.java (88%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/AnvilSingleWindowContext.java (88%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/AnvilSplitWindowContext.java (91%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/CartographySingleWindowContext.java (83%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/CartographySplitWindowContext.java (90%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/NormalCombinedWindowContext.java (83%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/NormalSingleWindowContext.java (85%) rename invui/src/main/java/{de/studiocode => xyz/xenondevs}/invui/window/type/context/NormalSplitWindowContext.java (89%) create mode 100644 invui/src/main/java/xyz/xenondevs/invui/window/type/context/WindowContext.java diff --git a/README.md b/README.md index 5ff436c..f45cec2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Supports all versions from 1.14 to 1.19. ``` ```xml - de.studiocode.invui + xyz.xenondevs.invui InvUI VERSION diff --git a/inventoryaccess/inventory-access-r1/pom.xml b/inventoryaccess/inventory-access-r1/pom.xml index 93d69ce..6e30da1 100644 --- a/inventoryaccess/inventory-access-r1/pom.xml +++ b/inventoryaccess/inventory-access-r1/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -25,7 +25,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/AnvilInventoryImpl.java similarity index 96% rename from inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/AnvilInventoryImpl.java index 089fd7d..56c5689 100644 --- a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/AnvilInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r1; +package xyz.xenondevs.inventoryaccess.r1; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_14_R1.*; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; @@ -13,6 +10,9 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/CartographyInventoryImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/CartographyInventoryImpl.java index 25acb5a..c5c32f0 100644 --- a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r1; +package xyz.xenondevs.inventoryaccess.r1; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_14_R1.*; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; @@ -12,6 +9,9 @@ import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/InventoryUtilsImpl.java index 2137b3f..fdfbac3 100644 --- a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r1; +package xyz.xenondevs.inventoryaccess.r1; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_14_R1.*; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/ItemUtilsImpl.java index 4cbbb31..f46418c 100644 --- a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r1; +package xyz.xenondevs.inventoryaccess.r1; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_14_R1.ItemStack; import net.minecraft.server.v1_14_R1.NBTCompressedStreamTools; import net.minecraft.server.v1_14_R1.NBTTagCompound; import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/PlayerUtilsImpl.java similarity index 88% rename from inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/PlayerUtilsImpl.java index 30c54f3..1b4ae83 100644 --- a/inventoryaccess/inventory-access-r1/src/main/java/de/studiocode/inventoryaccess/r1/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/PlayerUtilsImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r1; +package xyz.xenondevs.inventoryaccess.r1; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_14_R1.AdvancementDataPlayer; import net.minecraft.server.v1_14_R1.EntityPlayer; import net.minecraft.server.v1_14_R1.MapIcon; @@ -11,6 +8,9 @@ import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -44,7 +44,7 @@ class PlayerUtilsImpl implements PlayerUtils { } @Override - public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { + public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { List decorations = icons != null ? icons.stream().map(this::toMapDecoration).collect(Collectors.toCollection(ArrayList::new)) : new ArrayList<>(); @@ -66,7 +66,7 @@ class PlayerUtilsImpl implements PlayerUtils { ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); } - private MapIcon toMapDecoration(de.studiocode.inventoryaccess.map.MapIcon icon) { + private MapIcon toMapDecoration(xyz.xenondevs.inventoryaccess.map.MapIcon icon) { return new MapIcon( MapIcon.Type.a(icon.getType().getId()), icon.getX(), icon.getY(), diff --git a/inventoryaccess/inventory-access-r10/pom.xml b/inventoryaccess/inventory-access-r10/pom.xml index 60da2aa..108c343 100644 --- a/inventoryaccess/inventory-access-r10/pom.xml +++ b/inventoryaccess/inventory-access-r10/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/AnvilInventoryImpl.java index 34cc61c..6d92fa8 100644 --- a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r10; +package xyz.xenondevs.inventoryaccess.r10; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -24,6 +22,8 @@ import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/CartographyInventoryImpl.java index 3a7b038..43bf092 100644 --- a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r11; +package xyz.xenondevs.inventoryaccess.r10; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/InventoryUtilsImpl.java index b1c537d..d1a125e 100644 --- a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r10; +package xyz.xenondevs.inventoryaccess.r10; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/ItemUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/ItemUtilsImpl.java index 557af59..d50de84 100644 --- a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r11; +package xyz.xenondevs.inventoryaccess.r10; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java index 6039038..b3b0e06 100644 --- a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r11; +package xyz.xenondevs.inventoryaccess.r10; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access-r11/pom.xml b/inventoryaccess/inventory-access-r11/pom.xml index 893d96a..b1b8339 100644 --- a/inventoryaccess/inventory-access-r11/pom.xml +++ b/inventoryaccess/inventory-access-r11/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/AnvilInventoryImpl.java index 8d1fae5..2b7041b 100644 --- a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r11; +package xyz.xenondevs.inventoryaccess.r11; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -24,6 +22,8 @@ import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/CartographyInventoryImpl.java index 4038c48..80216b1 100644 --- a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r10; +package xyz.xenondevs.inventoryaccess.r11; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/InventoryUtilsImpl.java index 66b0f00..22abe2d 100644 --- a/inventoryaccess/inventory-access-r11/src/main/java/de/studiocode/inventoryaccess/r11/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r11; +package xyz.xenondevs.inventoryaccess.r11; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/ItemUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/ItemUtilsImpl.java index 9b2c5d3..307039d 100644 --- a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r10; +package xyz.xenondevs.inventoryaccess.r11; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java index c661b1c..b6c0956 100644 --- a/inventoryaccess/inventory-access-r10/src/main/java/de/studiocode/inventoryaccess/r10/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r10; +package xyz.xenondevs.inventoryaccess.r11; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access-r12/pom.xml b/inventoryaccess/inventory-access-r12/pom.xml index a7e79dc..e4d040f 100644 --- a/inventoryaccess/inventory-access-r12/pom.xml +++ b/inventoryaccess/inventory-access-r12/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/AnvilInventoryImpl.java index c503779..99fe9f4 100644 --- a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r12; +package xyz.xenondevs.inventoryaccess.r12; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -24,6 +22,8 @@ import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/CartographyInventoryImpl.java index 16060b9..6b39561 100644 --- a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r12; +package xyz.xenondevs.inventoryaccess.r12; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/InventoryUtilsImpl.java index 876358b..1f4e24e 100644 --- a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r12; +package xyz.xenondevs.inventoryaccess.r12; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/ItemUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/ItemUtilsImpl.java index 15aecb9..fe61752 100644 --- a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r12; +package xyz.xenondevs.inventoryaccess.r12; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java index 6afe88a..74a6eec 100644 --- a/inventoryaccess/inventory-access-r12/src/main/java/de/studiocode/inventoryaccess/r12/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r12; +package xyz.xenondevs.inventoryaccess.r12; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access-r2/pom.xml b/inventoryaccess/inventory-access-r2/pom.xml index 5b256c6..7810b53 100644 --- a/inventoryaccess/inventory-access-r2/pom.xml +++ b/inventoryaccess/inventory-access-r2/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -25,7 +25,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/AnvilInventoryImpl.java similarity index 96% rename from inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/AnvilInventoryImpl.java index 87f923e..7dca651 100644 --- a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/AnvilInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r2; +package xyz.xenondevs.inventoryaccess.r2; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_15_R1.*; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory; @@ -13,6 +10,9 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/CartographyInventoryImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/CartographyInventoryImpl.java index 9cfdc91..d64be69 100644 --- a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r2; +package xyz.xenondevs.inventoryaccess.r2; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_15_R1.*; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory; @@ -12,6 +9,9 @@ import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/InventoryUtilsImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/InventoryUtilsImpl.java index 54ee04f..1c62a00 100644 --- a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r2; +package xyz.xenondevs.inventoryaccess.r2; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_15_R1.*; import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_15_R1.event.CraftEventFactory; @@ -11,6 +9,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/ItemUtilsImpl.java index b7ed67e..2bcbb42 100644 --- a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r2; +package xyz.xenondevs.inventoryaccess.r2; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_15_R1.ItemStack; import net.minecraft.server.v1_15_R1.NBTCompressedStreamTools; import net.minecraft.server.v1_15_R1.NBTTagCompound; import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/PlayerUtilsImpl.java similarity index 88% rename from inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/PlayerUtilsImpl.java index 404f827..8f4282d 100644 --- a/inventoryaccess/inventory-access-r2/src/main/java/de/studiocode/inventoryaccess/r2/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/PlayerUtilsImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r2; +package xyz.xenondevs.inventoryaccess.r2; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_15_R1.AdvancementDataPlayer; import net.minecraft.server.v1_15_R1.EntityPlayer; import net.minecraft.server.v1_15_R1.MapIcon; @@ -11,6 +8,9 @@ import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -44,7 +44,7 @@ class PlayerUtilsImpl implements PlayerUtils { } @Override - public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { + public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { List decorations = icons != null ? icons.stream().map(this::toMapDecoration).collect(Collectors.toCollection(ArrayList::new)) : new ArrayList<>(); @@ -66,7 +66,7 @@ class PlayerUtilsImpl implements PlayerUtils { ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); } - private MapIcon toMapDecoration(de.studiocode.inventoryaccess.map.MapIcon icon) { + private MapIcon toMapDecoration(xyz.xenondevs.inventoryaccess.map.MapIcon icon) { return new MapIcon( MapIcon.Type.a(icon.getType().getId()), icon.getX(), icon.getY(), diff --git a/inventoryaccess/inventory-access-r3/pom.xml b/inventoryaccess/inventory-access-r3/pom.xml index f26c535..6f9df42 100644 --- a/inventoryaccess/inventory-access-r3/pom.xml +++ b/inventoryaccess/inventory-access-r3/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -25,7 +25,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/AnvilInventoryImpl.java similarity index 96% rename from inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/AnvilInventoryImpl.java index e94d184..78eaeb5 100644 --- a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r3; +package xyz.xenondevs.inventoryaccess.r3; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_16_R1.*; import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R1.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/CartographyInventoryImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/CartographyInventoryImpl.java index a4cdbba..81cf9d7 100644 --- a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r3; +package xyz.xenondevs.inventoryaccess.r3; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R1.*; import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R1.event.CraftEventFactory; @@ -12,6 +9,9 @@ import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/InventoryUtilsImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/InventoryUtilsImpl.java index a29ba0a..79143e0 100644 --- a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r3; +package xyz.xenondevs.inventoryaccess.r3; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_16_R1.*; import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R1.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/ItemUtilsImpl.java index e549d0a..400e6ec 100644 --- a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r3; +package xyz.xenondevs.inventoryaccess.r3; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R1.ItemStack; import net.minecraft.server.v1_16_R1.NBTCompressedStreamTools; import net.minecraft.server.v1_16_R1.NBTTagCompound; import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/PlayerUtilsImpl.java similarity index 89% rename from inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/PlayerUtilsImpl.java index e642033..14daa21 100644 --- a/inventoryaccess/inventory-access-r3/src/main/java/de/studiocode/inventoryaccess/r3/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/PlayerUtilsImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r3; +package xyz.xenondevs.inventoryaccess.r3; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R1.*; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_16_R1.CraftServer; @@ -10,6 +7,9 @@ import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -44,7 +44,7 @@ class PlayerUtilsImpl implements PlayerUtils { } @Override - public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { + public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { List decorations = icons != null ? icons.stream().map(this::toMapDecoration).collect(Collectors.toCollection(ArrayList::new)) : new ArrayList<>(); @@ -66,7 +66,7 @@ class PlayerUtilsImpl implements PlayerUtils { ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); } - private MapIcon toMapDecoration(de.studiocode.inventoryaccess.map.MapIcon icon) { + private MapIcon toMapDecoration(xyz.xenondevs.inventoryaccess.map.MapIcon icon) { return new MapIcon( MapIcon.Type.a(icon.getType().getId()), icon.getX(), icon.getY(), diff --git a/inventoryaccess/inventory-access-r4/pom.xml b/inventoryaccess/inventory-access-r4/pom.xml index d51e8c2..ec23896 100644 --- a/inventoryaccess/inventory-access-r4/pom.xml +++ b/inventoryaccess/inventory-access-r4/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -25,7 +25,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/AnvilInventoryImpl.java similarity index 96% rename from inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/AnvilInventoryImpl.java index f711d78..ae9b850 100644 --- a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r4; +package xyz.xenondevs.inventoryaccess.r4; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_16_R2.*; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R2.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/CartographyInventoryImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/CartographyInventoryImpl.java index ba2b20b..2e4f1c6 100644 --- a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r4; +package xyz.xenondevs.inventoryaccess.r4; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R2.*; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R2.event.CraftEventFactory; @@ -12,6 +9,9 @@ import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/InventoryUtilsImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/InventoryUtilsImpl.java index cd34932..1e52f91 100644 --- a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r4; +package xyz.xenondevs.inventoryaccess.r4; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_16_R2.*; import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R2.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/ItemUtilsImpl.java index ddcf37d..12b4458 100644 --- a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r4; +package xyz.xenondevs.inventoryaccess.r4; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R2.ItemStack; import net.minecraft.server.v1_16_R2.NBTCompressedStreamTools; import net.minecraft.server.v1_16_R2.NBTTagCompound; import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/PlayerUtilsImpl.java similarity index 89% rename from inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/PlayerUtilsImpl.java index b326b18..762f25e 100644 --- a/inventoryaccess/inventory-access-r4/src/main/java/de/studiocode/inventoryaccess/r4/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/PlayerUtilsImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r4; +package xyz.xenondevs.inventoryaccess.r4; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R2.*; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_16_R2.CraftServer; @@ -10,6 +7,9 @@ import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -44,7 +44,7 @@ class PlayerUtilsImpl implements PlayerUtils { } @Override - public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { + public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { List decorations = icons != null ? icons.stream().map(this::toMapDecoration).collect(Collectors.toCollection(ArrayList::new)) : new ArrayList<>(); @@ -66,7 +66,7 @@ class PlayerUtilsImpl implements PlayerUtils { ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); } - private MapIcon toMapDecoration(de.studiocode.inventoryaccess.map.MapIcon icon) { + private MapIcon toMapDecoration(xyz.xenondevs.inventoryaccess.map.MapIcon icon) { return new MapIcon( MapIcon.Type.a(icon.getType().getId()), icon.getX(), icon.getY(), diff --git a/inventoryaccess/inventory-access-r5/pom.xml b/inventoryaccess/inventory-access-r5/pom.xml index e53d69d..34aa8a7 100644 --- a/inventoryaccess/inventory-access-r5/pom.xml +++ b/inventoryaccess/inventory-access-r5/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -25,7 +25,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/AnvilInventoryImpl.java similarity index 96% rename from inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/AnvilInventoryImpl.java index 3b36631..27b4584 100644 --- a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r5; +package xyz.xenondevs.inventoryaccess.r5; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_16_R3.*; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/CartographyInventoryImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/CartographyInventoryImpl.java index 06cc2d7..8519c43 100644 --- a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r5; +package xyz.xenondevs.inventoryaccess.r5; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R3.*; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory; @@ -12,6 +9,9 @@ import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/InventoryUtilsImpl.java similarity index 94% rename from inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/InventoryUtilsImpl.java index 55804c2..374a30b 100644 --- a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r5; +package xyz.xenondevs.inventoryaccess.r5; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.server.v1_16_R3.*; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory; @@ -12,6 +10,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/ItemUtilsImpl.java index f278fef..1e76422 100644 --- a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r5; +package xyz.xenondevs.inventoryaccess.r5; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R3.ItemStack; import net.minecraft.server.v1_16_R3.NBTCompressedStreamTools; import net.minecraft.server.v1_16_R3.NBTTagCompound; import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/PlayerUtilsImpl.java similarity index 89% rename from inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/PlayerUtilsImpl.java index d499963..1537123 100644 --- a/inventoryaccess/inventory-access-r5/src/main/java/de/studiocode/inventoryaccess/r5/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/PlayerUtilsImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r5; +package xyz.xenondevs.inventoryaccess.r5; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.server.v1_16_R3.*; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_16_R3.CraftServer; @@ -10,6 +7,9 @@ import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -44,7 +44,7 @@ class PlayerUtilsImpl implements PlayerUtils { } @Override - public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { + public void sendMapUpdate(@NotNull Player player, int mapId, byte scale, boolean locked, @Nullable MapPatch mapPatch, @Nullable List icons) { List decorations = icons != null ? icons.stream().map(this::toMapDecoration).collect(Collectors.toCollection(ArrayList::new)) : new ArrayList<>(); @@ -66,7 +66,7 @@ class PlayerUtilsImpl implements PlayerUtils { ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); } - private MapIcon toMapDecoration(de.studiocode.inventoryaccess.map.MapIcon icon) { + private MapIcon toMapDecoration(xyz.xenondevs.inventoryaccess.map.MapIcon icon) { return new MapIcon( MapIcon.Type.a(icon.getType().getId()), icon.getX(), icon.getY(), diff --git a/inventoryaccess/inventory-access-r6/pom.xml b/inventoryaccess/inventory-access-r6/pom.xml index b9a1929..4a4fd2f 100644 --- a/inventoryaccess/inventory-access-r6/pom.xml +++ b/inventoryaccess/inventory-access-r6/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/AnvilInventoryImpl.java index 197e995..44e9734 100644 --- a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r6; +package xyz.xenondevs.inventoryaccess.r6; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -23,6 +21,8 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/CartographyInventoryImpl.java index f587a8f..add7d70 100644 --- a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r6; +package xyz.xenondevs.inventoryaccess.r6; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/InventoryUtilsImpl.java index 276b2bb..e2e4f42 100644 --- a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r7; +package xyz.xenondevs.inventoryaccess.r6; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/ItemUtilsImpl.java index 1a8f73f..559a4ed 100644 --- a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r7; +package xyz.xenondevs.inventoryaccess.r6; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/PlayerUtilsImpl.java index f4e03c3..190772c 100644 --- a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r6; +package xyz.xenondevs.inventoryaccess.r6; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access-r7/pom.xml b/inventoryaccess/inventory-access-r7/pom.xml index dab4e1e..bfd2f5e 100644 --- a/inventoryaccess/inventory-access-r7/pom.xml +++ b/inventoryaccess/inventory-access-r7/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/AnvilInventoryImpl.java index ebc840f..a7fd537 100644 --- a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r7; +package xyz.xenondevs.inventoryaccess.r7; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -24,6 +22,8 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/CartographyInventoryImpl.java index d44882b..fe9fddc 100644 --- a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r7; +package xyz.xenondevs.inventoryaccess.r7; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/InventoryUtilsImpl.java index d9d5bf9..5c39a3d 100644 --- a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r6; +package xyz.xenondevs.inventoryaccess.r7; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/ItemUtilsImpl.java index dc4919b..ea9479e 100644 --- a/inventoryaccess/inventory-access-r6/src/main/java/de/studiocode/inventoryaccess/r6/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r6; +package xyz.xenondevs.inventoryaccess.r7; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/PlayerUtilsImpl.java index eb8c6a3..38b5af6 100644 --- a/inventoryaccess/inventory-access-r7/src/main/java/de/studiocode/inventoryaccess/r7/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r7; +package xyz.xenondevs.inventoryaccess.r7; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access-r8/pom.xml b/inventoryaccess/inventory-access-r8/pom.xml index 172afac..a335bd0 100644 --- a/inventoryaccess/inventory-access-r8/pom.xml +++ b/inventoryaccess/inventory-access-r8/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/AnvilInventoryImpl.java index f5abfc2..e846565 100644 --- a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r8; +package xyz.xenondevs.inventoryaccess.r8; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -24,6 +22,8 @@ import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/CartographyInventoryImpl.java index c8b08ae..240afb4 100644 --- a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r8; +package xyz.xenondevs.inventoryaccess.r8; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/InventoryUtilsImpl.java index 1b62faf..a534aee 100644 --- a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r8; +package xyz.xenondevs.inventoryaccess.r8; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/ItemUtilsImpl.java index 307f611..070c97d 100644 --- a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r8; +package xyz.xenondevs.inventoryaccess.r8; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java index 44e0613..ac27b37 100644 --- a/inventoryaccess/inventory-access-r8/src/main/java/de/studiocode/inventoryaccess/r8/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r8; +package xyz.xenondevs.inventoryaccess.r8; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access-r9/pom.xml b/inventoryaccess/inventory-access-r9/pom.xml index 4a48af9..62847d0 100644 --- a/inventoryaccess/inventory-access-r9/pom.xml +++ b/inventoryaccess/inventory-access-r9/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml @@ -27,7 +27,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.parent.version} diff --git a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/AnvilInventoryImpl.java b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/AnvilInventoryImpl.java similarity index 97% rename from inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/AnvilInventoryImpl.java rename to inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/AnvilInventoryImpl.java index 6a959f8..bce46e4 100644 --- a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/AnvilInventoryImpl.java +++ b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/AnvilInventoryImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r9; +package xyz.xenondevs.inventoryaccess.r9; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -24,6 +22,8 @@ import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/CartographyInventoryImpl.java b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/CartographyInventoryImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/CartographyInventoryImpl.java rename to inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/CartographyInventoryImpl.java index 1ad1f14..78bd093 100644 --- a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/CartographyInventoryImpl.java +++ b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/CartographyInventoryImpl.java @@ -1,8 +1,5 @@ -package de.studiocode.inventoryaccess.r9; +package xyz.xenondevs.inventoryaccess.r9; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; @@ -21,6 +18,9 @@ import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/InventoryUtilsImpl.java b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/InventoryUtilsImpl.java similarity index 95% rename from inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/InventoryUtilsImpl.java rename to inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/InventoryUtilsImpl.java index 855a837..cb861fd 100644 --- a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/InventoryUtilsImpl.java +++ b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/InventoryUtilsImpl.java @@ -1,7 +1,5 @@ -package de.studiocode.inventoryaccess.r9; +package xyz.xenondevs.inventoryaccess.r9; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.level.ServerPlayer; @@ -18,6 +16,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; class InventoryUtilsImpl implements InventoryUtils { diff --git a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/ItemUtilsImpl.java b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/ItemUtilsImpl.java similarity index 91% rename from inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/ItemUtilsImpl.java rename to inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/ItemUtilsImpl.java index d73019c..6fe06df 100644 --- a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/ItemUtilsImpl.java +++ b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/ItemUtilsImpl.java @@ -1,15 +1,15 @@ -package de.studiocode.inventoryaccess.r9; +package xyz.xenondevs.inventoryaccess.r9; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.item.ItemStack; import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.io.*; import java.util.List; diff --git a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java similarity index 90% rename from inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/PlayerUtilsImpl.java rename to inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java index 9a6dce8..b98e893 100644 --- a/inventoryaccess/inventory-access-r9/src/main/java/de/studiocode/inventoryaccess/r9/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java @@ -1,11 +1,5 @@ -package de.studiocode.inventoryaccess.r9; +package xyz.xenondevs.inventoryaccess.r9; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.inventoryaccess.util.DataUtils; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket; import net.minecraft.network.protocol.game.ClientboundResourcePackPacket; import net.minecraft.server.PlayerAdvancements; @@ -19,6 +13,12 @@ import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.inventoryaccess.util.DataUtils; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/inventoryaccess/inventory-access/pom.xml b/inventoryaccess/inventory-access/pom.xml index 0099c2d..1855887 100644 --- a/inventoryaccess/inventory-access/pom.xml +++ b/inventoryaccess/inventory-access/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../../pom.xml diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/InventoryAccess.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/InventoryAccess.java similarity index 87% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/InventoryAccess.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/InventoryAccess.java index 4094439..ba3c04e 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/InventoryAccess.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/InventoryAccess.java @@ -1,14 +1,14 @@ -package de.studiocode.inventoryaccess; +package xyz.xenondevs.inventoryaccess; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.abstraction.util.InventoryUtils; -import de.studiocode.inventoryaccess.abstraction.util.ItemUtils; -import de.studiocode.inventoryaccess.abstraction.util.PlayerUtils; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils; +import xyz.xenondevs.inventoryaccess.abstraction.util.ItemUtils; +import xyz.xenondevs.inventoryaccess.abstraction.util.PlayerUtils; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.lang.reflect.Constructor; import java.util.function.Consumer; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/inventory/AnvilInventory.java similarity index 94% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/inventory/AnvilInventory.java index 7635727..73cbb16 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/AnvilInventory.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/inventory/AnvilInventory.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.abstraction.inventory; +package xyz.xenondevs.inventoryaccess.abstraction.inventory; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/CartographyInventory.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/inventory/CartographyInventory.java similarity index 92% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/CartographyInventory.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/inventory/CartographyInventory.java index 3d46f5f..159ac28 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/inventory/CartographyInventory.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/inventory/CartographyInventory.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.abstraction.inventory; +package xyz.xenondevs.inventoryaccess.abstraction.inventory; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/InventoryUtils.java similarity index 93% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/InventoryUtils.java index 61aacd5..58971e4 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/InventoryUtils.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/InventoryUtils.java @@ -1,11 +1,11 @@ -package de.studiocode.inventoryaccess.abstraction.util; +package xyz.xenondevs.inventoryaccess.abstraction.util; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; public interface InventoryUtils { diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/ItemUtils.java similarity index 95% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/ItemUtils.java index 1f4a108..a3c2412 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/ItemUtils.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/ItemUtils.java @@ -1,9 +1,9 @@ -package de.studiocode.inventoryaccess.abstraction.util; +package xyz.xenondevs.inventoryaccess.abstraction.util; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; import java.io.InputStream; import java.io.OutputStream; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/PlayerUtils.java similarity index 91% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/PlayerUtils.java index a572cd7..fc8e151 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/abstraction/util/PlayerUtils.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/abstraction/util/PlayerUtils.java @@ -1,11 +1,11 @@ -package de.studiocode.inventoryaccess.abstraction.util; +package xyz.xenondevs.inventoryaccess.abstraction.util; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; import java.util.List; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/AdventureComponentWrapper.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/AdventureComponentWrapper.java similarity index 90% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/AdventureComponentWrapper.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/AdventureComponentWrapper.java index 76823f8..d093ec1 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/AdventureComponentWrapper.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/AdventureComponentWrapper.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.component; +package xyz.xenondevs.inventoryaccess.component; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/BaseComponentWrapper.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java similarity index 90% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/BaseComponentWrapper.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java index 7bf1957..d930562 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/BaseComponentWrapper.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.component; +package xyz.xenondevs.inventoryaccess.component; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.chat.ComponentSerializer; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/ComponentWrapper.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/ComponentWrapper.java similarity index 61% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/ComponentWrapper.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/ComponentWrapper.java index e053c30..c080f17 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/component/ComponentWrapper.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/ComponentWrapper.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.component; +package xyz.xenondevs.inventoryaccess.component; public interface ComponentWrapper { diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/map/MapIcon.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/map/MapIcon.java similarity index 95% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/map/MapIcon.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/map/MapIcon.java index 55df3c9..f229803 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/map/MapIcon.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/map/MapIcon.java @@ -1,10 +1,10 @@ -package de.studiocode.inventoryaccess.map; +package xyz.xenondevs.inventoryaccess.map; -import de.studiocode.inventoryaccess.component.BaseComponentWrapper; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.md_5.bungee.api.chat.BaseComponent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.component.BaseComponentWrapper; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; public class MapIcon { diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/map/MapPatch.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/map/MapPatch.java similarity index 94% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/map/MapPatch.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/map/MapPatch.java index fde3d61..25a3c6e 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/map/MapPatch.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/map/MapPatch.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.map; +package xyz.xenondevs.inventoryaccess.map; import java.io.Serializable; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/DataUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/DataUtils.java similarity index 92% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/DataUtils.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/DataUtils.java index 08f1f8e..dc2eae6 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/DataUtils.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/DataUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.util; +package xyz.xenondevs.inventoryaccess.util; public class DataUtils { diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java similarity index 91% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java index 5351f2c..020b7fc 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/ReflectionRegistry.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionRegistry.java @@ -1,8 +1,8 @@ -package de.studiocode.inventoryaccess.util; +package xyz.xenondevs.inventoryaccess.util; import java.lang.reflect.Field; -import static de.studiocode.inventoryaccess.util.ReflectionUtils.*; +import static xyz.xenondevs.inventoryaccess.util.ReflectionUtils.*; public class ReflectionRegistry { diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java similarity index 89% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java index 4fc9707..a623941 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/ReflectionUtils.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/ReflectionUtils.java @@ -1,16 +1,13 @@ -package de.studiocode.inventoryaccess.util; +package xyz.xenondevs.inventoryaccess.util; -import de.studiocode.inventoryaccess.version.InventoryAccessRevision; import org.bukkit.Bukkit; +import xyz.xenondevs.inventoryaccess.version.InventoryAccessRevision; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import static de.studiocode.inventoryaccess.util.ReflectionRegistry.BUKKIT_PACKAGE_PATH; -import static de.studiocode.inventoryaccess.util.ReflectionRegistry.CRAFT_BUKKIT_PACKAGE_PATH; - @SuppressWarnings({"unchecked", "unused"}) public class ReflectionUtils { @@ -28,7 +25,7 @@ public class ReflectionUtils { public static Class getImplClass(String path) { try { - return (Class) Class.forName("de.studiocode.inventoryaccess." + InventoryAccessRevision.REQUIRED_REVISION.getPackageName() + "." + path); + return (Class) Class.forName("xyz.xenondevs.inventoryaccess." + InventoryAccessRevision.REQUIRED_REVISION.getPackageName() + "." + path); } catch (ClassNotFoundException e) { e.printStackTrace(); } @@ -37,11 +34,11 @@ public class ReflectionUtils { } public static Class getBukkitClass(String path) { - return getClass(BUKKIT_PACKAGE_PATH + path); + return getClass(ReflectionRegistry.BUKKIT_PACKAGE_PATH + path); } public static Class getCBClass(String path) { - return getClass(CRAFT_BUKKIT_PACKAGE_PATH + path); + return getClass(ReflectionRegistry.CRAFT_BUKKIT_PACKAGE_PATH + path); } public static Class getClass(String path) { diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/VersionUtils.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/VersionUtils.java similarity index 98% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/VersionUtils.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/VersionUtils.java index c4fff84..a6a2eee 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/util/VersionUtils.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/util/VersionUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.inventoryaccess.util; +package xyz.xenondevs.inventoryaccess.util; import org.bukkit.Bukkit; diff --git a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccessRevision.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/version/InventoryAccessRevision.java similarity index 92% rename from inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccessRevision.java rename to inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/version/InventoryAccessRevision.java index 664f630..ada509c 100644 --- a/inventoryaccess/inventory-access/src/main/java/de/studiocode/inventoryaccess/version/InventoryAccessRevision.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/version/InventoryAccessRevision.java @@ -1,6 +1,6 @@ -package de.studiocode.inventoryaccess.version; +package xyz.xenondevs.inventoryaccess.version; -import de.studiocode.inventoryaccess.util.VersionUtils; +import xyz.xenondevs.inventoryaccess.util.VersionUtils; public enum InventoryAccessRevision { diff --git a/invui-kotlin/pom.xml b/invui-kotlin/pom.xml index 7cdc65f..bbe6df4 100644 --- a/invui-kotlin/pom.xml +++ b/invui-kotlin/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT @@ -30,7 +30,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui invui ${project.version} diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/Guis.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt similarity index 96% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/Guis.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt index cc00963..bd82bfe 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/Guis.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt @@ -1,8 +1,8 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.gui +package xyz.xenondevs.invui.gui -import de.studiocode.invui.item.Item +import xyz.xenondevs.invui.item.Item /** * Gets the [SlotElement] placed on that slot. diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/ItemBuilders.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/ItemBuilders.kt similarity index 66% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/ItemBuilders.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/ItemBuilders.kt index c1be6be..d843957 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/ItemBuilders.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/ItemBuilders.kt @@ -1,10 +1,10 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.item.builder +package xyz.xenondevs.invui.item.builder -import de.studiocode.inventoryaccess.component.BaseComponentWrapper -import de.studiocode.invui.util.ComponentUtils import net.md_5.bungee.api.chat.BaseComponent +import xyz.xenondevs.inventoryaccess.component.BaseComponentWrapper +import xyz.xenondevs.invui.util.ComponentUtils /** * Sets the lore of the item stack. diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/Items.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Items.kt similarity index 84% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/Items.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Items.kt index 6850f23..7a53867 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/Items.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Items.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.item +package xyz.xenondevs.invui.item /** * Calls [Item.notifyWindows] for all items in this [Iterable]. diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/VirtualInventories.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/VirtualInventories.kt similarity index 93% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/VirtualInventories.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/VirtualInventories.kt index 965dba9..3918bd6 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/VirtualInventories.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/VirtualInventories.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.virtualinventory +package xyz.xenondevs.invui.virtualinventory import org.bukkit.inventory.ItemStack diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/Windows.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt similarity index 66% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/Windows.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt index b0fbb76..3321c24 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/Windows.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt @@ -1,9 +1,9 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.window.type +package xyz.xenondevs.invui.window.type -import de.studiocode.invui.window.Window -import de.studiocode.invui.window.type.context.WindowContext +import xyz.xenondevs.invui.window.Window +import xyz.xenondevs.invui.window.type.context.WindowContext fun WindowType.create(contextConsumer: C.() -> Unit): W { val ctx = createContext() diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/adventure/AdventureItemBuilders.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/adventure/AdventureItemBuilders.kt similarity index 85% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/adventure/AdventureItemBuilders.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/adventure/AdventureItemBuilders.kt index 27ca816..69b0684 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/adventure/AdventureItemBuilders.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/adventure/AdventureItemBuilders.kt @@ -1,9 +1,9 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.item.builder +package xyz.xenondevs.invui.item.builder -import de.studiocode.inventoryaccess.component.AdventureComponentWrapper import net.kyori.adventure.text.Component +import xyz.xenondevs.inventoryaccess.component.AdventureComponentWrapper /** * Sets the display name of the item stack. diff --git a/invui-kotlin/src/main/kotlin/de/studiocode/invui/adventure/AdventureWindowContexts.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/adventure/AdventureWindowContexts.kt similarity index 68% rename from invui-kotlin/src/main/kotlin/de/studiocode/invui/adventure/AdventureWindowContexts.kt rename to invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/adventure/AdventureWindowContexts.kt index 0e60fd1..175f778 100644 --- a/invui-kotlin/src/main/kotlin/de/studiocode/invui/adventure/AdventureWindowContexts.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/adventure/AdventureWindowContexts.kt @@ -1,9 +1,9 @@ @file:Suppress("PackageDirectoryMismatch") -package de.studiocode.invui.window.type.context +package xyz.xenondevs.invui.window.type.context -import de.studiocode.inventoryaccess.component.AdventureComponentWrapper import net.kyori.adventure.text.Component +import xyz.xenondevs.inventoryaccess.component.AdventureComponentWrapper /** * Sets the title of the window. diff --git a/invui-resourcepack/pom.xml b/invui-resourcepack/pom.xml index 0a9ee9f..5b358f3 100644 --- a/invui-resourcepack/pom.xml +++ b/invui-resourcepack/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - InvUI-Parent - de.studiocode.invui + invui-parent + xyz.xenondevs.invui 1.0-SNAPSHOT 4.0.0 @@ -24,7 +24,7 @@ provided - de.studiocode.invui + xyz.xenondevs.invui invui ${project.version} diff --git a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/ForceResourcePack.java similarity index 92% rename from invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java rename to invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/ForceResourcePack.java index d24a00f..0b01c8e 100644 --- a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java +++ b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/ForceResourcePack.java @@ -1,13 +1,5 @@ -package de.studiocode.invui.resourcepack; +package xyz.xenondevs.invui.resourcepack; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.component.BaseComponentWrapper; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.VersionUtils; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.resourcepack.auth.AuthenticationServiceManager; -import de.studiocode.invui.util.DataUtils; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -16,6 +8,14 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerResourcePackStatusEvent; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.component.BaseComponentWrapper; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.VersionUtils; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.resourcepack.auth.AuthenticationServiceManager; +import xyz.xenondevs.invui.util.DataUtils; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/Icon.java b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/Icon.java similarity index 94% rename from invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/Icon.java rename to invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/Icon.java index 891a09f..853435f 100644 --- a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/Icon.java +++ b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/Icon.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.resourcepack; +package xyz.xenondevs.invui.resourcepack; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.builder.ItemBuilder; -import de.studiocode.invui.item.impl.SimpleItem; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Material; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.builder.ItemBuilder; +import xyz.xenondevs.invui.item.impl.SimpleItem; /** * Custom-textured Items that look like they are a part of the inventory. diff --git a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/AuthenticationService.java b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/AuthenticationService.java similarity index 86% rename from invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/AuthenticationService.java rename to invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/AuthenticationService.java index 5da3a11..8057e21 100644 --- a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/AuthenticationService.java +++ b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/AuthenticationService.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.resourcepack.auth; +package xyz.xenondevs.invui.resourcepack.auth; import org.bukkit.entity.Player; import org.bukkit.event.Listener; diff --git a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/AuthenticationServiceManager.java b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/AuthenticationServiceManager.java similarity index 93% rename from invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/AuthenticationServiceManager.java rename to invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/AuthenticationServiceManager.java index 357b30d..d900dd8 100644 --- a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/AuthenticationServiceManager.java +++ b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/AuthenticationServiceManager.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.resourcepack.auth; +package xyz.xenondevs.invui.resourcepack.auth; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.resourcepack.auth.impl.AuthMe; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.resourcepack.auth.impl.AuthMe; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/impl/AuthMe.java b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/impl/AuthMe.java similarity index 70% rename from invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/impl/AuthMe.java rename to invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/impl/AuthMe.java index d9587a9..2314032 100644 --- a/invui-resourcepack/src/main/java/de/studiocode/invui/resourcepack/auth/impl/AuthMe.java +++ b/invui-resourcepack/src/main/java/xyz/xenondevs/invui/resourcepack/auth/impl/AuthMe.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.resourcepack.auth.impl; +package xyz.xenondevs.invui.resourcepack.auth.impl; -import de.studiocode.invui.resourcepack.auth.AuthenticationService; import fr.xephi.authme.events.LoginEvent; import org.bukkit.event.EventHandler; +import xyz.xenondevs.invui.resourcepack.auth.AuthenticationService; public class AuthMe extends AuthenticationService { diff --git a/invui/pom.xml b/invui/pom.xml index afdcac2..8c52f16 100644 --- a/invui/pom.xml +++ b/invui/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT ../pom.xml @@ -38,67 +38,67 @@ - de.studiocode.invui + xyz.xenondevs.invui inventory-access ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r1 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r2 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r3 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r4 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r5 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r6 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r7 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r8 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r9 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r10 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r11 ${project.version} - de.studiocode.invui + xyz.xenondevs.invui inventory-access-r12 ${project.version} diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/WindowContext.java b/invui/src/main/java/de/studiocode/invui/window/type/context/WindowContext.java deleted file mode 100644 index 591c67f..0000000 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/WindowContext.java +++ /dev/null @@ -1,4 +0,0 @@ -package de.studiocode.invui.window.type.context; - -public interface WindowContext { -} diff --git a/invui/src/main/java/de/studiocode/invui/InvUI.java b/invui/src/main/java/xyz/xenondevs/invui/InvUI.java similarity index 91% rename from invui/src/main/java/de/studiocode/invui/InvUI.java rename to invui/src/main/java/xyz/xenondevs/invui/InvUI.java index 1b7c50a..6bf321d 100644 --- a/invui/src/main/java/de/studiocode/invui/InvUI.java +++ b/invui/src/main/java/xyz/xenondevs/invui/InvUI.java @@ -1,17 +1,17 @@ -package de.studiocode.invui; +package xyz.xenondevs.invui; -import de.studiocode.inventoryaccess.util.ReflectionUtils; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; import java.util.ArrayList; import java.util.List; -import static de.studiocode.inventoryaccess.util.ReflectionRegistry.PLUGIN_CLASS_LOADER_PLUGIN_FIELD; +import static xyz.xenondevs.inventoryaccess.util.ReflectionRegistry.PLUGIN_CLASS_LOADER_PLUGIN_FIELD; public class InvUI implements Listener { diff --git a/invui/src/main/java/de/studiocode/invui/animation/Animation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/Animation.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/animation/Animation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/Animation.java index ab6e9ab..561737d 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/Animation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/Animation.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.animation; +package xyz.xenondevs.invui.animation; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.window.Window; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.window.Window; import java.util.List; import java.util.function.BiConsumer; diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/BaseAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/BaseAnimation.java similarity index 92% rename from invui/src/main/java/de/studiocode/invui/animation/impl/BaseAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/BaseAnimation.java index b96cbd4..b0e9f72 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/BaseAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/BaseAnimation.java @@ -1,14 +1,14 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; -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; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.animation.Animation; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.util.SlotUtils; +import xyz.xenondevs.invui.window.Window; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/ColumnAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java similarity index 94% rename from invui/src/main/java/de/studiocode/invui/animation/impl/ColumnAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java index 760392b..7f8609e 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/ColumnAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/ColumnAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; public class ColumnAnimation extends SoundAnimation { diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/HorizontalSnakeAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/animation/impl/HorizontalSnakeAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java index 314daa5..9bb9b0c 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/HorizontalSnakeAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/HorizontalSnakeAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; public class HorizontalSnakeAnimation extends SoundAnimation { diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/RandomAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java similarity index 88% rename from invui/src/main/java/de/studiocode/invui/animation/impl/RandomAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java index 3c3d203..cb36c5c 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/RandomAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RandomAnimation.java @@ -1,6 +1,6 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; -import de.studiocode.invui.item.Item; +import xyz.xenondevs.invui.item.Item; import java.util.List; import java.util.Random; diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/RowAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java similarity index 94% rename from invui/src/main/java/de/studiocode/invui/animation/impl/RowAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java index cfe7ed2..6df92df 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/RowAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/RowAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; public class RowAnimation extends SoundAnimation { diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/SequentialAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java similarity index 85% rename from invui/src/main/java/de/studiocode/invui/animation/impl/SequentialAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java index cb9a2de..8acf80b 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/SequentialAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SequentialAnimation.java @@ -1,6 +1,6 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; -import de.studiocode.invui.item.Item; +import xyz.xenondevs.invui.item.Item; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/SoundAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SoundAnimation.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/animation/impl/SoundAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/SoundAnimation.java index 365275b..8baa028 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/SoundAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SoundAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; import org.bukkit.Sound; diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/SplitSequentialAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/animation/impl/SplitSequentialAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java index 6113f46..3160488 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/SplitSequentialAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/SplitSequentialAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/animation/impl/VerticalSnakeAnimation.java b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/animation/impl/VerticalSnakeAnimation.java rename to invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java index b98d674..f2cb400 100644 --- a/invui/src/main/java/de/studiocode/invui/animation/impl/VerticalSnakeAnimation.java +++ b/invui/src/main/java/xyz/xenondevs/invui/animation/impl/VerticalSnakeAnimation.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.animation.impl; +package xyz.xenondevs.invui.animation.impl; public class VerticalSnakeAnimation extends SoundAnimation { diff --git a/invui/src/main/java/de/studiocode/invui/gui/AbstractGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java similarity index 87% rename from invui/src/main/java/de/studiocode/invui/gui/AbstractGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java index 12692dc..42d8b33 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/AbstractGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java @@ -1,21 +1,5 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.animation.Animation; -import de.studiocode.invui.gui.SlotElement.ItemSlotElement; -import de.studiocode.invui.gui.SlotElement.LinkedSlotElement; -import de.studiocode.invui.gui.SlotElement.VISlotElement; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.item.impl.controlitem.ControlItem; -import de.studiocode.invui.util.InventoryUtils; -import de.studiocode.invui.util.SlotUtils; -import de.studiocode.invui.util.ArrayUtils; -import de.studiocode.invui.virtualinventory.VirtualInventory; -import de.studiocode.invui.virtualinventory.event.ItemUpdateEvent; -import de.studiocode.invui.virtualinventory.event.PlayerUpdateReason; -import de.studiocode.invui.virtualinventory.event.UpdateReason; -import de.studiocode.invui.window.*; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryAction; @@ -25,6 +9,19 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.animation.Animation; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.item.impl.controlitem.ControlItem; +import xyz.xenondevs.invui.util.ArrayUtils; +import xyz.xenondevs.invui.util.InventoryUtils; +import xyz.xenondevs.invui.util.SlotUtils; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; +import xyz.xenondevs.invui.virtualinventory.event.ItemUpdateEvent; +import xyz.xenondevs.invui.virtualinventory.event.PlayerUpdateReason; +import xyz.xenondevs.invui.virtualinventory.event.UpdateReason; +import xyz.xenondevs.invui.window.*; import java.util.*; import java.util.function.Predicate; @@ -58,21 +55,21 @@ public abstract class AbstractGui implements Gui, GuiParent { } SlotElement slotElement = slotElements[slotNumber]; - if (slotElement instanceof LinkedSlotElement) { - LinkedSlotElement linkedElement = (LinkedSlotElement) slotElement; + if (slotElement instanceof SlotElement.LinkedSlotElement) { + SlotElement.LinkedSlotElement linkedElement = (SlotElement.LinkedSlotElement) slotElement; AbstractGui gui = (AbstractGui) linkedElement.getGui(); gui.handleClick(linkedElement.getSlotIndex(), player, clickType, event); - } else if (slotElement instanceof ItemSlotElement) { + } else if (slotElement instanceof SlotElement.ItemSlotElement) { event.setCancelled(true); // if it is an Item, don't let the player move it - ItemSlotElement itemElement = (ItemSlotElement) slotElement; + SlotElement.ItemSlotElement itemElement = (SlotElement.ItemSlotElement) slotElement; itemElement.getItem().handleClick(clickType, player, event); - } else if (slotElement instanceof VISlotElement) { - handleVISlotElementClick((VISlotElement) slotElement, event); + } else if (slotElement instanceof SlotElement.VISlotElement) { + handleVISlotElementClick((SlotElement.VISlotElement) slotElement, event); } else event.setCancelled(true); // Only VISlotElements have allowed interactions } // region virtual inventories - protected void handleVISlotElementClick(VISlotElement element, InventoryClickEvent event) { + protected void handleVISlotElementClick(SlotElement.VISlotElement element, InventoryClickEvent event) { // these actions are ignored as they don't modify the inventory InventoryAction action = event.getAction(); if (action != InventoryAction.CLONE_STACK @@ -126,7 +123,7 @@ public abstract class AbstractGui implements Gui, GuiParent { } } - private boolean didClickBackgroundItem(Player player, VISlotElement element, VirtualInventory inventory, int slot, ItemStack clicked) { + private boolean didClickBackgroundItem(Player player, SlotElement.VISlotElement element, VirtualInventory inventory, int slot, ItemStack clicked) { UUID uuid = player.getUniqueId(); return inventory.getUnsafeItemStack(slot) == null && (isBuilderSimilar(background, uuid, clicked) || isBuilderSimilar(element.getBackground(), uuid, clicked)); @@ -288,8 +285,8 @@ public abstract class AbstractGui implements Gui, GuiParent { public boolean handleItemDrag(UpdateReason updateReason, int slot, ItemStack oldStack, ItemStack newStack) { SlotElement element = getSlotElement(slot); if (element != null) element = element.getHoldingElement(); - if (element instanceof VISlotElement) { - VISlotElement viSlotElement = ((VISlotElement) element); + if (element instanceof SlotElement.VISlotElement) { + SlotElement.VISlotElement viSlotElement = ((SlotElement.VISlotElement) element); VirtualInventory virtualInventory = viSlotElement.getVirtualInventory(); int viSlot = viSlotElement.getSlot(); if (virtualInventory.isSynced(viSlot, oldStack)) { @@ -336,8 +333,8 @@ public abstract class AbstractGui implements Gui, GuiParent { return Arrays.stream(slotElements) .filter(Objects::nonNull) .map(SlotElement::getHoldingElement) - .filter(element -> element instanceof VISlotElement) - .map(element -> ((VISlotElement) element).getVirtualInventory()) + .filter(element -> element instanceof SlotElement.VISlotElement) + .map(element -> ((SlotElement.VISlotElement) element).getVirtualInventory()) .filter(vi -> Arrays.stream(ignored).noneMatch(vi::equals)) .sorted((vi1, vi2) -> -Integer.compare(vi1.getGuiShiftPriority(), vi2.getGuiShiftPriority())) .collect(Collectors.toCollection(LinkedHashSet::new)); @@ -349,8 +346,8 @@ public abstract class AbstractGui implements Gui, GuiParent { // find all SlotElements that link to this slotIndex in this child Gui and notify all parents for (int index = 0; index < size; index++) { SlotElement element = slotElements[index]; - if (element instanceof LinkedSlotElement) { - LinkedSlotElement linkedSlotElement = (LinkedSlotElement) element; + if (element instanceof SlotElement.LinkedSlotElement) { + SlotElement.LinkedSlotElement linkedSlotElement = (SlotElement.LinkedSlotElement) element; if (linkedSlotElement.getGui() == child && linkedSlotElement.getSlotIndex() == slotIndex) for (GuiParent parent : parents) parent.handleSlotElementUpdate(this, index); } @@ -442,8 +439,8 @@ public abstract class AbstractGui implements Gui, GuiParent { public void updateControlItems() { for (SlotElement element : slotElements) { - if (element instanceof ItemSlotElement) { - Item item = ((ItemSlotElement) element).getItem(); + if (element instanceof SlotElement.ItemSlotElement) { + Item item = ((SlotElement.ItemSlotElement) element).getItem(); if (item instanceof ControlItem) item.notifyWindows(); } @@ -458,8 +455,8 @@ public abstract class AbstractGui implements Gui, GuiParent { slotElements[index] = slotElement; // set the gui if it is a ControlItem - if (slotElement instanceof ItemSlotElement) { - Item item = ((ItemSlotElement) slotElement).getItem(); + if (slotElement instanceof SlotElement.ItemSlotElement) { + Item item = ((SlotElement.ItemSlotElement) slotElement).getItem(); if (item instanceof ControlItem) ((ControlItem) item).setGui(this); } @@ -467,8 +464,8 @@ public abstract class AbstractGui implements Gui, GuiParent { // notify parents that a SlotElement has been changed parents.forEach(parent -> parent.handleSlotElementUpdate(this, index)); - AbstractGui oldLink = oldElement instanceof LinkedSlotElement ? (AbstractGui) ((LinkedSlotElement) oldElement).getGui() : null; - AbstractGui newLink = slotElement instanceof LinkedSlotElement ? (AbstractGui) ((LinkedSlotElement) slotElement).getGui() : null; + AbstractGui oldLink = oldElement instanceof SlotElement.LinkedSlotElement ? (AbstractGui) ((SlotElement.LinkedSlotElement) oldElement).getGui() : null; + AbstractGui newLink = slotElement instanceof SlotElement.LinkedSlotElement ? (AbstractGui) ((SlotElement.LinkedSlotElement) slotElement).getGui() : null; // if newLink is the same as oldLink, there isn't anything to be done if (newLink == oldLink) return; @@ -477,8 +474,8 @@ public abstract class AbstractGui implements Gui, GuiParent { if (oldLink != null) { // If no other slot still links to that Gui, remove this Gui from parents if (Arrays.stream(slotElements) - .filter(element -> element instanceof LinkedSlotElement) - .map(element -> ((LinkedSlotElement) element).getGui()) + .filter(element -> element instanceof SlotElement.LinkedSlotElement) + .map(element -> ((SlotElement.LinkedSlotElement) element).getGui()) .noneMatch(gui -> gui == oldLink)) oldLink.removeParent(this); } @@ -516,7 +513,7 @@ public abstract class AbstractGui implements Gui, GuiParent { @Override public void setItem(int index, @Nullable Item item) { remove(index); - if (item != null) setSlotElement(index, new ItemSlotElement(item)); + if (item != null) setSlotElement(index, new SlotElement.ItemSlotElement(item)); } @Override @@ -532,11 +529,11 @@ public abstract class AbstractGui implements Gui, GuiParent { public @Nullable Item getItem(int index) { SlotElement slotElement = slotElements[index]; - if (slotElement instanceof ItemSlotElement) { - return ((ItemSlotElement) slotElement).getItem(); - } else if (slotElement instanceof LinkedSlotElement) { + if (slotElement instanceof SlotElement.ItemSlotElement) { + return ((SlotElement.ItemSlotElement) slotElement).getItem(); + } else if (slotElement instanceof SlotElement.LinkedSlotElement) { SlotElement holdingElement = slotElement.getHoldingElement(); - if (holdingElement instanceof ItemSlotElement) return ((ItemSlotElement) holdingElement).getItem(); + if (holdingElement instanceof SlotElement.ItemSlotElement) return ((SlotElement.ItemSlotElement) holdingElement).getItem(); } return null; @@ -660,7 +657,7 @@ public abstract class AbstractGui implements Gui, GuiParent { int slotIndex = 0; for (int slot : SlotUtils.getSlotsRect(x, y, gui.getWidth(), gui.getHeight(), this.width)) { if (hasSlotElement(slot) && !replaceExisting) continue; - setSlotElement(slot, new LinkedSlotElement(gui, slotIndex)); + setSlotElement(slot, new SlotElement.LinkedSlotElement(gui, slotIndex)); slotIndex++; } } @@ -678,7 +675,7 @@ public abstract class AbstractGui implements Gui, GuiParent { for (int slot : SlotUtils.getSlotsRect(x, y, width, height, this.width)) { if (slotIndex >= virtualInventory.getSize()) return; if (hasSlotElement(slot) && !replaceExisting) continue; - setSlotElement(slot, new VISlotElement(virtualInventory, slotIndex, background)); + setSlotElement(slot, new SlotElement.VISlotElement(virtualInventory, slotIndex, background)); slotIndex++; } } diff --git a/invui/src/main/java/de/studiocode/invui/gui/AbstractPagedGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/gui/AbstractPagedGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java index 6808a2a..8131ca4 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/AbstractPagedGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.gui.builder.GuiBuilder; -import de.studiocode.invui.gui.impl.PagedNestedGuiImpl; -import de.studiocode.invui.gui.impl.PagedItemsGuiImpl; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; +import xyz.xenondevs.invui.gui.impl.PagedItemsGuiImpl; +import xyz.xenondevs.invui.gui.impl.PagedNestedGuiImpl; +import xyz.xenondevs.invui.gui.structure.Structure; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/AbstractScrollGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractScrollGui.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/gui/AbstractScrollGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/AbstractScrollGui.java index 13c95b8..1e57224 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/AbstractScrollGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractScrollGui.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.gui.impl.ScrollItemsGuiImpl; -import de.studiocode.invui.gui.impl.ScrollNestedGuiImpl; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.util.SlotUtils; +import xyz.xenondevs.invui.gui.impl.ScrollItemsGuiImpl; +import xyz.xenondevs.invui.gui.impl.ScrollNestedGuiImpl; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.util.SlotUtils; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/AbstractTabGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/gui/AbstractTabGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java index 2ad12c8..51c5091 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/AbstractTabGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.structure.Structure; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/Gui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java similarity index 96% rename from invui/src/main/java/de/studiocode/invui/gui/Gui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java index dabe8d1..126bc4b 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/Gui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java @@ -1,18 +1,18 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.animation.Animation; -import de.studiocode.invui.gui.builder.GuiBuilder; -import de.studiocode.invui.gui.impl.NormalGuiImpl; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.virtualinventory.VirtualInventory; -import de.studiocode.invui.window.Window; -import de.studiocode.invui.window.WindowManager; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.animation.Animation; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; +import xyz.xenondevs.invui.gui.impl.NormalGuiImpl; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; +import xyz.xenondevs.invui.window.Window; +import xyz.xenondevs.invui.window.WindowManager; import java.util.List; import java.util.Set; diff --git a/invui/src/main/java/de/studiocode/invui/gui/GuiParent.java b/invui/src/main/java/xyz/xenondevs/invui/gui/GuiParent.java similarity index 92% rename from invui/src/main/java/de/studiocode/invui/gui/GuiParent.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/GuiParent.java index 245db24..cb18215 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/GuiParent.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/GuiParent.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; public interface GuiParent { diff --git a/invui/src/main/java/de/studiocode/invui/gui/PagedGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/PagedGui.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/gui/PagedGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/PagedGui.java index aece9a0..154e71f 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/PagedGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/PagedGui.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.gui.impl.PagedItemsGuiImpl; -import de.studiocode.invui.gui.impl.PagedNestedGuiImpl; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.impl.PagedItemsGuiImpl; +import xyz.xenondevs.invui.gui.impl.PagedNestedGuiImpl; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; import java.util.List; import java.util.function.BiConsumer; diff --git a/invui/src/main/java/de/studiocode/invui/gui/ScrollGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/ScrollGui.java similarity index 92% rename from invui/src/main/java/de/studiocode/invui/gui/ScrollGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/ScrollGui.java index c5469dd..6199802 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/ScrollGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/ScrollGui.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.gui.impl.ScrollItemsGuiImpl; -import de.studiocode.invui.gui.impl.ScrollNestedGuiImpl; -import de.studiocode.invui.gui.impl.ScrollVIGuiImpl; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.impl.ScrollItemsGuiImpl; +import xyz.xenondevs.invui.gui.impl.ScrollNestedGuiImpl; +import xyz.xenondevs.invui.gui.impl.ScrollVIGuiImpl; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/SlotElement.java b/invui/src/main/java/xyz/xenondevs/invui/gui/SlotElement.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/gui/SlotElement.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/SlotElement.java index 0c4668b..d9ddcab 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/SlotElement.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/SlotElement.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.inventory.ItemStack; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/TabGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/TabGui.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/gui/TabGui.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/TabGui.java index c1bd6fa..8baf1f2 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/TabGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/TabGui.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui; +package xyz.xenondevs.invui.gui; -import de.studiocode.invui.gui.impl.TabGuiImpl; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.impl.TabGuiImpl; +import xyz.xenondevs.invui.gui.structure.Structure; import java.util.List; import java.util.function.BiConsumer; diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/GuiBuilder.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/GuiBuilder.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/gui/builder/GuiBuilder.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/GuiBuilder.java index 032a978..e437dfa 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/GuiBuilder.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/GuiBuilder.java @@ -1,18 +1,18 @@ -package de.studiocode.invui.gui.builder; +package xyz.xenondevs.invui.gui.builder; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.builder.guitype.GuiType; -import de.studiocode.invui.gui.structure.Marker; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.item.ItemWrapper; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.builder.guitype.GuiType; +import xyz.xenondevs.invui.gui.structure.Marker; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.item.ItemWrapper; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/GuiContext.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/GuiContext.java similarity index 79% rename from invui/src/main/java/de/studiocode/invui/gui/builder/GuiContext.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/GuiContext.java index 8db6b61..718e827 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/GuiContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/GuiContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.gui.builder; +package xyz.xenondevs.invui.gui.builder; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.guitype.GuiType; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.ItemProvider; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.guitype.GuiType; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.ItemProvider; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/GuiType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/GuiType.java similarity index 69% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/GuiType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/GuiType.java index 041a727..4d0e200 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/GuiType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/GuiType.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.PagedGui; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.TabGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.virtualinventory.VirtualInventory; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.PagedGui; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.TabGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; public interface GuiType { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/NormalGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/NormalGUIType.java similarity index 60% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/NormalGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/NormalGUIType.java index 5bb2da2..fdf6092 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/NormalGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/NormalGUIType.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.NormalGuiImpl; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.NormalGuiImpl; class NormalGuiType implements GuiType { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/PagedGUIsGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/PagedGUIsGUIType.java similarity index 59% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/PagedGUIsGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/PagedGUIsGUIType.java index ae0abf3..d6642cc 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/PagedGUIsGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/PagedGUIsGUIType.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.PagedGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.PagedNestedGuiImpl; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.PagedGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.PagedNestedGuiImpl; class PagedGuisGuiType implements GuiType, Gui> { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/PagedItemsGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/PagedItemsGUIType.java similarity index 59% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/PagedItemsGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/PagedItemsGUIType.java index 9227b5a..ce91483 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/PagedItemsGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/PagedItemsGUIType.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.PagedGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.PagedItemsGuiImpl; -import de.studiocode.invui.item.Item; +import xyz.xenondevs.invui.gui.PagedGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.PagedItemsGuiImpl; +import xyz.xenondevs.invui.item.Item; class PagedItemsGuiType implements GuiType, Item> { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollGUIsGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollGUIsGUIType.java similarity index 59% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollGUIsGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollGUIsGUIType.java index f57255b..11a50d0 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollGUIsGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollGUIsGUIType.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.ScrollNestedGuiImpl; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.ScrollNestedGuiImpl; class ScrollGuisGuiType implements GuiType, Gui> { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollItemsGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollItemsGUIType.java similarity index 59% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollItemsGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollItemsGUIType.java index e0af35d..f300fa7 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollItemsGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollItemsGUIType.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.ScrollItemsGuiImpl; -import de.studiocode.invui.item.Item; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.ScrollItemsGuiImpl; +import xyz.xenondevs.invui.item.Item; class ScrollItemsGuiType implements GuiType, Item> { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollVIGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollVIGUIType.java similarity index 59% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollVIGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollVIGUIType.java index a75ef0b..a1944f6 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/ScrollVIGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/ScrollVIGUIType.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.ScrollVIGuiImpl; -import de.studiocode.invui.virtualinventory.VirtualInventory; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.ScrollVIGuiImpl; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; class ScrollVIGuiType implements GuiType, VirtualInventory> { diff --git a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/TabGUIType.java b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/TabGUIType.java similarity index 57% rename from invui/src/main/java/de/studiocode/invui/gui/builder/guitype/TabGUIType.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/TabGUIType.java index d3d851b..71c70b1 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/builder/guitype/TabGUIType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/builder/guitype/TabGUIType.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.builder.guitype; +package xyz.xenondevs.invui.gui.builder.guitype; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.TabGui; -import de.studiocode.invui.gui.builder.GuiContext; -import de.studiocode.invui.gui.impl.TabGuiImpl; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.TabGui; +import xyz.xenondevs.invui.gui.builder.GuiContext; +import xyz.xenondevs.invui.gui.impl.TabGuiImpl; class TabGuiType implements GuiType { diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/NormalGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/NormalGuiImpl.java similarity index 83% rename from invui/src/main/java/de/studiocode/invui/gui/impl/NormalGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/NormalGuiImpl.java index c684dc8..16784e9 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/NormalGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/NormalGuiImpl.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.structure.Structure; /** * A normal {@link Gui} without any special features. diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/PagedItemsGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedItemsGuiImpl.java similarity index 82% rename from invui/src/main/java/de/studiocode/invui/gui/impl/PagedItemsGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedItemsGuiImpl.java index d8c994d..214eb7e 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/PagedItemsGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedItemsGuiImpl.java @@ -1,14 +1,13 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractPagedGui; -import de.studiocode.invui.gui.PagedGui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.SlotElement.ItemSlotElement; -import de.studiocode.invui.gui.builder.GuiBuilder; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.AbstractPagedGui; +import xyz.xenondevs.invui.gui.PagedGui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; import java.util.ArrayList; import java.util.List; @@ -72,7 +71,7 @@ public final class PagedItemsGuiImpl extends AbstractPagedGui { int from = page * length; int to = Math.min(from + length, items.size()); - return items.subList(from, to).stream().map(ItemSlotElement::new).collect(Collectors.toList()); + return items.subList(from, to).stream().map(SlotElement.ItemSlotElement::new).collect(Collectors.toList()); } } diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/PagedNestedGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java similarity index 87% rename from invui/src/main/java/de/studiocode/invui/gui/impl/PagedNestedGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java index 1e0a161..811b232 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/PagedNestedGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java @@ -1,13 +1,13 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractPagedGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.PagedGui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.builder.GuiBuilder; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.AbstractPagedGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.PagedGui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; +import xyz.xenondevs.invui.gui.structure.Structure; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/ScrollItemsGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollItemsGuiImpl.java similarity index 88% rename from invui/src/main/java/de/studiocode/invui/gui/impl/ScrollItemsGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollItemsGuiImpl.java index 1d04b85..5276e9a 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/ScrollItemsGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollItemsGuiImpl.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractScrollGui; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.item.Item; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.AbstractScrollGui; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.item.Item; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/ScrollNestedGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollNestedGuiImpl.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/gui/impl/ScrollNestedGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollNestedGuiImpl.java index c530ceb..fa9efeb 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/ScrollNestedGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollNestedGuiImpl.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractScrollGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.AbstractScrollGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.structure.Structure; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/ScrollVIGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollVIGuiImpl.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/gui/impl/ScrollVIGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollVIGuiImpl.java index bc9dbc6..df06cb2 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/ScrollVIGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/ScrollVIGuiImpl.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractScrollGui; -import de.studiocode.invui.gui.ScrollGui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.structure.Structure; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.AbstractScrollGui; +import xyz.xenondevs.invui.gui.ScrollGui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.structure.Structure; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; import java.util.ArrayList; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/gui/impl/TabGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/TabGuiImpl.java similarity index 85% rename from invui/src/main/java/de/studiocode/invui/gui/impl/TabGuiImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/impl/TabGuiImpl.java index 275aca3..e25d22c 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/impl/TabGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/TabGuiImpl.java @@ -1,14 +1,13 @@ -package de.studiocode.invui.gui.impl; +package xyz.xenondevs.invui.gui.impl; -import de.studiocode.invui.gui.AbstractTabGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.SlotElement.LinkedSlotElement; -import de.studiocode.invui.gui.TabGui; -import de.studiocode.invui.gui.builder.GuiBuilder; -import de.studiocode.invui.gui.structure.Structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.AbstractTabGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.TabGui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; +import xyz.xenondevs.invui.gui.structure.Structure; import java.util.ArrayList; import java.util.Collections; @@ -65,7 +64,7 @@ public final class TabGuiImpl extends AbstractTabGui { List elements = new ArrayList<>(); for (int slot = 0; slot < gui.getSize(); slot++) { - SlotElement link = new LinkedSlotElement(gui, slot); + SlotElement link = new SlotElement.LinkedSlotElement(gui, slot); elements.add(link); } diff --git a/invui/src/main/java/de/studiocode/invui/gui/structure/Ingredient.java b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Ingredient.java similarity index 92% rename from invui/src/main/java/de/studiocode/invui/gui/structure/Ingredient.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/structure/Ingredient.java index 60a682b..9c7e2eb 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/structure/Ingredient.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Ingredient.java @@ -1,6 +1,6 @@ -package de.studiocode.invui.gui.structure; +package xyz.xenondevs.invui.gui.structure; -import de.studiocode.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.SlotElement; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/gui/structure/IngredientList.java b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/IngredientList.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/gui/structure/IngredientList.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/structure/IngredientList.java index 297ac84..d105441 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/structure/IngredientList.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/IngredientList.java @@ -1,7 +1,7 @@ -package de.studiocode.invui.gui.structure; +package xyz.xenondevs.invui.gui.structure; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.util.SlotUtils; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.util.SlotUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/invui/src/main/java/de/studiocode/invui/gui/structure/Marker.java b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Marker.java similarity index 84% rename from invui/src/main/java/de/studiocode/invui/gui/structure/Marker.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/structure/Marker.java index 09e5c73..8192365 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/structure/Marker.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Marker.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.gui.structure; +package xyz.xenondevs.invui.gui.structure; public class Marker { diff --git a/invui/src/main/java/de/studiocode/invui/gui/structure/Markers.java b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Markers.java similarity index 76% rename from invui/src/main/java/de/studiocode/invui/gui/structure/Markers.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/structure/Markers.java index 7c5a584..1e6d5b4 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/structure/Markers.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Markers.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.gui.structure; +package xyz.xenondevs.invui.gui.structure; -import de.studiocode.invui.gui.AbstractPagedGui; -import de.studiocode.invui.gui.AbstractScrollGui; -import de.studiocode.invui.gui.AbstractTabGui; +import xyz.xenondevs.invui.gui.AbstractPagedGui; +import xyz.xenondevs.invui.gui.AbstractScrollGui; +import xyz.xenondevs.invui.gui.AbstractTabGui; /** * Registry class for default markers diff --git a/invui/src/main/java/de/studiocode/invui/gui/structure/Structure.java b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Structure.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/gui/structure/Structure.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/structure/Structure.java index 3d32d28..1a42bf0 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/structure/Structure.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/Structure.java @@ -1,17 +1,17 @@ -package de.studiocode.invui.gui.structure; +package xyz.xenondevs.invui.gui.structure; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.gui.SlotElement.ItemSlotElement; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.item.ItemWrapper; -import de.studiocode.invui.item.impl.SimpleItem; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.gui.SlotElement.ItemSlotElement; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.item.ItemWrapper; +import xyz.xenondevs.invui.item.impl.SimpleItem; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; import java.util.HashMap; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/gui/structure/VISlotElementSupplier.java b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/VISlotElementSupplier.java similarity index 80% rename from invui/src/main/java/de/studiocode/invui/gui/structure/VISlotElementSupplier.java rename to invui/src/main/java/xyz/xenondevs/invui/gui/structure/VISlotElementSupplier.java index 9b5dcaf..4e773b2 100644 --- a/invui/src/main/java/de/studiocode/invui/gui/structure/VISlotElementSupplier.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/structure/VISlotElementSupplier.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.gui.structure; +package xyz.xenondevs.invui.gui.structure; -import de.studiocode.invui.gui.SlotElement.VISlotElement; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.SlotElement.VISlotElement; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/item/Click.java b/invui/src/main/java/xyz/xenondevs/invui/item/Click.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/item/Click.java rename to invui/src/main/java/xyz/xenondevs/invui/item/Click.java index ff8ae69..2918d86 100644 --- a/invui/src/main/java/de/studiocode/invui/item/Click.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/Click.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.item; +package xyz.xenondevs.invui.item; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/invui/src/main/java/de/studiocode/invui/item/Item.java b/invui/src/main/java/xyz/xenondevs/invui/item/Item.java similarity index 96% rename from invui/src/main/java/de/studiocode/invui/item/Item.java rename to invui/src/main/java/xyz/xenondevs/invui/item/Item.java index 4748103..17960c5 100644 --- a/invui/src/main/java/de/studiocode/invui/item/Item.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/Item.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.item; +package xyz.xenondevs.invui.item; -import de.studiocode.invui.window.Window; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.window.Window; import java.util.Set; diff --git a/invui/src/main/java/de/studiocode/invui/item/ItemProvider.java b/invui/src/main/java/xyz/xenondevs/invui/item/ItemProvider.java similarity index 92% rename from invui/src/main/java/de/studiocode/invui/item/ItemProvider.java rename to invui/src/main/java/xyz/xenondevs/invui/item/ItemProvider.java index 9c81f0f..5a3d762 100644 --- a/invui/src/main/java/de/studiocode/invui/item/ItemProvider.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/ItemProvider.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.item; +package xyz.xenondevs.invui.item; -import de.studiocode.invui.window.AbstractWindow; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.window.AbstractWindow; import java.util.UUID; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/item/ItemWrapper.java b/invui/src/main/java/xyz/xenondevs/invui/item/ItemWrapper.java similarity index 96% rename from invui/src/main/java/de/studiocode/invui/item/ItemWrapper.java rename to invui/src/main/java/xyz/xenondevs/invui/item/ItemWrapper.java index 48d8bec..6f07154 100644 --- a/invui/src/main/java/de/studiocode/invui/item/ItemWrapper.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/ItemWrapper.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.item; +package xyz.xenondevs.invui.item; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/invui/src/main/java/de/studiocode/invui/item/builder/BaseItemBuilder.java b/invui/src/main/java/xyz/xenondevs/invui/item/builder/BaseItemBuilder.java similarity index 96% rename from invui/src/main/java/de/studiocode/invui/item/builder/BaseItemBuilder.java rename to invui/src/main/java/xyz/xenondevs/invui/item/builder/BaseItemBuilder.java index 85d1974..8c84ec9 100644 --- a/invui/src/main/java/de/studiocode/invui/item/builder/BaseItemBuilder.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/builder/BaseItemBuilder.java @@ -1,12 +1,5 @@ -package de.studiocode.invui.item.builder; +package xyz.xenondevs.invui.item.builder; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.component.BaseComponentWrapper; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.util.ComponentUtils; -import de.studiocode.invui.util.Pair; -import de.studiocode.invui.window.AbstractWindow; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -16,6 +9,13 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.component.BaseComponentWrapper; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.util.ComponentUtils; +import xyz.xenondevs.invui.util.Pair; +import xyz.xenondevs.invui.window.AbstractWindow; import java.util.*; import java.util.function.Function; diff --git a/invui/src/main/java/de/studiocode/invui/item/builder/ItemBuilder.java b/invui/src/main/java/xyz/xenondevs/invui/item/builder/ItemBuilder.java similarity index 96% rename from invui/src/main/java/de/studiocode/invui/item/builder/ItemBuilder.java rename to invui/src/main/java/xyz/xenondevs/invui/item/builder/ItemBuilder.java index b02eda1..a6668a3 100644 --- a/invui/src/main/java/de/studiocode/invui/item/builder/ItemBuilder.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/builder/ItemBuilder.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.item.builder; +package xyz.xenondevs.invui.item.builder; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/invui/src/main/java/de/studiocode/invui/item/builder/PotionBuilder.java b/invui/src/main/java/xyz/xenondevs/invui/item/builder/PotionBuilder.java similarity index 98% rename from invui/src/main/java/de/studiocode/invui/item/builder/PotionBuilder.java rename to invui/src/main/java/xyz/xenondevs/invui/item/builder/PotionBuilder.java index c8d9ede..fc4a4bd 100644 --- a/invui/src/main/java/de/studiocode/invui/item/builder/PotionBuilder.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/builder/PotionBuilder.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.item.builder; +package xyz.xenondevs.invui.item.builder; import org.bukkit.Color; import org.bukkit.Material; diff --git a/invui/src/main/java/de/studiocode/invui/item/builder/SkullBuilder.java b/invui/src/main/java/xyz/xenondevs/invui/item/builder/SkullBuilder.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/item/builder/SkullBuilder.java rename to invui/src/main/java/xyz/xenondevs/invui/item/builder/SkullBuilder.java index bb09041..5fb1eb0 100644 --- a/invui/src/main/java/de/studiocode/invui/item/builder/SkullBuilder.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/builder/SkullBuilder.java @@ -1,13 +1,10 @@ -package de.studiocode.invui.item.builder; +package xyz.xenondevs.invui.item.builder; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.PropertyMap; -import de.studiocode.inventoryaccess.util.ReflectionRegistry; -import de.studiocode.inventoryaccess.util.ReflectionUtils; -import de.studiocode.invui.util.MojangApiUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -15,6 +12,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.util.ReflectionRegistry; +import xyz.xenondevs.inventoryaccess.util.ReflectionUtils; +import xyz.xenondevs.invui.util.MojangApiUtils; import java.io.Serializable; import java.util.UUID; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/AsyncItem.java similarity index 88% rename from invui/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/AsyncItem.java index 0b6d237..6bdd5ac 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/AsyncItem.java @@ -1,9 +1,5 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.item.ItemWrapper; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -12,6 +8,10 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.item.ItemWrapper; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoCycleItem.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoCycleItem.java index 198042e..e869eff 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoCycleItem.java @@ -1,15 +1,15 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.window.Window; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.window.Window; /** * An {@link Item} that automatically cycles through a predefined array of diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoUpdateItem.java similarity index 84% rename from invui/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoUpdateItem.java index 588820d..6de0f50 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/AutoUpdateItem.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.window.Window; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.window.Window; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/BaseItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/BaseItem.java similarity index 85% rename from invui/src/main/java/de/studiocode/invui/item/impl/BaseItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/BaseItem.java index cc5367b..a6b4d0d 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/BaseItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/BaseItem.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.window.AbstractWindow; -import de.studiocode.invui.window.Window; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.window.AbstractWindow; +import xyz.xenondevs.invui.window.Window; import java.util.Collections; import java.util.HashSet; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/CommandItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/CommandItem.java similarity index 85% rename from invui/src/main/java/de/studiocode/invui/item/impl/CommandItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/CommandItem.java index d400784..3112e9b 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/CommandItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/CommandItem.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; /** * An {@link Item} that will force a player to run a command or say something in the chat when clicked. diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/CycleItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/CycleItem.java similarity index 94% rename from invui/src/main/java/de/studiocode/invui/item/impl/CycleItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/CycleItem.java index 358fc66..e3836ab 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/CycleItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/CycleItem.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; import java.util.function.BiConsumer; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/SimpleItem.java similarity index 87% rename from invui/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/SimpleItem.java index be28477..9048799 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/SimpleItem.java @@ -1,13 +1,13 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.item.Click; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.item.Click; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; import java.util.function.Consumer; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/SuppliedItem.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/SuppliedItem.java index 539e61b..3e0947f 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/SuppliedItem.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.item.impl; +package xyz.xenondevs.invui.item.impl; -import de.studiocode.invui.item.Click; -import de.studiocode.invui.item.ItemProvider; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.item.Click; +import xyz.xenondevs.invui.item.ItemProvider; import java.util.function.Function; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ControlItem.java similarity index 75% rename from invui/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ControlItem.java index 96e39e3..dc71069 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ControlItem.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.item.impl.controlitem; +package xyz.xenondevs.invui.item.impl.controlitem; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.item.impl.BaseItem; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.item.impl.BaseItem; /** * A special type of {@link Item} that stores the {@link Gui} in which it is displayed. diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/PageItem.java similarity index 83% rename from invui/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/PageItem.java index 8d1f277..1a34b12 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/PageItem.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.item.impl.controlitem; +package xyz.xenondevs.invui.item.impl.controlitem; -import de.studiocode.invui.gui.AbstractPagedGui; -import de.studiocode.invui.gui.PagedGui; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.AbstractPagedGui; +import xyz.xenondevs.invui.gui.PagedGui; /** * Switches between pages in a {@link AbstractPagedGui} diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ScrollItem.java similarity index 85% rename from invui/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ScrollItem.java index bc4a449..fb927e4 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/ScrollItem.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.item.impl.controlitem; +package xyz.xenondevs.invui.item.impl.controlitem; -import de.studiocode.invui.gui.AbstractScrollGui; -import de.studiocode.invui.gui.ScrollGui; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.AbstractScrollGui; +import xyz.xenondevs.invui.gui.ScrollGui; import java.util.HashMap; diff --git a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/TabItem.java similarity index 81% rename from invui/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java rename to invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/TabItem.java index dbf8b52..674abd1 100644 --- a/invui/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java +++ b/invui/src/main/java/xyz/xenondevs/invui/item/impl/controlitem/TabItem.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.item.impl.controlitem; +package xyz.xenondevs.invui.item.impl.controlitem; -import de.studiocode.invui.gui.AbstractTabGui; -import de.studiocode.invui.gui.TabGui; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.AbstractTabGui; +import xyz.xenondevs.invui.gui.TabGui; /** * Switches between tabs in a {@link AbstractTabGui} diff --git a/invui/src/main/java/de/studiocode/invui/util/ArrayUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/ArrayUtils.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/util/ArrayUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/ArrayUtils.java index e9a8aae..4a1e505 100644 --- a/invui/src/main/java/de/studiocode/invui/util/ArrayUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import org.jetbrains.annotations.NotNull; diff --git a/invui/src/main/java/de/studiocode/invui/util/ColorPalette.java b/invui/src/main/java/xyz/xenondevs/invui/util/ColorPalette.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/util/ColorPalette.java rename to invui/src/main/java/xyz/xenondevs/invui/util/ColorPalette.java index e7ff674..f51ebcb 100644 --- a/invui/src/main/java/de/studiocode/invui/util/ColorPalette.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/ColorPalette.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/invui/src/main/java/de/studiocode/invui/util/ComponentUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/ComponentUtils.java similarity index 96% rename from invui/src/main/java/de/studiocode/invui/util/ComponentUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/ComponentUtils.java index 9c0e761..d31b61a 100644 --- a/invui/src/main/java/de/studiocode/invui/util/ComponentUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/ComponentUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; diff --git a/invui/src/main/java/de/studiocode/invui/util/DataUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/DataUtils.java similarity index 98% rename from invui/src/main/java/de/studiocode/invui/util/DataUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/DataUtils.java index 1a2d247..2828907 100644 --- a/invui/src/main/java/de/studiocode/invui/util/DataUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/DataUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/invui/src/main/java/de/studiocode/invui/util/IOUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/IOUtils.java similarity index 91% rename from invui/src/main/java/de/studiocode/invui/util/IOUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/IOUtils.java index a1ddfee..a879be6 100644 --- a/invui/src/main/java/de/studiocode/invui/util/IOUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/IOUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import java.io.IOException; import java.io.InputStream; diff --git a/invui/src/main/java/de/studiocode/invui/util/InventoryUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/InventoryUtils.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/util/InventoryUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/InventoryUtils.java index 7636f04..ad4d81b 100644 --- a/invui/src/main/java/de/studiocode/invui/util/InventoryUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/InventoryUtils.java @@ -1,7 +1,5 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.virtualinventory.StackSizeProvider; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Item; @@ -12,6 +10,8 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.virtualinventory.StackSizeProvider; public class InventoryUtils { diff --git a/invui/src/main/java/de/studiocode/invui/util/MathUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/MathUtils.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/util/MathUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/MathUtils.java index 3db1722..7f6f0cd 100644 --- a/invui/src/main/java/de/studiocode/invui/util/MathUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/MathUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import java.util.Random; diff --git a/invui/src/main/java/de/studiocode/invui/util/MojangApiUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/MojangApiUtils.java similarity index 98% rename from invui/src/main/java/de/studiocode/invui/util/MojangApiUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/MojangApiUtils.java index d8ec7fb..a0fbfd2 100644 --- a/invui/src/main/java/de/studiocode/invui/util/MojangApiUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/MojangApiUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/invui/src/main/java/de/studiocode/invui/util/Pair.java b/invui/src/main/java/xyz/xenondevs/invui/util/Pair.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/util/Pair.java rename to invui/src/main/java/xyz/xenondevs/invui/util/Pair.java index 7774280..57fbbd9 100644 --- a/invui/src/main/java/de/studiocode/invui/util/Pair.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/Pair.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; public class Pair { diff --git a/invui/src/main/java/de/studiocode/invui/util/Point2D.java b/invui/src/main/java/xyz/xenondevs/invui/util/Point2D.java similarity index 88% rename from invui/src/main/java/de/studiocode/invui/util/Point2D.java rename to invui/src/main/java/xyz/xenondevs/invui/util/Point2D.java index a228c04..8aa889e 100644 --- a/invui/src/main/java/de/studiocode/invui/util/Point2D.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/Point2D.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; public class Point2D { diff --git a/invui/src/main/java/de/studiocode/invui/util/SlotUtils.java b/invui/src/main/java/xyz/xenondevs/invui/util/SlotUtils.java similarity index 99% rename from invui/src/main/java/de/studiocode/invui/util/SlotUtils.java rename to invui/src/main/java/xyz/xenondevs/invui/util/SlotUtils.java index 2d9c7b3..d375ca0 100644 --- a/invui/src/main/java/de/studiocode/invui/util/SlotUtils.java +++ b/invui/src/main/java/xyz/xenondevs/invui/util/SlotUtils.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.util; +package xyz.xenondevs.invui.util; import org.jetbrains.annotations.NotNull; diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/StackSizeProvider.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/StackSizeProvider.java similarity index 74% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/StackSizeProvider.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/StackSizeProvider.java index 878bbc6..502d981 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/StackSizeProvider.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/StackSizeProvider.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.virtualinventory; +package xyz.xenondevs.invui.virtualinventory; import org.bukkit.inventory.ItemStack; diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventory.java similarity index 98% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventory.java index b912260..68863d2 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventory.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventory.java @@ -1,18 +1,18 @@ -package de.studiocode.invui.virtualinventory; +package xyz.xenondevs.invui.virtualinventory; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.util.InventoryUtils; -import de.studiocode.invui.util.ArrayUtils; -import de.studiocode.invui.virtualinventory.event.InventoryUpdatedEvent; -import de.studiocode.invui.virtualinventory.event.ItemUpdateEvent; -import de.studiocode.invui.virtualinventory.event.UpdateReason; -import de.studiocode.invui.window.AbstractWindow; -import de.studiocode.invui.window.Window; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.util.ArrayUtils; +import xyz.xenondevs.invui.util.InventoryUtils; +import xyz.xenondevs.invui.virtualinventory.event.InventoryUpdatedEvent; +import xyz.xenondevs.invui.virtualinventory.event.ItemUpdateEvent; +import xyz.xenondevs.invui.virtualinventory.event.UpdateReason; +import xyz.xenondevs.invui.window.AbstractWindow; +import xyz.xenondevs.invui.window.Window; import java.io.OutputStream; import java.util.*; diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventoryManager.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventoryManager.java index 4048baf..1ea5b3d 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/VirtualInventoryManager.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/VirtualInventoryManager.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.virtualinventory; +package xyz.xenondevs.invui.virtualinventory; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.util.DataUtils; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.util.DataUtils; import java.io.*; import java.util.*; diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/InventoryUpdatedEvent.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/InventoryUpdatedEvent.java similarity index 92% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/event/InventoryUpdatedEvent.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/InventoryUpdatedEvent.java index 0e6fb45..1312e9b 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/InventoryUpdatedEvent.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/InventoryUpdatedEvent.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.virtualinventory.event; +package xyz.xenondevs.invui.virtualinventory.event; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; /** * An event that is called after the {@link VirtualInventory} has been updated. diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/ItemUpdateEvent.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/ItemUpdateEvent.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/event/ItemUpdateEvent.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/ItemUpdateEvent.java index b1e8bd9..04d044e 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/ItemUpdateEvent.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/ItemUpdateEvent.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.virtualinventory.event; +package xyz.xenondevs.invui.virtualinventory.event; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; /** * An event that is called whenever a slot inside a {@link VirtualInventory} gets updated. diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/PlayerUpdateReason.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/PlayerUpdateReason.java similarity index 90% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/event/PlayerUpdateReason.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/PlayerUpdateReason.java index bd496f9..273f71b 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/PlayerUpdateReason.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/PlayerUpdateReason.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.virtualinventory.event; +package xyz.xenondevs.invui.virtualinventory.event; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryEvent; diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/UpdateEvent.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/UpdateEvent.java similarity index 97% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/event/UpdateEvent.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/UpdateEvent.java index 12d6758..1782fb9 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/UpdateEvent.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/UpdateEvent.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.virtualinventory.event; +package xyz.xenondevs.invui.virtualinventory.event; -import de.studiocode.invui.virtualinventory.VirtualInventory; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; abstract class UpdateEvent { diff --git a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/UpdateReason.java b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/UpdateReason.java similarity index 77% rename from invui/src/main/java/de/studiocode/invui/virtualinventory/event/UpdateReason.java rename to invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/UpdateReason.java index a184263..91ef6dc 100644 --- a/invui/src/main/java/de/studiocode/invui/virtualinventory/event/UpdateReason.java +++ b/invui/src/main/java/xyz/xenondevs/invui/virtualinventory/event/UpdateReason.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.virtualinventory.event; +package xyz.xenondevs.invui.virtualinventory.event; public interface UpdateReason { diff --git a/invui/src/main/java/de/studiocode/invui/window/AbstractDoubleWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractDoubleWindow.java similarity index 93% rename from invui/src/main/java/de/studiocode/invui/window/AbstractDoubleWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/AbstractDoubleWindow.java index 4da57b9..573a1d6 100644 --- a/invui/src/main/java/de/studiocode/invui/window/AbstractDoubleWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractDoubleWindow.java @@ -1,16 +1,16 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.util.Pair; -import de.studiocode.invui.util.SlotUtils; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.util.Pair; +import xyz.xenondevs.invui.util.SlotUtils; import java.util.Arrays; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/window/AbstractMergedWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java similarity index 84% rename from invui/src/main/java/de/studiocode/invui/window/AbstractMergedWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java index 34cc935..bea780a 100644 --- a/invui/src/main/java/de/studiocode/invui/window/AbstractMergedWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractMergedWindow.java @@ -1,14 +1,14 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.util.Pair; -import de.studiocode.invui.util.SlotUtils; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.util.Pair; +import xyz.xenondevs.invui.util.SlotUtils; /** * A {@link Window} where top and player {@link Inventory} are affected by the same {@link Gui}. diff --git a/invui/src/main/java/de/studiocode/invui/window/AbstractSingleWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java similarity index 90% rename from invui/src/main/java/de/studiocode/invui/window/AbstractSingleWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java index 6dbf28d..e2ef67e 100644 --- a/invui/src/main/java/de/studiocode/invui/window/AbstractSingleWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractSingleWindow.java @@ -1,16 +1,16 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.util.InventoryUtils; -import de.studiocode.invui.util.Pair; import org.bukkit.entity.Player; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.util.InventoryUtils; +import xyz.xenondevs.invui.util.Pair; import java.util.UUID; diff --git a/invui/src/main/java/de/studiocode/invui/window/AbstractSplitWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java similarity index 87% rename from invui/src/main/java/de/studiocode/invui/window/AbstractSplitWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java index bac7300..4cc4a73 100644 --- a/invui/src/main/java/de/studiocode/invui/window/AbstractSplitWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractSplitWindow.java @@ -1,14 +1,14 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.SlotElement; -import de.studiocode.invui.util.Pair; -import de.studiocode.invui.util.SlotUtils; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.util.Pair; +import xyz.xenondevs.invui.util.SlotUtils; /** * A {@link Window} where top and player {@link Inventory} are affected by different {@link Gui}s. diff --git a/invui/src/main/java/de/studiocode/invui/window/AbstractWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java similarity index 81% rename from invui/src/main/java/de/studiocode/invui/window/AbstractWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java index fa39679..b1961e8 100644 --- a/invui/src/main/java/de/studiocode/invui/window/AbstractWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java @@ -1,23 +1,5 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.component.BaseComponentWrapper; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.InvUI; -import de.studiocode.invui.gui.AbstractGui; -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.LinkedSlotElement; -import de.studiocode.invui.gui.SlotElement.VISlotElement; -import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.ItemProvider; -import de.studiocode.invui.util.Pair; -import de.studiocode.invui.util.ArrayUtils; -import de.studiocode.invui.virtualinventory.VirtualInventory; -import de.studiocode.invui.virtualinventory.event.PlayerUpdateReason; -import de.studiocode.invui.virtualinventory.event.UpdateReason; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; @@ -35,6 +17,21 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.component.BaseComponentWrapper; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.InvUI; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.GuiParent; +import xyz.xenondevs.invui.gui.SlotElement; +import xyz.xenondevs.invui.item.Item; +import xyz.xenondevs.invui.item.ItemProvider; +import xyz.xenondevs.invui.util.ArrayUtils; +import xyz.xenondevs.invui.util.Pair; +import xyz.xenondevs.invui.virtualinventory.VirtualInventory; +import xyz.xenondevs.invui.virtualinventory.event.PlayerUpdateReason; +import xyz.xenondevs.invui.virtualinventory.event.UpdateReason; import java.util.*; @@ -69,13 +66,13 @@ public abstract class AbstractWindow implements Window, GuiParent { protected void redrawItem(int index, SlotElement element, boolean setItem) { // put ItemStack in inventory ItemStack itemStack; - if (element == null || (element instanceof VISlotElement && element.getItemStack(viewerUUID) == null)) { + if (element == null || (element instanceof SlotElement.VISlotElement && element.getItemStack(viewerUUID) == null)) { ItemProvider background = getGuiAt(index).getFirst().getBackground(); itemStack = background == null ? null : background.getFor(viewerUUID); - } else if (element instanceof LinkedSlotElement && element.getHoldingElement() == null) { + } else if (element instanceof SlotElement.LinkedSlotElement && element.getHoldingElement() == null) { ItemProvider background = null; - List guis = ((LinkedSlotElement) element).getGuiList(); + List guis = ((SlotElement.LinkedSlotElement) element).getGuiList(); guis.add(0, getGuiAt(index).getFirst()); for (int i = guis.size() - 1; i >= 0; i--) { @@ -102,16 +99,16 @@ public abstract class AbstractWindow implements Window, GuiParent { if (setItem) { // tell the previous item (if there is one) that this is no longer its window SlotElement previousElement = elementsDisplayed[index]; - if (previousElement instanceof ItemSlotElement) { - ItemSlotElement itemSlotElement = (ItemSlotElement) previousElement; + if (previousElement instanceof SlotElement.ItemSlotElement) { + SlotElement.ItemSlotElement itemSlotElement = (SlotElement.ItemSlotElement) previousElement; Item item = itemSlotElement.getItem(); // check if the Item isn't still present on another index if (getItemSlotElements(item).size() == 1) { // only if not, remove Window from list in Item item.removeWindow(this); } - } else if (previousElement instanceof VISlotElement) { - VISlotElement viSlotElement = (VISlotElement) previousElement; + } else if (previousElement instanceof SlotElement.VISlotElement) { + SlotElement.VISlotElement viSlotElement = (SlotElement.VISlotElement) previousElement; VirtualInventory virtualInventory = viSlotElement.getVirtualInventory(); // check if the VirtualInventory isn't still present on another index if (getVISlotElements(viSlotElement.getVirtualInventory()).size() == 1) { @@ -123,10 +120,10 @@ public abstract class AbstractWindow implements Window, GuiParent { if (element != null) { // tell the Item or VirtualInventory that it is being displayed in this Window SlotElement holdingElement = element.getHoldingElement(); - if (holdingElement instanceof ItemSlotElement) { - ((ItemSlotElement) holdingElement).getItem().addWindow(this); - } else if (holdingElement instanceof VISlotElement) { - ((VISlotElement) holdingElement).getVirtualInventory().addWindow(this); + if (holdingElement instanceof SlotElement.ItemSlotElement) { + ((SlotElement.ItemSlotElement) holdingElement).getItem().addWindow(this); + } else if (holdingElement instanceof SlotElement.VISlotElement) { + ((SlotElement.VISlotElement) holdingElement).getVirtualInventory().addWindow(this); } elementsDisplayed[index] = holdingElement; @@ -201,13 +198,13 @@ public abstract class AbstractWindow implements Window, GuiParent { } protected Map getItemSlotElements(Item item) { - return ArrayUtils.findAllOccurrences(elementsDisplayed, element -> element instanceof ItemSlotElement - && ((ItemSlotElement) element).getItem() == item); + return ArrayUtils.findAllOccurrences(elementsDisplayed, element -> element instanceof SlotElement.ItemSlotElement + && ((SlotElement.ItemSlotElement) element).getItem() == item); } protected Map getVISlotElements(VirtualInventory virtualInventory) { - return ArrayUtils.findAllOccurrences(elementsDisplayed, element -> element instanceof VISlotElement - && ((VISlotElement) element).getVirtualInventory() == virtualInventory); + return ArrayUtils.findAllOccurrences(elementsDisplayed, element -> element instanceof SlotElement.VISlotElement + && ((SlotElement.VISlotElement) element).getVirtualInventory() == virtualInventory); } public void remove() { @@ -225,10 +222,10 @@ public abstract class AbstractWindow implements Window, GuiParent { .filter(Objects::nonNull) .map(SlotElement::getHoldingElement) .forEach(slotElement -> { - if (slotElement instanceof ItemSlotElement) { - ((ItemSlotElement) slotElement).getItem().removeWindow(this); - } else if (slotElement instanceof VISlotElement) { - ((VISlotElement) slotElement).getVirtualInventory().removeWindow(this); + if (slotElement instanceof SlotElement.ItemSlotElement) { + ((SlotElement.ItemSlotElement) slotElement).getItem().removeWindow(this); + } else if (slotElement instanceof SlotElement.VISlotElement) { + ((SlotElement.VISlotElement) slotElement).getVirtualInventory().removeWindow(this); } }); diff --git a/invui/src/main/java/de/studiocode/invui/window/AnvilWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/AnvilWindow.java similarity index 70% rename from invui/src/main/java/de/studiocode/invui/window/AnvilWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/AnvilWindow.java index 20bf2ba..2273a4d 100644 --- a/invui/src/main/java/de/studiocode/invui/window/AnvilWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/AnvilWindow.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; public interface AnvilWindow extends Window { diff --git a/invui/src/main/java/de/studiocode/invui/window/CartographyWindow.java b/invui/src/main/java/xyz/xenondevs/invui/window/CartographyWindow.java similarity index 76% rename from invui/src/main/java/de/studiocode/invui/window/CartographyWindow.java rename to invui/src/main/java/xyz/xenondevs/invui/window/CartographyWindow.java index 385a88f..377108d 100644 --- a/invui/src/main/java/de/studiocode/invui/window/CartographyWindow.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/CartographyWindow.java @@ -1,8 +1,8 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/window/Window.java b/invui/src/main/java/xyz/xenondevs/invui/window/Window.java similarity index 95% rename from invui/src/main/java/de/studiocode/invui/window/Window.java rename to invui/src/main/java/xyz/xenondevs/invui/window/Window.java index 18e7947..b260f14 100644 --- a/invui/src/main/java/de/studiocode/invui/window/Window.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/Window.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.window.type.WindowType; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.window.type.WindowType; import java.util.UUID; diff --git a/invui/src/main/java/de/studiocode/invui/window/WindowManager.java b/invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java similarity index 98% rename from invui/src/main/java/de/studiocode/invui/window/WindowManager.java rename to invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java index 2753ae2..8e073a9 100644 --- a/invui/src/main/java/de/studiocode/invui/window/WindowManager.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java @@ -1,6 +1,5 @@ -package de.studiocode.invui.window; +package xyz.xenondevs.invui.window; -import de.studiocode.invui.InvUI; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -16,6 +15,7 @@ import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.Inventory; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.InvUI; import java.util.*; diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/AnvilSingleWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/AnvilSingleWindowImpl.java similarity index 77% rename from invui/src/main/java/de/studiocode/invui/window/impl/AnvilSingleWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/AnvilSingleWindowImpl.java index 8c43381..47fb168 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/AnvilSingleWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/AnvilSingleWindowImpl.java @@ -1,13 +1,13 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.window.AbstractSingleWindow; -import de.studiocode.invui.window.AnvilWindow; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.window.AbstractSingleWindow; +import xyz.xenondevs.invui.window.AnvilWindow; import java.util.function.Consumer; diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/AnvilSplitWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/AnvilSplitWindowImpl.java similarity index 78% rename from invui/src/main/java/de/studiocode/invui/window/impl/AnvilSplitWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/AnvilSplitWindowImpl.java index 74d910e..18cc7d1 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/AnvilSplitWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/AnvilSplitWindowImpl.java @@ -1,13 +1,13 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.abstraction.inventory.AnvilInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.window.AbstractSplitWindow; -import de.studiocode.invui.window.AnvilWindow; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.AnvilInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.window.AbstractSplitWindow; +import xyz.xenondevs.invui.window.AnvilWindow; import java.util.function.Consumer; diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/CartographySingleWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/CartographySingleWindowImpl.java similarity index 82% rename from invui/src/main/java/de/studiocode/invui/window/impl/CartographySingleWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/CartographySingleWindowImpl.java index 50ef76d..5d52549 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/CartographySingleWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/CartographySingleWindowImpl.java @@ -1,20 +1,20 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.util.MathUtils; -import de.studiocode.invui.window.AbstractSingleWindow; -import de.studiocode.invui.window.CartographyWindow; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.MapMeta; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.util.MathUtils; +import xyz.xenondevs.invui.window.AbstractSingleWindow; +import xyz.xenondevs.invui.window.CartographyWindow; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/CartographySplitWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/CartographySplitWindowImpl.java similarity index 78% rename from invui/src/main/java/de/studiocode/invui/window/impl/CartographySplitWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/CartographySplitWindowImpl.java index 3164339..b4c47cd 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/CartographySplitWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/CartographySplitWindowImpl.java @@ -1,21 +1,21 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.InventoryAccess; -import de.studiocode.inventoryaccess.abstraction.inventory.CartographyInventory; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.inventoryaccess.map.MapIcon; -import de.studiocode.inventoryaccess.map.MapPatch; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.impl.NormalGuiImpl; -import de.studiocode.invui.util.MathUtils; -import de.studiocode.invui.window.AbstractSplitWindow; -import de.studiocode.invui.window.CartographyWindow; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.MapMeta; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.InventoryAccess; +import xyz.xenondevs.inventoryaccess.abstraction.inventory.CartographyInventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.inventoryaccess.map.MapIcon; +import xyz.xenondevs.inventoryaccess.map.MapPatch; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.impl.NormalGuiImpl; +import xyz.xenondevs.invui.util.MathUtils; +import xyz.xenondevs.invui.window.AbstractSplitWindow; +import xyz.xenondevs.invui.window.CartographyWindow; import java.util.List; diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/NormalMergedWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalMergedWindowImpl.java similarity index 76% rename from invui/src/main/java/de/studiocode/invui/window/impl/NormalMergedWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalMergedWindowImpl.java index 8551d46..0e0f50d 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/NormalMergedWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalMergedWindowImpl.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.window.AbstractMergedWindow; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.window.AbstractMergedWindow; public final class NormalMergedWindowImpl extends AbstractMergedWindow { diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/NormalSingleWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalSingleWindowImpl.java similarity index 60% rename from invui/src/main/java/de/studiocode/invui/window/impl/NormalSingleWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalSingleWindowImpl.java index d085967..653e42b 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/NormalSingleWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalSingleWindowImpl.java @@ -1,9 +1,9 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.util.InventoryUtils; -import de.studiocode.invui.window.AbstractSingleWindow; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.util.InventoryUtils; +import xyz.xenondevs.invui.window.AbstractSingleWindow; import java.util.UUID; diff --git a/invui/src/main/java/de/studiocode/invui/window/impl/NormalSplitWindowImpl.java b/invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalSplitWindowImpl.java similarity index 62% rename from invui/src/main/java/de/studiocode/invui/window/impl/NormalSplitWindowImpl.java rename to invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalSplitWindowImpl.java index b0986e4..9021231 100644 --- a/invui/src/main/java/de/studiocode/invui/window/impl/NormalSplitWindowImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/impl/NormalSplitWindowImpl.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.impl; +package xyz.xenondevs.invui.window.impl; -import de.studiocode.inventoryaccess.component.ComponentWrapper; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.util.InventoryUtils; -import de.studiocode.invui.window.AbstractSplitWindow; import org.bukkit.entity.Player; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.util.InventoryUtils; +import xyz.xenondevs.invui.window.AbstractSplitWindow; public final class NormalSplitWindowImpl extends AbstractSplitWindow { diff --git a/invui/src/main/java/de/studiocode/invui/window/type/WindowType.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/WindowType.java similarity index 94% rename from invui/src/main/java/de/studiocode/invui/window/type/WindowType.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/WindowType.java index 56d56a3..f7f29fc 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/WindowType.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/WindowType.java @@ -1,12 +1,12 @@ -package de.studiocode.invui.window.type; +package xyz.xenondevs.invui.window.type; -import de.studiocode.invui.gui.AbstractGui; -import de.studiocode.invui.window.AnvilWindow; -import de.studiocode.invui.window.CartographyWindow; -import de.studiocode.invui.window.Window; -import de.studiocode.invui.window.impl.*; -import de.studiocode.invui.window.type.context.*; import org.jetbrains.annotations.NotNull; +import xyz.xenondevs.invui.gui.AbstractGui; +import xyz.xenondevs.invui.window.AnvilWindow; +import xyz.xenondevs.invui.window.CartographyWindow; +import xyz.xenondevs.invui.window.Window; +import xyz.xenondevs.invui.window.impl.*; +import xyz.xenondevs.invui.window.type.context.*; import java.util.function.Consumer; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/AbstractWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java similarity index 88% rename from invui/src/main/java/de/studiocode/invui/window/type/context/AbstractWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java index 139fb48..043da4f 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/AbstractWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java @@ -1,11 +1,11 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.inventoryaccess.component.BaseComponentWrapper; -import de.studiocode.inventoryaccess.component.ComponentWrapper; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.TextComponent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.inventoryaccess.component.BaseComponentWrapper; +import xyz.xenondevs.inventoryaccess.component.ComponentWrapper; public abstract class AbstractWindowContext implements WindowContext { diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/AnvilSingleWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AnvilSingleWindowContext.java similarity index 88% rename from invui/src/main/java/de/studiocode/invui/window/type/context/AnvilSingleWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/AnvilSingleWindowContext.java index 1fdc268..c220dbf 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/AnvilSingleWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AnvilSingleWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/AnvilSplitWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AnvilSplitWindowContext.java similarity index 91% rename from invui/src/main/java/de/studiocode/invui/window/type/context/AnvilSplitWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/AnvilSplitWindowContext.java index bb32346..7755b58 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/AnvilSplitWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AnvilSplitWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/CartographySingleWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/CartographySingleWindowContext.java similarity index 83% rename from invui/src/main/java/de/studiocode/invui/window/type/context/CartographySingleWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/CartographySingleWindowContext.java index 21abf8f..b162863 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/CartographySingleWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/CartographySingleWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/CartographySplitWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/CartographySplitWindowContext.java similarity index 90% rename from invui/src/main/java/de/studiocode/invui/window/type/context/CartographySplitWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/CartographySplitWindowContext.java index 72a7733..4af2ee3 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/CartographySplitWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/CartographySplitWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/NormalCombinedWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalCombinedWindowContext.java similarity index 83% rename from invui/src/main/java/de/studiocode/invui/window/type/context/NormalCombinedWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalCombinedWindowContext.java index c92d49d..909fa96 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/NormalCombinedWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalCombinedWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/NormalSingleWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalSingleWindowContext.java similarity index 85% rename from invui/src/main/java/de/studiocode/invui/window/type/context/NormalSingleWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalSingleWindowContext.java index db00b45..431ab9e 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/NormalSingleWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalSingleWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.UUID; import java.util.function.Supplier; diff --git a/invui/src/main/java/de/studiocode/invui/window/type/context/NormalSplitWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalSplitWindowContext.java similarity index 89% rename from invui/src/main/java/de/studiocode/invui/window/type/context/NormalSplitWindowContext.java rename to invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalSplitWindowContext.java index 5ee9bf0..3b4006a 100644 --- a/invui/src/main/java/de/studiocode/invui/window/type/context/NormalSplitWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/NormalSplitWindowContext.java @@ -1,10 +1,10 @@ -package de.studiocode.invui.window.type.context; +package xyz.xenondevs.invui.window.type.context; -import de.studiocode.invui.gui.Gui; -import de.studiocode.invui.gui.builder.GuiBuilder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xyz.xenondevs.invui.gui.Gui; +import xyz.xenondevs.invui.gui.builder.GuiBuilder; import java.util.function.Supplier; diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/type/context/WindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/WindowContext.java new file mode 100644 index 0000000..0448f28 --- /dev/null +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/WindowContext.java @@ -0,0 +1,4 @@ +package xyz.xenondevs.invui.window.type.context; + +public interface WindowContext { +} diff --git a/pom.xml b/pom.xml index b7e192c..3609565 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - de.studiocode.invui - InvUI-Parent + xyz.xenondevs.invui + invui-parent 1.0-SNAPSHOT pom