From 355d7f4132a322249bf1b42be08b591efa9f8f67 Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Tue, 8 Sep 2026 06:20:22 -0400 Subject: [PATCH] Delete dead util duplicates - Delete unused board BoardSettings and ScoreDirection wrappers around the VolmLib board types - Delete unused inventorygui UIStaticDecorator, Window and WindowResolution wrappers around the VolmLib inventorygui types - Delete unused VectorMath subclass of the VolmLib VectorMath - Delete unused InterpolationType enum and the IrisInterpolation blerp overload that keyed on it - Delete HunkFace and point Hunk.viewFace and Hunk.cropFace at the VolmLib HunkFace - Drop the iris board and inventorygui excludes from supersededVolmLibPackages and the VectorMath entry from unusedVolmLibClasses - Drop the deleted inventorygui files from the Bukkit purity allowlist --- core/build.gradle | 3 - core/purity-allowlist.txt | 3 - .../iris/util/common/board/BoardSettings.java | 51 ----------- .../util/common/board/ScoreDirection.java | 16 ---- .../inventorygui/UIStaticDecorator.java | 40 --------- .../iris/util/common/inventorygui/Window.java | 84 ------------------- .../common/inventorygui/WindowResolution.java | 43 ---------- .../iris/util/common/math/VectorMath.java | 78 ----------------- .../arcane/iris/util/project/hunk/Hunk.java | 1 + .../iris/util/project/hunk/HunkFace.java | 42 ---------- .../interpolation/InterpolationType.java | 27 ------ .../interpolation/IrisInterpolation.java | 20 ----- 12 files changed, 1 insertion(+), 407 deletions(-) delete mode 100644 core/src/main/java/art/arcane/iris/util/common/board/BoardSettings.java delete mode 100644 core/src/main/java/art/arcane/iris/util/common/board/ScoreDirection.java delete mode 100644 core/src/main/java/art/arcane/iris/util/common/inventorygui/UIStaticDecorator.java delete mode 100644 core/src/main/java/art/arcane/iris/util/common/inventorygui/Window.java delete mode 100644 core/src/main/java/art/arcane/iris/util/common/inventorygui/WindowResolution.java delete mode 100644 core/src/main/java/art/arcane/iris/util/common/math/VectorMath.java delete mode 100644 core/src/main/java/art/arcane/iris/util/project/hunk/HunkFace.java delete mode 100644 core/src/main/java/art/arcane/iris/util/project/interpolation/InterpolationType.java diff --git a/core/build.gradle b/core/build.gradle index 326c988fc..d46b89bbc 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -269,8 +269,6 @@ List supersededVolmLibPackages = [ 'art/arcane/volmlib/util/reflect/**', 'art/arcane/volmlib/util/documentation/**', 'art/arcane/iris/core/report/**', - 'art/arcane/iris/util/common/inventorygui/**', - 'art/arcane/iris/util/common/board/**', 'art/arcane/volmlib/integration/VaultEconomy*.class' ] @@ -398,7 +396,6 @@ List unusedVolmLibClasses = [ 'art/arcane/iris/engine/object/IPostBlockAccess', 'art/arcane/iris/engine/object/IrisPotionEffect', 'art/arcane/iris/engine/platform/DummyChunkGenerator', - 'art/arcane/iris/util/common/math/VectorMath', 'art/arcane/iris/util/common/parallel/GridLock', 'art/arcane/iris/util/common/reflect/W', 'art/arcane/iris/util/slimjar/BuildConstants', diff --git a/core/purity-allowlist.txt b/core/purity-allowlist.txt index 026c9fdc3..bb2dc80e8 100644 --- a/core/purity-allowlist.txt +++ b/core/purity-allowlist.txt @@ -188,9 +188,6 @@ art/arcane/iris/util/common/director/handlers/VectorHandler.java art/arcane/iris/util/common/director/handlers/WorldHandler.java art/arcane/iris/util/common/director/specialhandlers/NullablePlayerHandler.java art/arcane/iris/util/common/format/C.java -art/arcane/iris/util/common/inventorygui/UIStaticDecorator.java -art/arcane/iris/util/common/inventorygui/Window.java -art/arcane/iris/util/common/inventorygui/WindowResolution.java art/arcane/iris/util/common/math/AxisAlignedBB.java art/arcane/iris/util/common/math/Direction.java art/arcane/iris/util/common/math/VectorMath.java diff --git a/core/src/main/java/art/arcane/iris/util/common/board/BoardSettings.java b/core/src/main/java/art/arcane/iris/util/common/board/BoardSettings.java deleted file mode 100644 index 07d27d748..000000000 --- a/core/src/main/java/art/arcane/iris/util/common/board/BoardSettings.java +++ /dev/null @@ -1,51 +0,0 @@ -package art.arcane.iris.util.common.board; - -import art.arcane.volmlib.util.board.BoardProvider; - -public class BoardSettings { - private final BoardProvider boardProvider; - private final ScoreDirection scoreDirection; - - private BoardSettings(BoardProvider boardProvider, ScoreDirection scoreDirection) { - this.boardProvider = boardProvider; - this.scoreDirection = scoreDirection; - } - - public BoardProvider getBoardProvider() { - return boardProvider; - } - - public ScoreDirection getScoreDirection() { - return scoreDirection; - } - - public art.arcane.volmlib.util.board.BoardSettings toShared() { - return art.arcane.volmlib.util.board.BoardSettings.builder() - .boardProvider(boardProvider) - .scoreDirection(scoreDirection.toShared()) - .build(); - } - - public static Builder builder() { - return new Builder(); - } - - public static class Builder { - private BoardProvider boardProvider; - private ScoreDirection scoreDirection; - - public Builder boardProvider(BoardProvider boardProvider) { - this.boardProvider = boardProvider; - return this; - } - - public Builder scoreDirection(ScoreDirection scoreDirection) { - this.scoreDirection = scoreDirection; - return this; - } - - public BoardSettings build() { - return new BoardSettings(boardProvider, scoreDirection); - } - } -} diff --git a/core/src/main/java/art/arcane/iris/util/common/board/ScoreDirection.java b/core/src/main/java/art/arcane/iris/util/common/board/ScoreDirection.java deleted file mode 100644 index 20119cde6..000000000 --- a/core/src/main/java/art/arcane/iris/util/common/board/ScoreDirection.java +++ /dev/null @@ -1,16 +0,0 @@ -package art.arcane.iris.util.common.board; - -public enum ScoreDirection { - UP, - DOWN; - - public art.arcane.volmlib.util.board.ScoreDirection toShared() { - return this == UP - ? art.arcane.volmlib.util.board.ScoreDirection.UP - : art.arcane.volmlib.util.board.ScoreDirection.DOWN; - } - - public static ScoreDirection fromShared(art.arcane.volmlib.util.board.ScoreDirection direction) { - return direction == art.arcane.volmlib.util.board.ScoreDirection.UP ? UP : DOWN; - } -} diff --git a/core/src/main/java/art/arcane/iris/util/common/inventorygui/UIStaticDecorator.java b/core/src/main/java/art/arcane/iris/util/common/inventorygui/UIStaticDecorator.java deleted file mode 100644 index 4bf5da6b0..000000000 --- a/core/src/main/java/art/arcane/iris/util/common/inventorygui/UIStaticDecorator.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2022 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package art.arcane.iris.util.common.inventorygui; - -import art.arcane.volmlib.util.inventorygui.WindowDecorator; - -import art.arcane.volmlib.util.inventorygui.Element; - -import art.arcane.volmlib.util.data.MaterialBlock; -import org.bukkit.Material; - -@SuppressWarnings("ClassCanBeRecord") -public class UIStaticDecorator implements WindowDecorator { - private final Element element; - - public UIStaticDecorator(Element element) { - this.element = element == null ? new art.arcane.volmlib.util.inventorygui.UIElement("bg").setMaterial(new MaterialBlock(Material.AIR)) : element; - } - - @Override - public Element onDecorateBackground(art.arcane.volmlib.util.inventorygui.Window window, int position, int row) { - return element; - } -} diff --git a/core/src/main/java/art/arcane/iris/util/common/inventorygui/Window.java b/core/src/main/java/art/arcane/iris/util/common/inventorygui/Window.java deleted file mode 100644 index fa88b247d..000000000 --- a/core/src/main/java/art/arcane/iris/util/common/inventorygui/Window.java +++ /dev/null @@ -1,84 +0,0 @@ -package art.arcane.iris.util.common.inventorygui; - -import art.arcane.volmlib.util.inventorygui.WindowDecorator; - -import art.arcane.volmlib.util.inventorygui.Element; - -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -public interface Window { - WindowDecorator getDecorator(); - - Window setDecorator(WindowDecorator decorator); - - art.arcane.volmlib.util.inventorygui.WindowResolution getResolution(); - - Window setResolution(art.arcane.volmlib.util.inventorygui.WindowResolution resolution); - - default Window setResolution(WindowResolution resolution) { - return setResolution(resolution.toShared()); - } - - default WindowResolution getLocalResolution() { - return WindowResolution.fromShared(getResolution()); - } - - Window clearElements(); - - Window close(); - - Window open(); - - Window callClosed(); - - Window updateInventory(); - - ItemStack computeItemStack(int viewportSlot); - - int getLayoutRow(int viewportSlottedPosition); - - int getLayoutPosition(int viewportSlottedPosition); - - int getRealLayoutPosition(int viewportSlottedPosition); - - int getRealPosition(int position, int row); - - int getRow(int realPosition); - - int getPosition(int realPosition); - - boolean isVisible(); - - Window setVisible(boolean visible); - - int getViewportPosition(); - - Window setViewportPosition(int position); - - int getViewportSlots(); - - int getMaxViewportPosition(); - - Window scroll(int direction); - - int getViewportHeight(); - - Window setViewportHeight(int height); - - String getTitle(); - - Window setTitle(String title); - - boolean hasElement(int position, int row); - - Window setElement(int position, int row, Element e); - - Element getElement(int position, int row); - - Player getViewer(); - - Window reopen(); - - Window onClosed(art.arcane.volmlib.util.scheduling.Callback window); -} diff --git a/core/src/main/java/art/arcane/iris/util/common/inventorygui/WindowResolution.java b/core/src/main/java/art/arcane/iris/util/common/inventorygui/WindowResolution.java deleted file mode 100644 index 5ddf3595e..000000000 --- a/core/src/main/java/art/arcane/iris/util/common/inventorygui/WindowResolution.java +++ /dev/null @@ -1,43 +0,0 @@ -package art.arcane.iris.util.common.inventorygui; - -import org.bukkit.event.inventory.InventoryType; - -public enum WindowResolution { - W9_H6(9, 6, InventoryType.CHEST), - W5_H1(5, 1, InventoryType.HOPPER), - W3_H3(3, 3, InventoryType.DROPPER); - - private final int width; - private final int maxHeight; - private final InventoryType type; - - WindowResolution(int w, int h, InventoryType type) { - this.width = w; - this.maxHeight = h; - this.type = type; - } - - public int getMaxWidthOffset() { - return (getWidth() - 1) / 2; - } - - public int getWidth() { - return width; - } - - public int getMaxHeight() { - return maxHeight; - } - - public InventoryType getType() { - return type; - } - - public art.arcane.volmlib.util.inventorygui.WindowResolution toShared() { - return art.arcane.volmlib.util.inventorygui.WindowResolution.valueOf(name()); - } - - public static WindowResolution fromShared(art.arcane.volmlib.util.inventorygui.WindowResolution resolution) { - return valueOf(resolution.name()); - } -} diff --git a/core/src/main/java/art/arcane/iris/util/common/math/VectorMath.java b/core/src/main/java/art/arcane/iris/util/common/math/VectorMath.java deleted file mode 100644 index df7425321..000000000 --- a/core/src/main/java/art/arcane/iris/util/common/math/VectorMath.java +++ /dev/null @@ -1,78 +0,0 @@ -package art.arcane.iris.util.common.math; - -import org.bukkit.util.Vector; - -public class VectorMath extends art.arcane.volmlib.util.math.VectorMath { - public static Vector rotate(Direction current, Direction to, Vector v) { - if (current.equals(to)) { - return v; - } else if (current.equals(to.reverse())) { - if (current.isVertical()) { - return new Vector(v.getX(), -v.getY(), v.getZ()); - } else { - return new Vector(-v.getX(), v.getY(), -v.getZ()); - } - } else { - Vector c = current.toVector().clone().add(to.toVector()); - - if (c.getX() == 0) { - if (c.getY() != c.getZ()) { - return rotate90CX(v); - } - - return rotate90CCX(v); - } else if (c.getY() == 0) { - if (c.getX() != c.getZ()) { - return rotate90CY(v); - } - - return rotate90CCY(v); - } else if (c.getZ() == 0) { - if (c.getX() != c.getY()) { - return rotate90CZ(v); - } - - return rotate90CCZ(v); - } - } - - return v; - } - - public static Vector rotate(Direction current, Direction to, Vector v, int w, int h, int d) { - if (current.equals(to)) { - return v; - } else if (current.equals(to.reverse())) { - if (current.isVertical()) { - return new Vector(v.getX(), -v.getY() + h, v.getZ()); - } else { - return new Vector(-v.getX() + w, v.getY(), -v.getZ() + d); - } - } else { - Vector c = current.toVector().clone().add(to.toVector()); - - if (c.getX() == 0) { - if (c.getY() != c.getZ()) { - return rotate90CX(v, d); - } - - return rotate90CCX(v, h); - } else if (c.getY() == 0) { - if (c.getX() != c.getZ()) { - return rotate90CY(v, d); - } - - return rotate90CCY(v, w); - } else if (c.getZ() == 0) { - if (c.getX() != c.getY()) { - return rotate90CZ(v, w); - } - - return rotate90CCZ(v, h); - } - } - - return v; - } - -} diff --git a/core/src/main/java/art/arcane/iris/util/project/hunk/Hunk.java b/core/src/main/java/art/arcane/iris/util/project/hunk/Hunk.java index 57e10df6f..37eaac79f 100644 --- a/core/src/main/java/art/arcane/iris/util/project/hunk/Hunk.java +++ b/core/src/main/java/art/arcane/iris/util/project/hunk/Hunk.java @@ -36,6 +36,7 @@ import art.arcane.volmlib.util.hunk.HunkCoreSupport; import art.arcane.volmlib.util.hunk.HunkInterpolationSupport; import art.arcane.volmlib.util.hunk.HunkMutationSupport; import art.arcane.volmlib.util.hunk.HunkSectionSupport; +import art.arcane.volmlib.util.hunk.HunkFace; import art.arcane.volmlib.util.hunk.HunkLike; import art.arcane.iris.util.project.hunk.storage.ArrayHunk; import art.arcane.iris.util.project.hunk.storage.AtomicDoubleHunk; diff --git a/core/src/main/java/art/arcane/iris/util/project/hunk/HunkFace.java b/core/src/main/java/art/arcane/iris/util/project/hunk/HunkFace.java deleted file mode 100644 index ec8e58a21..000000000 --- a/core/src/main/java/art/arcane/iris/util/project/hunk/HunkFace.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2022 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package art.arcane.iris.util.project.hunk; - -public enum HunkFace { - TOP(art.arcane.volmlib.util.hunk.HunkFace.TOP), - BOTTOM(art.arcane.volmlib.util.hunk.HunkFace.BOTTOM), - EAST(art.arcane.volmlib.util.hunk.HunkFace.EAST), - WEST(art.arcane.volmlib.util.hunk.HunkFace.WEST), - NORTH(art.arcane.volmlib.util.hunk.HunkFace.NORTH), - SOUTH(art.arcane.volmlib.util.hunk.HunkFace.SOUTH); - - private final art.arcane.volmlib.util.hunk.HunkFace shared; - - HunkFace(art.arcane.volmlib.util.hunk.HunkFace shared) { - this.shared = shared; - } - - public art.arcane.volmlib.util.hunk.HunkFace shared() { - return shared; - } - - public static HunkFace fromShared(art.arcane.volmlib.util.hunk.HunkFace shared) { - return HunkFace.valueOf(shared.name()); - } -} diff --git a/core/src/main/java/art/arcane/iris/util/project/interpolation/InterpolationType.java b/core/src/main/java/art/arcane/iris/util/project/interpolation/InterpolationType.java deleted file mode 100644 index 03a3b8279..000000000 --- a/core/src/main/java/art/arcane/iris/util/project/interpolation/InterpolationType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2022 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package art.arcane.iris.util.project.interpolation; - -public enum InterpolationType { - LINEAR, - PARAMETRIC_2, - PARAMETRIC_4, - BEZIER, - NONE -} \ No newline at end of file diff --git a/core/src/main/java/art/arcane/iris/util/project/interpolation/IrisInterpolation.java b/core/src/main/java/art/arcane/iris/util/project/interpolation/IrisInterpolation.java index 47bc6036e..93155996c 100644 --- a/core/src/main/java/art/arcane/iris/util/project/interpolation/IrisInterpolation.java +++ b/core/src/main/java/art/arcane/iris/util/project/interpolation/IrisInterpolation.java @@ -63,26 +63,6 @@ public class IrisInterpolation { return a + (parametric(f, v) * (b - a)); } - public static double blerp(double a, double b, double c, double d, double tx, double ty, InterpolationType type) { - if (type.equals(InterpolationType.LINEAR)) { - return blerp(a, b, c, d, tx, ty); - } - - if (type.equals(InterpolationType.BEZIER)) { - return blerpBezier(a, b, c, d, tx, ty); - } - - if (type.equals(InterpolationType.PARAMETRIC_2)) { - return blerpParametric(a, b, c, d, tx, ty, 2); - } - - if (type.equals(InterpolationType.PARAMETRIC_4)) { - return blerpParametric(a, b, c, d, tx, ty, 4); - } - - return 0; - } - public static double blerpBezier(double a, double b, double c, double d, double tx, double ty) { return lerpBezier(lerpBezier(a, b, tx), lerpBezier(c, d, tx), ty); }