Netherite-Public/InvUI
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
NichtStudioCode 2021-08-08 19:58:42 +02:00
parent f0ea48506f
commit 25c20d302f
16 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvUI/src/main/java/de/studiocode/invui/gui/GUI.java
View File

@ -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

2
InvUI/src/main/java/de/studiocode/invui/gui/SlotElement.java
View File

@ -30,7 +30,7 @@ public interface SlotElement {
@Override
public ItemStack getItemStack(UUID viewerUUID) {
return item.getItemBuilder().getFor(viewerUUID);
return item.getItemProvider().getFor(viewerUUID);
}
@Override

4
InvUI/src/main/java/de/studiocode/invui/gui/builder/GUIBuilder.java
View File

@ -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;
}

4
InvUI/src/main/java/de/studiocode/invui/gui/impl/BaseGUI.java
View File

@ -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

8
InvUI/src/main/java/de/studiocode/invui/gui/structure/Structure.java
View File

@ -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) {

4
InvUI/src/main/java/de/studiocode/invui/item/Item.java
View File

@ -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<Window> 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.

18
InvUI/src/main/java/de/studiocode/invui/item/impl/AsyncItem.java
View File

@ -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<? extends ItemProvider> builderSupplier) {
this.itemBuilder = itemBuilder == null ? new ItemBuilder(Material.AIR) : itemBuilder;
public AsyncItem(@Nullable ItemProvider itemProvider, @NotNull Supplier<? extends ItemProvider> 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<? extends ItemProvider> builderSupplier) {
this(null, builderSupplier);
public AsyncItem(@NotNull Supplier<? extends ItemProvider> providerSupplier) {
this(null, providerSupplier);
}
@Override
public ItemProvider getItemBuilder() {
return itemBuilder;
public ItemProvider getItemProvider() {
return itemProvider;
}
@Override

12
InvUI/src/main/java/de/studiocode/invui/item/impl/AutoCycleItem.java
View File

@ -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

2
InvUI/src/main/java/de/studiocode/invui/item/impl/BaseItem.java
View File

@ -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));
}
}

4
InvUI/src/main/java/de/studiocode/invui/item/impl/CommandItem.java
View File

@ -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;
}

2
InvUI/src/main/java/de/studiocode/invui/item/impl/CycleItem.java
View File

@ -26,7 +26,7 @@ public class CycleItem extends BaseItem {
}
@Override
public ItemProvider getItemBuilder() {
public ItemProvider getItemProvider() {
return states[state];
}

14
InvUI/src/main/java/de/studiocode/invui/item/impl/SimpleItem.java
View File

@ -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<Click> 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<Click> clickHandler) {
this.itemBuilder = itemBuilder;
public SimpleItem(@NotNull ItemProvider itemProvider, @Nullable Consumer<Click> clickHandler) {
this.itemProvider = itemProvider;
this.clickHandler = clickHandler;
}
public ItemProvider getItemBuilder() {
return itemBuilder;
public ItemProvider getItemProvider() {
return itemProvider;
}
@Override

2
InvUI/src/main/java/de/studiocode/invui/item/impl/SuppliedItem.java
View File

@ -22,7 +22,7 @@ public class SuppliedItem extends BaseItem {
}
@Override
public ItemProvider getItemBuilder() {
public ItemProvider getItemProvider() {
return builderSupplier.get();
}

6
InvUI/src/main/java/de/studiocode/invui/item/impl/controlitem/ControlItem.java
View File

@ -14,11 +14,11 @@ public abstract class ControlItem<G extends GUI> 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() {

2
InvUI/src/main/java/de/studiocode/invui/window/Window.java
View File

@ -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

2
InvUI/src/main/java/de/studiocode/invui/window/impl/BaseWindow.java
View File

@ -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));
}