From 25c20d302fba9a33ef507224ea822e23c4951c55 Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Sun, 8 Aug 2021 19:58:42 +0200 Subject: [PATCH] Refactoring --- .../main/java/de/studiocode/invui/gui/GUI.java | 4 ++-- .../de/studiocode/invui/gui/SlotElement.java | 2 +- .../invui/gui/builder/GUIBuilder.java | 4 ++-- .../de/studiocode/invui/gui/impl/BaseGUI.java | 4 ++-- .../invui/gui/structure/Structure.java | 8 ++++---- .../java/de/studiocode/invui/item/Item.java | 4 ++-- .../studiocode/invui/item/impl/AsyncItem.java | 18 +++++++++--------- .../invui/item/impl/AutoCycleItem.java | 12 ++++++------ .../studiocode/invui/item/impl/BaseItem.java | 2 +- .../invui/item/impl/CommandItem.java | 4 ++-- .../studiocode/invui/item/impl/CycleItem.java | 2 +- .../studiocode/invui/item/impl/SimpleItem.java | 14 +++++++------- .../invui/item/impl/SuppliedItem.java | 2 +- .../item/impl/controlitem/ControlItem.java | 6 +++--- .../de/studiocode/invui/window/Window.java | 2 +- .../invui/window/impl/BaseWindow.java | 2 +- 16 files changed, 45 insertions(+), 45 deletions(-) diff --git a/InvUI/src/main/java/de/studiocode/invui/gui/GUI.java b/InvUI/src/main/java/de/studiocode/invui/gui/GUI.java index ca11b6b..314ad47 100644 --- a/InvUI/src/main/java/de/studiocode/invui/gui/GUI.java +++ b/InvUI/src/main/java/de/studiocode/invui/gui/GUI.java @@ -170,9 +170,9 @@ public interface GUI extends GUIParent { * Sets the {@link ItemProvider} that will be used if nothing else * is placed on a slot. * - * @param itemBuilder The {@link ItemProvider} + * @param itemProvider The {@link ItemProvider} */ - void setBackground(@Nullable ItemProvider itemBuilder); + void setBackground(@Nullable ItemProvider itemProvider); /** * Gets the {@link ItemProvider} that will used if nothing else diff --git a/InvUI/src/main/java/de/studiocode/invui/gui/SlotElement.java b/InvUI/src/main/java/de/studiocode/invui/gui/SlotElement.java index db8ef7f..29c6515 100644 --- a/InvUI/src/main/java/de/studiocode/invui/gui/SlotElement.java +++ b/InvUI/src/main/java/de/studiocode/invui/gui/SlotElement.java @@ -30,7 +30,7 @@ public interface SlotElement { @Override public ItemStack getItemStack(UUID viewerUUID) { - return item.getItemBuilder().getFor(viewerUUID); + return item.getItemProvider().getFor(viewerUUID); } @Override diff --git a/InvUI/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java b/InvUI/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java index 810c90e..308cfcf 100644 --- a/InvUI/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java +++ b/InvUI/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java @@ -48,8 +48,8 @@ public class GUIBuilder { return this; } - public GUIBuilder addIngredient(char key, @NotNull ItemProvider itemBuilder) { - structure.addIngredient(key, itemBuilder); + public GUIBuilder addIngredient(char key, @NotNull ItemProvider itemProvider) { + structure.addIngredient(key, itemProvider); return this; } diff --git a/InvUI/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java b/InvUI/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java index 714f0b6..4c02697 100644 --- a/InvUI/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java +++ b/InvUI/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java @@ -547,8 +547,8 @@ public abstract class BaseGUI implements GUI, Controllable { } @Override - public void setBackground(ItemProvider itemBuilder) { - this.background = itemBuilder; + public void setBackground(ItemProvider itemProvider) { + this.background = itemProvider; } @Override diff --git a/InvUI/src/main/java/de/studiocode/invui/gui/structure/Structure.java b/InvUI/src/main/java/de/studiocode/invui/gui/structure/Structure.java index 74183ed..bd05bc1 100644 --- a/InvUI/src/main/java/de/studiocode/invui/gui/structure/Structure.java +++ b/InvUI/src/main/java/de/studiocode/invui/gui/structure/Structure.java @@ -30,8 +30,8 @@ public class Structure { .replace("\n", ""); } - public static void addGlobalIngredient(char key, @NotNull ItemProvider itemBuilder) { - addGlobalIngredient(key, new SimpleItem(itemBuilder)); + public static void addGlobalIngredient(char key, @NotNull ItemProvider itemProvider) { + addGlobalIngredient(key, new SimpleItem(itemProvider)); } public static void addGlobalIngredient(char key, @NotNull Item item) { @@ -54,8 +54,8 @@ public class Structure { globalIngredientMap.put(key, new Ingredient(elementSupplier)); } - public Structure addIngredient(char key, @NotNull ItemProvider itemBuilder) { - return addIngredient(key, new SimpleItem(itemBuilder)); + public Structure addIngredient(char key, @NotNull ItemProvider itemProvider) { + return addIngredient(key, new SimpleItem(itemProvider)); } public Structure addIngredient(char key, @NotNull Item item) { diff --git a/InvUI/src/main/java/de/studiocode/invui/item/Item.java b/InvUI/src/main/java/de/studiocode/invui/item/Item.java index 523a98d..3b2d562 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/Item.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/Item.java @@ -17,7 +17,7 @@ public interface Item { * * @return The {@link ItemProvider} */ - ItemProvider getItemBuilder(); + ItemProvider getItemProvider(); /** * Adds a {@link Window} to the window set, telling the {@link Item} that it is @@ -45,7 +45,7 @@ public interface Item { Set getWindows(); /** - * Calls the {@link Window#handleItemBuilderUpdate(Item)} method on every {@link Window} + * Calls the {@link Window#handleItemProviderUpdate(Item)} method on every {@link Window} * in the set, notifying them that the {@link ItemProvider} has been updated * and the {@link ItemStack} inside the {@link Window}'s {@link Inventory} should * be replaced. diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java index 6bbf718..ea14170 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java @@ -1,9 +1,9 @@ package de.studiocode.invui.item.impl; import de.studiocode.invui.InvUI; -import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.Item; import de.studiocode.invui.item.ItemBuilder; +import de.studiocode.invui.item.ItemProvider; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -20,24 +20,24 @@ import java.util.function.Supplier; */ public class AsyncItem extends BaseItem { - private volatile ItemProvider itemBuilder; + private volatile ItemProvider itemProvider; - public AsyncItem(@Nullable ItemProvider itemBuilder, @NotNull Supplier builderSupplier) { - this.itemBuilder = itemBuilder == null ? new ItemBuilder(Material.AIR) : itemBuilder; + public AsyncItem(@Nullable ItemProvider itemProvider, @NotNull Supplier providerSupplier) { + this.itemProvider = itemProvider == null ? new ItemBuilder(Material.AIR) : itemProvider; Bukkit.getScheduler().runTaskAsynchronously(InvUI.getInstance().getPlugin(), () -> { - this.itemBuilder = builderSupplier.get(); + this.itemProvider = providerSupplier.get(); Bukkit.getScheduler().runTask(InvUI.getInstance().getPlugin(), this::notifyWindows); }); } - public AsyncItem(@NotNull Supplier builderSupplier) { - this(null, builderSupplier); + public AsyncItem(@NotNull Supplier providerSupplier) { + this(null, providerSupplier); } @Override - public ItemProvider getItemBuilder() { - return itemBuilder; + public ItemProvider getItemProvider() { + return itemProvider; } @Override diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java index fa3abfb..6cdd73a 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java @@ -16,14 +16,14 @@ import org.bukkit.scheduler.BukkitTask; */ public class AutoCycleItem extends BaseItem { - private final ItemProvider[] itemBuilders; + private final ItemProvider[] itemProviders; private final int period; private BukkitTask task; private int state; - public AutoCycleItem(int period, ItemProvider... itemBuilders) { - this.itemBuilders = itemBuilders; + public AutoCycleItem(int period, ItemProvider... itemProviders) { + this.itemProviders = itemProviders; this.period = period; } @@ -39,13 +39,13 @@ public class AutoCycleItem extends BaseItem { private void cycle() { state++; - if (state == itemBuilders.length) state = 0; + if (state == itemProviders.length) state = 0; notifyWindows(); } @Override - public ItemProvider getItemBuilder() { - return itemBuilders[state]; + public ItemProvider getItemProvider() { + return itemProviders[state]; } @Override diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/BaseItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/BaseItem.java index 833b350..9f4c8a0 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/BaseItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/BaseItem.java @@ -31,7 +31,7 @@ public abstract class BaseItem implements Item { @Override public void notifyWindows() { - windows.forEach(w -> w.handleItemBuilderUpdate(this)); + windows.forEach(w -> w.handleItemProviderUpdate(this)); } } diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/CommandItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/CommandItem.java index 6a269db..c62251b 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/CommandItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/CommandItem.java @@ -14,8 +14,8 @@ public class CommandItem extends SimpleItem { private final String command; - public CommandItem(@NotNull ItemProvider itemBuilder, @NotNull String command) { - super(itemBuilder); + public CommandItem(@NotNull ItemProvider itemProvider, @NotNull String command) { + super(itemProvider); this.command = command; } diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/CycleItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/CycleItem.java index 36fa699..e719cbe 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/CycleItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/CycleItem.java @@ -26,7 +26,7 @@ public class CycleItem extends BaseItem { } @Override - public ItemProvider getItemBuilder() { + public ItemProvider getItemProvider() { return states[state]; } diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java index 43d786a..f782f4b 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java @@ -16,21 +16,21 @@ import java.util.function.Consumer; */ public class SimpleItem extends BaseItem { - private final ItemProvider itemBuilder; + private final ItemProvider itemProvider; private final Consumer clickHandler; - public SimpleItem(@NotNull ItemProvider itemBuilder) { - this.itemBuilder = itemBuilder; + public SimpleItem(@NotNull ItemProvider itemProvider) { + this.itemProvider = itemProvider; this.clickHandler = null; } - public SimpleItem(@NotNull ItemProvider itemBuilder, @Nullable Consumer clickHandler) { - this.itemBuilder = itemBuilder; + public SimpleItem(@NotNull ItemProvider itemProvider, @Nullable Consumer clickHandler) { + this.itemProvider = itemProvider; this.clickHandler = clickHandler; } - public ItemProvider getItemBuilder() { - return itemBuilder; + public ItemProvider getItemProvider() { + return itemProvider; } @Override diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java index cd4589c..972712a 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java @@ -22,7 +22,7 @@ public class SuppliedItem extends BaseItem { } @Override - public ItemProvider getItemBuilder() { + public ItemProvider getItemProvider() { return builderSupplier.get(); } diff --git a/InvUI/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java b/InvUI/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java index b025df9..52efa61 100644 --- a/InvUI/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java +++ b/InvUI/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java @@ -14,11 +14,11 @@ public abstract class ControlItem extends BaseItem { private G gui; - public abstract ItemProvider getItemBuilder(G gui); + public abstract ItemProvider getItemProvider(G gui); @Override - public final ItemProvider getItemBuilder() { - return getItemBuilder(gui); + public final ItemProvider getItemProvider() { + return getItemProvider(gui); } public G getGui() { diff --git a/InvUI/src/main/java/de/studiocode/invui/window/Window.java b/InvUI/src/main/java/de/studiocode/invui/window/Window.java index e0717e4..fce5a89 100644 --- a/InvUI/src/main/java/de/studiocode/invui/window/Window.java +++ b/InvUI/src/main/java/de/studiocode/invui/window/Window.java @@ -112,7 +112,7 @@ public interface Window extends GUIParent { * * @param item The {@link Item} whose {@link ItemProvider} has been updated. */ - void handleItemBuilderUpdate(Item item); + void handleItemProviderUpdate(Item item); /** * A method called by the {@link VirtualInventory} to notify the diff --git a/InvUI/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java b/InvUI/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java index f7dfcb7..c9f577b 100644 --- a/InvUI/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java +++ b/InvUI/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java @@ -149,7 +149,7 @@ public abstract class BaseWindow implements Window { } @Override - public void handleItemBuilderUpdate(Item item) { + public void handleItemProviderUpdate(Item item) { getItemSlotElements(item).forEach((index, slotElement) -> redrawItem(index, slotElement, false)); }