From b6c09de2bc2c4e61d7214db76d589261b0244409 Mon Sep 17 00:00:00 2001 From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com> Date: Sat, 28 Jan 2023 16:09:05 +0100 Subject: [PATCH] Reformat code --- inventoryaccess/inventory-access-r10/pom.xml | 2 +- .../inventoryaccess/r10/PlayerUtilsImpl.java | 4 ++-- inventoryaccess/inventory-access-r11/pom.xml | 2 +- .../inventoryaccess/r11/PlayerUtilsImpl.java | 4 ++-- inventoryaccess/inventory-access-r12/pom.xml | 2 +- .../inventoryaccess/r12/PlayerUtilsImpl.java | 4 ++-- .../inventoryaccess/r8/PlayerUtilsImpl.java | 4 ++-- inventoryaccess/inventory-access-r9/pom.xml | 2 +- .../inventoryaccess/r9/PlayerUtilsImpl.java | 4 ++-- inventoryaccess/inventory-access/pom.xml | 2 +- .../component/BaseComponentWrapper.java | 2 +- .../src/main/kotlin/xyz/xenondevs/invui/Guis.kt | 14 +++++++------- .../src/main/kotlin/xyz/xenondevs/invui/Windows.kt | 6 +----- .../java/xyz/xenondevs/invui/gui/AbstractGui.java | 5 +++-- .../xyz/xenondevs/invui/gui/AbstractPagedGui.java | 4 ++-- .../xyz/xenondevs/invui/gui/AbstractTabGui.java | 2 +- .../src/main/java/xyz/xenondevs/invui/gui/Gui.java | 4 ++-- .../invui/gui/impl/PagedNestedGuiImpl.java | 8 ++++---- .../xyz/xenondevs/invui/window/WindowManager.java | 2 +- .../window/type/context/AbstractWindowContext.java | 2 +- 20 files changed, 38 insertions(+), 41 deletions(-) diff --git a/inventoryaccess/inventory-access-r10/pom.xml b/inventoryaccess/inventory-access-r10/pom.xml index 108c343..d996f4d 100644 --- a/inventoryaccess/inventory-access-r10/pom.xml +++ b/inventoryaccess/inventory-access-r10/pom.xml @@ -76,7 +76,7 @@ - + org.apache.maven.plugins maven-jar-plugin diff --git a/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java index b3b0e06..d67cf20 100644 --- a/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java @@ -29,8 +29,8 @@ class PlayerUtilsImpl implements PlayerUtils { private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( PlayerAdvancements.class, - true, - "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", ServerAdvancementManager.class ); diff --git a/inventoryaccess/inventory-access-r11/pom.xml b/inventoryaccess/inventory-access-r11/pom.xml index b1b8339..81d7a8a 100644 --- a/inventoryaccess/inventory-access-r11/pom.xml +++ b/inventoryaccess/inventory-access-r11/pom.xml @@ -76,7 +76,7 @@ - + org.apache.maven.plugins maven-jar-plugin diff --git a/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java index b6c0956..442962e 100644 --- a/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java @@ -29,8 +29,8 @@ class PlayerUtilsImpl implements PlayerUtils { private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( PlayerAdvancements.class, - true, - "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", ServerAdvancementManager.class ); diff --git a/inventoryaccess/inventory-access-r12/pom.xml b/inventoryaccess/inventory-access-r12/pom.xml index e4d040f..a9587be 100644 --- a/inventoryaccess/inventory-access-r12/pom.xml +++ b/inventoryaccess/inventory-access-r12/pom.xml @@ -76,7 +76,7 @@ - + org.apache.maven.plugins maven-jar-plugin diff --git a/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java index 74a6eec..da56713 100644 --- a/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java @@ -29,8 +29,8 @@ class PlayerUtilsImpl implements PlayerUtils { private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( PlayerAdvancements.class, - true, - "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", ServerAdvancementManager.class ); diff --git a/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java index ac27b37..1edace9 100644 --- a/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java @@ -29,8 +29,8 @@ class PlayerUtilsImpl implements PlayerUtils { private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( PlayerAdvancements.class, - true, - "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", ServerAdvancementManager.class ); diff --git a/inventoryaccess/inventory-access-r9/pom.xml b/inventoryaccess/inventory-access-r9/pom.xml index 62847d0..b8e12c9 100644 --- a/inventoryaccess/inventory-access-r9/pom.xml +++ b/inventoryaccess/inventory-access-r9/pom.xml @@ -76,7 +76,7 @@ - + org.apache.maven.plugins maven-jar-plugin diff --git a/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java index b98e893..0d22c27 100644 --- a/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java +++ b/inventoryaccess/inventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/PlayerUtilsImpl.java @@ -29,8 +29,8 @@ class PlayerUtilsImpl implements PlayerUtils { private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( PlayerAdvancements.class, - true, - "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", ServerAdvancementManager.class ); diff --git a/inventoryaccess/inventory-access/pom.xml b/inventoryaccess/inventory-access/pom.xml index 1855887..7b7be44 100644 --- a/inventoryaccess/inventory-access/pom.xml +++ b/inventoryaccess/inventory-access/pom.xml @@ -23,7 +23,7 @@ https://repo.papermc.io/repository/maven-public/ - + org.spigotmc diff --git a/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java index d930562..f9c01f9 100644 --- a/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java +++ b/inventoryaccess/inventory-access/src/main/java/xyz/xenondevs/inventoryaccess/component/BaseComponentWrapper.java @@ -15,5 +15,5 @@ public class BaseComponentWrapper implements ComponentWrapper { public String serializeToJson() { return ComponentSerializer.toString(components); } - + } diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt index bd82bfe..896ec42 100644 --- a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Guis.kt @@ -6,7 +6,7 @@ import xyz.xenondevs.invui.item.Item /** * Gets the [SlotElement] placed on that slot. - * + * * @param slot The slot index * @return The [SlotElement] placed on that slot or null if there is none */ @@ -14,7 +14,7 @@ operator fun Gui.get(slot: Int): SlotElement? = getSlotElement(slot) /** * Gets the [SlotElement] placed on these coordinates. - * + * * @param x The x coordinate of the slot * @param y The y coordinate of the slot * @return The [SlotElement] placed on that slot or null if there is none @@ -31,7 +31,7 @@ operator fun Gui.set(slot: Int, element: SlotElement?) = setSlotElement(slot, el /** * Sets the [SlotElement] on these coordinates. - * + * * @param x The x coordinate of the slot * @param y The y coordinate of the slot * @param element The [SlotElement] to set or null to remove the current one @@ -40,7 +40,7 @@ operator fun Gui.set(x: Int, y: Int, element: SlotElement?) = setSlotElement(x, /** * Sets the [Item] on that slot. - * + * * @param slot The slot index * @param item The [Item] to set or null to remove the current one */ @@ -48,7 +48,7 @@ operator fun Gui.set(slot: Int, item: Item?) = setItem(slot, item) /** * Sets the [Item] on these coordinates. - * + * * @param x The x coordinate of the slot * @param y The y coordinate of the slot * @param item The [Item] to set or null to remove the current one @@ -57,7 +57,7 @@ operator fun Gui.set(x: Int, y: Int, item: Item?) = setItem(x, y, item) /** * Adds the given [elements]. - * + * * @param elements The [SlotElements][SlotElement] to add. */ @JvmName("plusAssignSlotElements") @@ -65,7 +65,7 @@ operator fun Gui.plusAssign(elements: Iterable) = elements.forEach /** * Adds the given [items]. - * + * * @param items The [Items][Item] to add. */ @JvmName("plusAssignItems") diff --git a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt index 3321c24..e5ca1e1 100644 --- a/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt +++ b/invui-kotlin/src/main/kotlin/xyz/xenondevs/invui/Windows.kt @@ -5,12 +5,8 @@ package xyz.xenondevs.invui.window.type import xyz.xenondevs.invui.window.Window import xyz.xenondevs.invui.window.type.context.WindowContext -fun WindowType.create(contextConsumer: C.() -> Unit): W { +fun WindowType.create(contextConsumer: C.() -> Unit): W { val ctx = createContext() ctx.contextConsumer() return createWindow(ctx) -} - -fun main() { - WindowType.NORMAL.create { } } \ No newline at end of file diff --git a/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java index 42d8b33..4a0ffc5 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractGui.java @@ -506,7 +506,7 @@ public abstract class AbstractGui implements Gui, GuiParent { @Override @Nullable - public SlotElement @NotNull[] getSlotElements() { + public SlotElement @NotNull [] getSlotElements() { return slotElements.clone(); } @@ -533,7 +533,8 @@ public abstract class AbstractGui implements Gui, GuiParent { return ((SlotElement.ItemSlotElement) slotElement).getItem(); } else if (slotElement instanceof SlotElement.LinkedSlotElement) { SlotElement holdingElement = slotElement.getHoldingElement(); - if (holdingElement instanceof SlotElement.ItemSlotElement) return ((SlotElement.ItemSlotElement) holdingElement).getItem(); + if (holdingElement instanceof SlotElement.ItemSlotElement) + return ((SlotElement.ItemSlotElement) holdingElement).getItem(); } return null; diff --git a/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java index 8131ca4..aa37417 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractPagedGui.java @@ -55,10 +55,10 @@ public abstract class AbstractPagedGui extends AbstractGui implements PagedGu currentPage = page; update(); if (previous != currentPage) { - pageChangeHandlers.forEach(handler -> handler.accept(previous, page)); + pageChangeHandlers.forEach(handler -> handler.accept(previous, page)); } } - + @Override public boolean hasNextPage() { return currentPage < getPageAmount() - 1 || infinitePages; diff --git a/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java index 51c5091..9d998e1 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/AbstractTabGui.java @@ -37,7 +37,7 @@ public abstract class AbstractTabGui extends AbstractGui implements TabGui { int previous = currentTab; currentTab = tab; update(); - + if (tabChangeHandlers != null) { tabChangeHandlers.forEach(handler -> handler.accept(previous, tab)); } diff --git a/invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java b/invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java index 126bc4b..fe5a201 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/Gui.java @@ -243,8 +243,8 @@ public interface Gui { /** * Closes the open {@link Inventory} for all viewers of {@link Window Windows} - * where this {@link Gui} is displayed. - *

+ * where this {@link Gui} is displayed. + *

* If the {@link Window Windows} are not marked as "retain", * they will be removed from the {@link WindowManager} automatically. */ diff --git a/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java index 811b232..8776a11 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java +++ b/invui/src/main/java/xyz/xenondevs/invui/gui/impl/PagedNestedGuiImpl.java @@ -27,10 +27,10 @@ public final class PagedNestedGuiImpl extends AbstractPagedGui { /** * Creates a new {@link PagedNestedGuiImpl}. - * - * @param width The width of this Gui. - * @param height The height of this Gui. - * @param guis The {@link Gui Guis} to use as pages. + * + * @param width The width of this Gui. + * @param height The height of this Gui. + * @param guis The {@link Gui Guis} to use as pages. * @param contentListSlots The slots where content should be displayed. * @deprecated Use {@link PagedGui#ofGuis(int, int, List, int...)} instead. */ diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java b/invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java index 8e073a9..e7dfc6e 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java @@ -52,7 +52,7 @@ public class WindowManager implements Listener { public void addWindow(Window window) { if (!(window instanceof AbstractWindow)) throw new IllegalArgumentException("Illegal window implementation"); - + AbstractWindow abstractWindow = (AbstractWindow) window; windows.put(abstractWindow.getInventories()[0], abstractWindow); } diff --git a/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java index 043da4f..e888bf2 100644 --- a/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java +++ b/invui/src/main/java/xyz/xenondevs/invui/window/type/context/AbstractWindowContext.java @@ -39,7 +39,7 @@ public abstract class AbstractWindowContext implements WindowContext { this.title = title; } - public void setTitle(@NotNull BaseComponent @NotNull[] title) { + public void setTitle(@NotNull BaseComponent @NotNull [] title) { this.title = new BaseComponentWrapper(title); }