diff options
-rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/GuiDescription.java | 2 | ||||
-rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/SyncedGuiDescription.java | 2 | ||||
-rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/client/LightweightGuiDescription.java | 2 | ||||
-rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/math/package-info.java | 6 | ||||
-rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/widget/data/Vec2i.java (renamed from src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java) | 2 |
5 files changed, 4 insertions, 10 deletions
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/GuiDescription.java b/src/main/java/io/github/cottonmc/cotton/gui/GuiDescription.java index 05770ae..5962e69 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/GuiDescription.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/GuiDescription.java @@ -5,10 +5,10 @@ import net.fabricmc.api.Environment; import net.minecraft.screen.PropertyDelegate; import io.github.cottonmc.cotton.gui.impl.FocusHandler; -import io.github.cottonmc.cotton.gui.math.Vec2i; import io.github.cottonmc.cotton.gui.widget.WPanel; import io.github.cottonmc.cotton.gui.widget.WWidget; import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment; +import io.github.cottonmc.cotton.gui.widget.data.Vec2i; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/io/github/cottonmc/cotton/gui/SyncedGuiDescription.java b/src/main/java/io/github/cottonmc/cotton/gui/SyncedGuiDescription.java index 10adbce..3526cb1 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/SyncedGuiDescription.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/SyncedGuiDescription.java @@ -27,7 +27,6 @@ import net.minecraft.world.World; import io.github.cottonmc.cotton.gui.client.BackgroundPainter; import io.github.cottonmc.cotton.gui.client.LibGui; -import io.github.cottonmc.cotton.gui.math.Vec2i; import io.github.cottonmc.cotton.gui.networking.NetworkSide; import io.github.cottonmc.cotton.gui.widget.WGridPanel; import io.github.cottonmc.cotton.gui.widget.WLabel; @@ -36,6 +35,7 @@ import io.github.cottonmc.cotton.gui.widget.WPlayerInvPanel; import io.github.cottonmc.cotton.gui.widget.WWidget; import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment; import io.github.cottonmc.cotton.gui.widget.data.Insets; +import io.github.cottonmc.cotton.gui.widget.data.Vec2i; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/LightweightGuiDescription.java b/src/main/java/io/github/cottonmc/cotton/gui/client/LightweightGuiDescription.java index fd0d8dd..1c23da8 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/LightweightGuiDescription.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/LightweightGuiDescription.java @@ -4,13 +4,13 @@ import net.minecraft.screen.PropertyDelegate; import io.github.cottonmc.cotton.gui.GuiDescription; import io.github.cottonmc.cotton.gui.ValidatedSlot; -import io.github.cottonmc.cotton.gui.math.Vec2i; import io.github.cottonmc.cotton.gui.widget.WGridPanel; import io.github.cottonmc.cotton.gui.widget.WLabel; import io.github.cottonmc.cotton.gui.widget.WPanel; import io.github.cottonmc.cotton.gui.widget.WWidget; import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment; import io.github.cottonmc.cotton.gui.widget.data.Insets; +import io.github.cottonmc.cotton.gui.widget.data.Vec2i; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/io/github/cottonmc/cotton/gui/math/package-info.java b/src/main/java/io/github/cottonmc/cotton/gui/math/package-info.java deleted file mode 100644 index 2ab2ffb..0000000 --- a/src/main/java/io/github/cottonmc/cotton/gui/math/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * LibGui-specific math data types. - * - * @since 4.0.0 - */ -package io.github.cottonmc.cotton.gui.math; diff --git a/src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/data/Vec2i.java index 7ee8f0d..98238bc 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/data/Vec2i.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.cotton.gui.math; +package io.github.cottonmc.cotton.gui.widget.data; /** * An immutable, two-dimensional int vector. |