From 76b947e2a0d2d55a660d2e74cc88fc3dca929cd7 Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Sat, 13 Feb 2021 18:39:16 +0100 Subject: [PATCH] Moved ItemBuilder --- .../de/studiocode/invui/gui/builder/GUIBuilder.java | 2 +- .../studiocode/invui/gui/structure/Structure.java | 2 +- src/main/java/de/studiocode/invui/item/Item.java | 1 - .../invui/item/{itembuilder => }/ItemBuilder.java | 13 +++++-------- .../studiocode/invui/item/impl/AutoCycleItem.java | 2 +- .../studiocode/invui/item/impl/AutoUpdateItem.java | 2 +- .../de/studiocode/invui/item/impl/CommandItem.java | 2 +- .../de/studiocode/invui/item/impl/CycleItem.java | 2 +- .../de/studiocode/invui/item/impl/SimpleItem.java | 2 +- .../de/studiocode/invui/item/impl/SupplierItem.java | 2 +- .../invui/item/impl/controlitem/ControlItem.java | 2 +- .../invui/item/impl/controlitem/PageItem.java | 2 +- .../invui/item/impl/controlitem/ScrollItem.java | 2 +- .../invui/item/impl/controlitem/TabItem.java | 2 +- .../java/de/studiocode/invui/resourcepack/Icon.java | 2 +- .../java/de/studiocode/invui/window/Window.java | 2 +- 16 files changed, 19 insertions(+), 23 deletions(-) rename src/main/java/de/studiocode/invui/item/{itembuilder => }/ItemBuilder.java (95%) diff --git a/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java b/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java index ca66b13..5c30d99 100644 --- a/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java +++ b/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java @@ -6,7 +6,7 @@ import de.studiocode.invui.gui.impl.*; 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.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.inventory.ShapedRecipe; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/studiocode/invui/gui/structure/Structure.java b/src/main/java/de/studiocode/invui/gui/structure/Structure.java index c49009b..15575dd 100644 --- a/src/main/java/de/studiocode/invui/gui/structure/Structure.java +++ b/src/main/java/de/studiocode/invui/gui/structure/Structure.java @@ -5,7 +5,7 @@ import de.studiocode.invui.gui.SlotElement; import de.studiocode.invui.gui.SlotElement.ItemSlotElement; import de.studiocode.invui.item.Item; import de.studiocode.invui.item.impl.SimpleItem; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.inventory.ShapedRecipe; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/studiocode/invui/item/Item.java b/src/main/java/de/studiocode/invui/item/Item.java index 2c987b1..8175d89 100644 --- a/src/main/java/de/studiocode/invui/item/Item.java +++ b/src/main/java/de/studiocode/invui/item/Item.java @@ -1,6 +1,5 @@ package de.studiocode.invui.item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; import de.studiocode.invui.window.Window; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/de/studiocode/invui/item/itembuilder/ItemBuilder.java b/src/main/java/de/studiocode/invui/item/ItemBuilder.java similarity index 95% rename from src/main/java/de/studiocode/invui/item/itembuilder/ItemBuilder.java rename to src/main/java/de/studiocode/invui/item/ItemBuilder.java index 1dde756..052d655 100644 --- a/src/main/java/de/studiocode/invui/item/itembuilder/ItemBuilder.java +++ b/src/main/java/de/studiocode/invui/item/ItemBuilder.java @@ -1,4 +1,4 @@ -package de.studiocode.invui.item.itembuilder; +package de.studiocode.invui.item; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -12,6 +12,7 @@ import de.studiocode.invui.util.reflection.ReflectionUtils; import de.studiocode.invui.window.impl.BaseWindow; import org.bukkit.Bukkit; import org.bukkit.Material; +import org.bukkit.OfflinePlayer; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemFlag; @@ -213,12 +214,12 @@ public class ItemBuilder implements Cloneable { private final String textureValue; - private HeadTexture(@NotNull String textureValue) { + public HeadTexture(@NotNull String textureValue) { this.textureValue = textureValue; } - public static HeadTexture of(@NotNull Player player) { - return of(player.getUniqueId()); + public static HeadTexture of(@NotNull OfflinePlayer offlinePlayer) { + return of(offlinePlayer.getUniqueId()); } @SuppressWarnings("deprecation") @@ -246,10 +247,6 @@ public class ItemBuilder implements Cloneable { } } - public static HeadTexture fromTextureValue(@NotNull String textureValue) { - return new HeadTexture(textureValue); - } - public static void invalidateCache() { uuidCache.invalidateAll(); textureCache.invalidateAll(); diff --git a/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java b/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java index eb08e62..5029dc2 100644 --- a/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java @@ -2,7 +2,7 @@ package de.studiocode.invui.item.impl; import de.studiocode.invui.InvUI; import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java b/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java index 8f46630..2bf33f0 100644 --- a/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/AutoUpdateItem.java @@ -2,7 +2,7 @@ package de.studiocode.invui.item.impl; import de.studiocode.invui.InvUI; import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/de/studiocode/invui/item/impl/CommandItem.java b/src/main/java/de/studiocode/invui/item/impl/CommandItem.java index 95ea157..7143aec 100644 --- a/src/main/java/de/studiocode/invui/item/impl/CommandItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/CommandItem.java @@ -1,7 +1,7 @@ package de.studiocode.invui.item.impl; import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/item/impl/CycleItem.java b/src/main/java/de/studiocode/invui/item/impl/CycleItem.java index a7f2273..51e7ed1 100644 --- a/src/main/java/de/studiocode/invui/item/impl/CycleItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/CycleItem.java @@ -1,7 +1,7 @@ package de.studiocode.invui.item.impl; import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java b/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java index cedd46c..c5f9318 100644 --- a/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java @@ -2,7 +2,7 @@ package de.studiocode.invui.item.impl; import de.studiocode.invui.item.Click; import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/item/impl/SupplierItem.java b/src/main/java/de/studiocode/invui/item/impl/SupplierItem.java index e907544..603651d 100644 --- a/src/main/java/de/studiocode/invui/item/impl/SupplierItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/SupplierItem.java @@ -1,6 +1,6 @@ package de.studiocode.invui.item.impl; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java b/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java index ea15c37..0566a88 100644 --- a/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java @@ -2,7 +2,7 @@ package de.studiocode.invui.item.impl.controlitem; import de.studiocode.invui.gui.GUI; import de.studiocode.invui.item.impl.BaseItem; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import java.util.function.Function; diff --git a/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java b/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java index a97beb6..7770ef9 100644 --- a/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/controlitem/PageItem.java @@ -1,7 +1,7 @@ package de.studiocode.invui.item.impl.controlitem; import de.studiocode.invui.gui.impl.PagedGUI; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java b/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java index de5cb9e..93a132f 100644 --- a/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/controlitem/ScrollItem.java @@ -1,7 +1,7 @@ package de.studiocode.invui.item.impl.controlitem; import de.studiocode.invui.gui.impl.ScrollGUI; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java b/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java index 07ade04..2e7e6e5 100644 --- a/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java +++ b/src/main/java/de/studiocode/invui/item/impl/controlitem/TabItem.java @@ -1,7 +1,7 @@ package de.studiocode.invui.item.impl.controlitem; import de.studiocode.invui.gui.impl.TabGUI; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/src/main/java/de/studiocode/invui/resourcepack/Icon.java b/src/main/java/de/studiocode/invui/resourcepack/Icon.java index 68768dd..7699703 100644 --- a/src/main/java/de/studiocode/invui/resourcepack/Icon.java +++ b/src/main/java/de/studiocode/invui/resourcepack/Icon.java @@ -2,7 +2,7 @@ package de.studiocode.invui.resourcepack; import de.studiocode.invui.item.Item; import de.studiocode.invui.item.impl.SimpleItem; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import org.bukkit.Material; import java.util.HashMap; diff --git a/src/main/java/de/studiocode/invui/window/Window.java b/src/main/java/de/studiocode/invui/window/Window.java index dff192c..0417bf3 100644 --- a/src/main/java/de/studiocode/invui/window/Window.java +++ b/src/main/java/de/studiocode/invui/window/Window.java @@ -3,7 +3,7 @@ package de.studiocode.invui.window; import de.studiocode.invui.gui.GUI; import de.studiocode.invui.gui.GUIParent; import de.studiocode.invui.item.Item; -import de.studiocode.invui.item.itembuilder.ItemBuilder; +import de.studiocode.invui.item.ItemBuilder; import de.studiocode.invui.virtualinventory.VirtualInventory; import de.studiocode.invui.window.impl.merged.MergedWindow; import de.studiocode.invui.window.impl.merged.combined.SimpleCombinedWindow;