From bce5799d0db55260ab3f1c872e6f2ba64c6c6c67 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Thu, 27 May 2021 21:43:57 +0300
Subject: Move Vec2i into widget.data

---
 .../java/io/github/cottonmc/cotton/gui/GuiDescription.java   |  2 +-
 .../io/github/cottonmc/cotton/gui/SyncedGuiDescription.java  |  2 +-
 .../cotton/gui/client/LightweightGuiDescription.java         |  2 +-
 src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java  | 12 ------------
 .../io/github/cottonmc/cotton/gui/math/package-info.java     |  6 ------
 .../io/github/cottonmc/cotton/gui/widget/data/Vec2i.java     | 12 ++++++++++++
 6 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java
 delete mode 100644 src/main/java/io/github/cottonmc/cotton/gui/math/package-info.java
 create mode 100644 src/main/java/io/github/cottonmc/cotton/gui/widget/data/Vec2i.java

(limited to 'src/main/java')

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/Vec2i.java b/src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java
deleted file mode 100644
index 7ee8f0d..0000000
--- a/src/main/java/io/github/cottonmc/cotton/gui/math/Vec2i.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.cottonmc.cotton.gui.math;
-
-/**
- * An immutable, two-dimensional int vector.
- * This record can be used to represent positions on the screen.
- *
- * @param x the horizontal component
- * @param y the vertical component
- * @since 4.0.0
- */
-public record Vec2i(int x, int y) {
-}
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/widget/data/Vec2i.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/data/Vec2i.java
new file mode 100644
index 0000000..98238bc
--- /dev/null
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/data/Vec2i.java
@@ -0,0 +1,12 @@
+package io.github.cottonmc.cotton.gui.widget.data;
+
+/**
+ * An immutable, two-dimensional int vector.
+ * This record can be used to represent positions on the screen.
+ *
+ * @param x the horizontal component
+ * @param y the vertical component
+ * @since 4.0.0
+ */
+public record Vec2i(int x, int y) {
+}
-- 
cgit