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

Use generic Gui / Window type for modifier in Gui / Window Builder

Browse Source
This commit is contained in:
NichtStudioCode 2023-04-16 18:37:07 +02:00
parent 13b9fa7dc4
commit e660c26454
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
invui-core/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java
View File

@ -710,7 +710,7 @@ public abstract class AbstractGui implements Gui, GuiParent {
protected Structure structure; protected Structure structure;
protected ItemProvider background; protected ItemProvider background;
protected List<Consumer<Gui>> modifiers; protected List<Consumer<G>> modifiers;
protected boolean frozen; protected boolean frozen;
@Override @Override
@ -804,7 +804,7 @@ public abstract class AbstractGui implements Gui, GuiParent {
} }
@Override @Override
public @NotNull S addModifier(@NotNull Consumer<@NotNull Gui> modifier) { public @NotNull S addModifier(@NotNull Consumer<@NotNull G> modifier) {
if (modifiers == null) if (modifiers == null)
modifiers = new ArrayList<>(); modifiers = new ArrayList<>();
@ -813,7 +813,7 @@ public abstract class AbstractGui implements Gui, GuiParent {
} }
@Override @Override
public @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull Gui>> modifiers) { public @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull G>> modifiers) {
this.modifiers = modifiers; this.modifiers = modifiers;
return (S) this; return (S) this;
} }

4
invui-core/src/main/java/xyz/xenondevs/invui/gui/Gui.java
View File

@ -554,7 +554,7 @@ public interface Gui {
* @return This {@link Builder Gui Builder} * @return This {@link Builder Gui Builder}
*/ */
@Contract("_ -> this") @Contract("_ -> this")
@NotNull S addModifier(@NotNull Consumer<@NotNull Gui> modifier); @NotNull S addModifier(@NotNull Consumer<@NotNull G> modifier);
/** /**
* Sets the background of the {@link Gui}. * Sets the background of the {@link Gui}.
@ -563,7 +563,7 @@ public interface Gui {
* @return This {@link Builder Gui Builder} * @return This {@link Builder Gui Builder}
*/ */
@Contract("_ -> this") @Contract("_ -> this")
@NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull Gui>> modifiers); @NotNull S setModifiers(@NotNull List<@NotNull Consumer<@NotNull G>> modifiers);
/** /**
* Builds the {@link Gui}. * Builds the {@link Gui}.

6
invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
View File

@ -453,7 +453,7 @@ public abstract class AbstractWindow implements Window, GuiParent {
protected List<Runnable> openHandlers; protected List<Runnable> openHandlers;
protected List<Runnable> closeHandlers; protected List<Runnable> closeHandlers;
protected List<Consumer<InventoryClickEvent>> outsideClickHandlers; protected List<Consumer<InventoryClickEvent>> outsideClickHandlers;
protected List<Consumer<Window>> modifiers; protected List<Consumer<W>> modifiers;
@Override @Override
public @NotNull S setViewer(@NotNull Player viewer) { public @NotNull S setViewer(@NotNull Player viewer) {
@ -531,13 +531,13 @@ public abstract class AbstractWindow implements Window, GuiParent {
} }
@Override @Override
public @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull Window>> modifiers) { public @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull W>> modifiers) {
this.modifiers = modifiers; this.modifiers = modifiers;
return (S) this; return (S) this;
} }
@Override @Override
public @NotNull S addModifier(@NotNull Consumer<@NotNull Window> modifier) { public @NotNull S addModifier(@NotNull Consumer<@NotNull W> modifier) {
if (modifiers == null) if (modifiers == null)
modifiers = new ArrayList<>(); modifiers = new ArrayList<>();

4
invui-core/src/main/java/xyz/xenondevs/invui/window/Window.java
View File

@ -343,7 +343,7 @@ public interface Window {
* @return This {@link Builder Window Builder} * @return This {@link Builder Window Builder}
*/ */
@Contract("_ -> this") @Contract("_ -> this")
@NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull Window>> modifiers); @NotNull S setModifiers(@Nullable List<@NotNull Consumer<@NotNull W>> modifiers);
/** /**
* Adds a modifier to the {@link Window}. * Adds a modifier to the {@link Window}.
@ -352,7 +352,7 @@ public interface Window {
* @return This {@link Builder Window Builder} * @return This {@link Builder Window Builder}
*/ */
@Contract("_ -> this") @Contract("_ -> this")
@NotNull S addModifier(@NotNull Consumer<@NotNull Window> modifier); @NotNull S addModifier(@NotNull Consumer<@NotNull W> modifier);
/** /**
* Builds the {@link Window}. * Builds the {@link Window}.