Move ClickType to utils

DecentSoftware-eu · Oct 12, 2023 · e23700c · e23700c
1 parent 0c7e6b6
commit e23700c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 11 deletions.
diff --git a/...rams-api/src/main/java/eu/decentsoftware/holograms/api/hologram/HologramClickHandler.java b/...rams-api/src/main/java/eu/decentsoftware/holograms/api/hologram/HologramClickHandler.java
@@ -18,6 +18,7 @@
 
 package eu.decentsoftware.holograms.api.hologram;
 
+import eu.decentsoftware.holograms.api.util.ClickType;
 import lombok.NonNull;
 import org.bukkit.entity.Player;
 

diff --git a/...are/holograms/api/hologram/ClickType.java → ...oftware/holograms/api/util/ClickType.java b/...are/holograms/api/hologram/ClickType.java → ...oftware/holograms/api/util/ClickType.java
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package eu.decentsoftware.holograms.api.hologram;
+package eu.decentsoftware.holograms.api.util;
 
+import eu.decentsoftware.holograms.api.hologram.HologramClickHandler;
 import lombok.NonNull;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;

diff --git a/...mmons/src/main/java/eu/decentsoftware/holograms/nms/event/PacketPlayInUseEntityEvent.java b/...mmons/src/main/java/eu/decentsoftware/holograms/nms/event/PacketPlayInUseEntityEvent.java
@@ -1,7 +1,7 @@
 package eu.decentsoftware.holograms.nms.event;
 
 import eu.decentsoftware.holograms.api.event.DecentHologramsEvent;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;

diff --git a/...holograms-v1_20_R2/src/main/java/eu/decentsoftware/holograms/nms/NMSAdapter_v1_20_R2.java b/...holograms-v1_20_R2/src/main/java/eu/decentsoftware/holograms/nms/NMSAdapter_v1_20_R2.java
@@ -19,7 +19,7 @@
 package eu.decentsoftware.holograms.nms;
 
 import com.mojang.datafixers.util.Pair;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.nms.event.PacketPlayInUseEntityEvent;
 import eu.decentsoftware.holograms.nms.utils.ReflectField;
 import eu.decentsoftware.holograms.nms.utils.ReflectUtil;

diff --git a/...t-holograms-v1_8_R2/src/main/java/eu/decentsoftware/holograms/nms/NMSAdapter_v1_8_R2.java b/...t-holograms-v1_8_R2/src/main/java/eu/decentsoftware/holograms/nms/NMSAdapter_v1_8_R2.java
@@ -18,7 +18,7 @@
 
 package eu.decentsoftware.holograms.nms;
 
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.nms.event.PacketPlayInUseEntityEvent;
 import eu.decentsoftware.holograms.nms.utils.ReflectField;
 import eu.decentsoftware.holograms.nms.utils.ReflectUtil;

diff --git a/...t-holograms-v1_8_R3/src/main/java/eu/decentsoftware/holograms/nms/NMSAdapter_v1_8_R3.java b/...t-holograms-v1_8_R3/src/main/java/eu/decentsoftware/holograms/nms/NMSAdapter_v1_8_R3.java
@@ -18,7 +18,7 @@
 
 package eu.decentsoftware.holograms.nms;
 
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.nms.event.PacketPlayInUseEntityEvent;
 import eu.decentsoftware.holograms.nms.utils.ReflectField;
 import eu.decentsoftware.holograms.nms.utils.ReflectUtil;

diff --git a/...holograms-plugin/src/main/java/eu/decentsoftware/holograms/actions/ClickActionHolder.java b/...holograms-plugin/src/main/java/eu/decentsoftware/holograms/actions/ClickActionHolder.java
@@ -19,7 +19,7 @@
 package eu.decentsoftware.holograms.actions;
 
 import com.google.common.collect.ImmutableList;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.utils.SchedulerUtil;
 import lombok.NonNull;
 import org.bukkit.entity.Player;

diff --git a/...n/java/eu/decentsoftware/holograms/actions/serialization/ClickActionHolderSerializer.java b/...n/java/eu/decentsoftware/holograms/actions/serialization/ClickActionHolderSerializer.java
@@ -22,7 +22,7 @@
 import eu.decentsoftware.holograms.actions.Action;
 import eu.decentsoftware.holograms.actions.ActionType;
 import eu.decentsoftware.holograms.actions.ClickActionHolder;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import lombok.NonNull;
 
 import java.lang.reflect.Type;

diff --git a/...-holograms-plugin/src/main/java/eu/decentsoftware/holograms/api/hologram/APIHologram.java b/...-holograms-plugin/src/main/java/eu/decentsoftware/holograms/api/hologram/APIHologram.java
@@ -19,6 +19,7 @@
 package eu.decentsoftware.holograms.api.hologram;
 
 import eu.decentsoftware.holograms.DecentHolograms;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.api.util.DecentLocation;
 import eu.decentsoftware.holograms.core.CoreHologram;
 import eu.decentsoftware.holograms.core.CoreHologramPage;

diff --git a/...ams-plugin/src/main/java/eu/decentsoftware/holograms/conditions/ClickConditionHolder.java b/...ams-plugin/src/main/java/eu/decentsoftware/holograms/conditions/ClickConditionHolder.java
@@ -19,7 +19,7 @@
 package eu.decentsoftware.holograms.conditions;
 
 import com.google.common.collect.ImmutableList;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import lombok.NonNull;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Contract;

diff --git a/.../eu/decentsoftware/holograms/conditions/serialization/ClickConditionHolderSerializer.java b/.../eu/decentsoftware/holograms/conditions/serialization/ClickConditionHolderSerializer.java
@@ -19,7 +19,7 @@
 package eu.decentsoftware.holograms.conditions.serialization;
 
 import com.google.gson.*;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.conditions.ClickConditionHolder;
 import eu.decentsoftware.holograms.conditions.Condition;
 import eu.decentsoftware.holograms.conditions.ConditionType;

diff --git a/...t-holograms-plugin/src/main/java/eu/decentsoftware/holograms/internal/PluginHologram.java b/...t-holograms-plugin/src/main/java/eu/decentsoftware/holograms/internal/PluginHologram.java
@@ -20,7 +20,7 @@
 
 import eu.decentsoftware.holograms.Config;
 import eu.decentsoftware.holograms.DecentHolograms;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.api.util.DecentLocation;
 import eu.decentsoftware.holograms.conditions.ConditionHolder;
 import eu.decentsoftware.holograms.core.*;

diff --git a/decent-holograms-plugin/src/main/java/eu/decentsoftware/holograms/nms/NMSListener.java b/decent-holograms-plugin/src/main/java/eu/decentsoftware/holograms/nms/NMSListener.java
@@ -19,7 +19,7 @@
 package eu.decentsoftware.holograms.nms;
 
 import eu.decentsoftware.holograms.DecentHolograms;
-import eu.decentsoftware.holograms.api.hologram.ClickType;
+import eu.decentsoftware.holograms.api.util.ClickType;
 import eu.decentsoftware.holograms.core.CoreHologram;
 import eu.decentsoftware.holograms.core.CoreHologramPage;
 import eu.decentsoftware.holograms.core.line.CoreHologramLine;