diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java b/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java index 8c5609ab..fced716f 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java @@ -5,6 +5,7 @@ */ package me.filoghost.holographicdisplays.api; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; import org.bukkit.Location; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/line/CollectableLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/CollectableLine.java similarity index 85% rename from api/src/main/java/me/filoghost/holographicdisplays/api/line/CollectableLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/CollectableLine.java index 5db1ec22..8f06470c 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/line/CollectableLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/CollectableLine.java @@ -3,9 +3,8 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.line; +package me.filoghost.holographicdisplays.api.hologram; -import me.filoghost.holographicdisplays.api.handler.PickupHandler; import org.jetbrains.annotations.Nullable; /** diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/Hologram.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/Hologram.java similarity index 96% rename from api/src/main/java/me/filoghost/holographicdisplays/api/Hologram.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/Hologram.java index cf0eb106..ed7d557e 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/Hologram.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/Hologram.java @@ -3,11 +3,9 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api; +package me.filoghost.holographicdisplays.api.hologram; -import me.filoghost.holographicdisplays.api.line.HologramLine; -import me.filoghost.holographicdisplays.api.line.ItemLine; -import me.filoghost.holographicdisplays.api.line.TextLine; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.inventory.ItemStack; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/line/HologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/HologramLine.java similarity index 85% rename from api/src/main/java/me/filoghost/holographicdisplays/api/line/HologramLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/HologramLine.java index 3bb8e053..31d12d05 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/line/HologramLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/HologramLine.java @@ -3,9 +3,8 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.line; +package me.filoghost.holographicdisplays.api.hologram; -import me.filoghost.holographicdisplays.api.Hologram; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/line/ItemLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/ItemLine.java similarity index 92% rename from api/src/main/java/me/filoghost/holographicdisplays/api/line/ItemLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/ItemLine.java index 3768199b..94c8eaa5 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/line/ItemLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/ItemLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.line; +package me.filoghost.holographicdisplays.api.hologram; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/handler/PickupHandler.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/PickupHandler.java similarity index 89% rename from api/src/main/java/me/filoghost/holographicdisplays/api/handler/PickupHandler.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/PickupHandler.java index 60364007..6eb6d3fa 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/handler/PickupHandler.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/PickupHandler.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.handler; +package me.filoghost.holographicdisplays.api.hologram; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/line/TextLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TextLine.java similarity index 90% rename from api/src/main/java/me/filoghost/holographicdisplays/api/line/TextLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TextLine.java index 264b422f..f4d21433 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/line/TextLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TextLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.line; +package me.filoghost.holographicdisplays.api.hologram; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/handler/TouchHandler.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TouchHandler.java similarity index 89% rename from api/src/main/java/me/filoghost/holographicdisplays/api/handler/TouchHandler.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TouchHandler.java index 28eb95ad..e7e00704 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/handler/TouchHandler.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TouchHandler.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.handler; +package me.filoghost.holographicdisplays.api.hologram; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/line/TouchableLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TouchableLine.java similarity index 85% rename from api/src/main/java/me/filoghost/holographicdisplays/api/line/TouchableLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TouchableLine.java index c797722c..4ccedfbc 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/line/TouchableLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/TouchableLine.java @@ -3,9 +3,8 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.line; +package me.filoghost.holographicdisplays.api.hologram; -import me.filoghost.holographicdisplays.api.handler.TouchHandler; import org.jetbrains.annotations.Nullable; /** diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/VisibilitySettings.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java similarity index 97% rename from api/src/main/java/me/filoghost/holographicdisplays/api/VisibilitySettings.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java index b847dd57..ec9b7a7e 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/VisibilitySettings.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api; +package me.filoghost.holographicdisplays.api.hologram; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/example/death-holograms/src/main/java/me/filoghost/example/deathholograms/DeathHolograms.java b/example/death-holograms/src/main/java/me/filoghost/example/deathholograms/DeathHolograms.java index c50728e0..73c9a2ce 100644 --- a/example/death-holograms/src/main/java/me/filoghost/example/deathholograms/DeathHolograms.java +++ b/example/death-holograms/src/main/java/me/filoghost/example/deathholograms/DeathHolograms.java @@ -5,8 +5,8 @@ */ package me.filoghost.example.deathholograms; -import me.filoghost.holographicdisplays.api.Hologram; import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; diff --git a/example/power-ups/src/main/java/me/filoghost/example/powerups/PowerUps.java b/example/power-ups/src/main/java/me/filoghost/example/powerups/PowerUps.java index fda7a292..a00ca0d3 100644 --- a/example/power-ups/src/main/java/me/filoghost/example/powerups/PowerUps.java +++ b/example/power-ups/src/main/java/me/filoghost/example/powerups/PowerUps.java @@ -5,9 +5,9 @@ */ package me.filoghost.example.powerups; -import me.filoghost.holographicdisplays.api.Hologram; import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.line.ItemLine; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.ItemLine; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Effect; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java index 78490283..78edfc31 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPI.java @@ -6,8 +6,8 @@ package me.filoghost.holographicdisplays.plugin.api.current; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.Hologram; import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologramManager; import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewPickupHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewPickupHandlerAdapter.java index 5cf5acfe..cc778fa5 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewPickupHandlerAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewPickupHandlerAdapter.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @SuppressWarnings("deprecation") -public class NewPickupHandlerAdapter implements me.filoghost.holographicdisplays.api.handler.PickupHandler { +public class NewPickupHandlerAdapter implements me.filoghost.holographicdisplays.api.hologram.PickupHandler { private final PickupHandler v2PickupHandler; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewTouchHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewTouchHandlerAdapter.java index 83b10a09..7c225bda 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewTouchHandlerAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/NewTouchHandlerAdapter.java @@ -10,7 +10,7 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @SuppressWarnings("deprecation") -public class NewTouchHandlerAdapter implements me.filoghost.holographicdisplays.api.handler.TouchHandler { +public class NewTouchHandlerAdapter implements me.filoghost.holographicdisplays.api.hologram.TouchHandler { private final TouchHandler v2TouchHandler; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2ItemLineAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2ItemLineAdapter.java index 5d02eb10..4316fce2 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2ItemLineAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2ItemLineAdapter.java @@ -22,8 +22,8 @@ public class V2ItemLineAdapter extends V2TouchableLineAdapter implements ItemLin } public void onNewPickupHandlerChange( - me.filoghost.holographicdisplays.api.handler.PickupHandler previous, - me.filoghost.holographicdisplays.api.handler.PickupHandler current) { + me.filoghost.holographicdisplays.api.hologram.PickupHandler previous, + me.filoghost.holographicdisplays.api.hologram.PickupHandler current) { if (previous != current) { v2PickupHandler = null; // Clear the field to force a new lazy initialization } @@ -37,7 +37,7 @@ public class V2ItemLineAdapter extends V2TouchableLineAdapter implements ItemLin // Adapter created from the getPickupHandler() method, simply unwrap it newItemLine.setPickupHandler(((V2PickupHandlerAdapter) v2PickupHandler).getNewPickupHandler()); } else { - me.filoghost.holographicdisplays.api.handler.PickupHandler newPickupHandler = newItemLine.getPickupHandler(); + me.filoghost.holographicdisplays.api.hologram.PickupHandler newPickupHandler = newItemLine.getPickupHandler(); // Adapt the old v2 handler to the new API, creating a new instance only if the wrapped handler changed if (!(newPickupHandler instanceof NewPickupHandlerAdapter) @@ -52,7 +52,7 @@ public class V2ItemLineAdapter extends V2TouchableLineAdapter implements ItemLin public PickupHandler getPickupHandler() { // Lazy initialization if (v2PickupHandler == null) { - me.filoghost.holographicdisplays.api.handler.PickupHandler newPickupHandler = newItemLine.getPickupHandler(); + me.filoghost.holographicdisplays.api.hologram.PickupHandler newPickupHandler = newItemLine.getPickupHandler(); if (newPickupHandler == null) { // Keep it null diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2PickupHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2PickupHandlerAdapter.java index 98fa247c..50902048 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2PickupHandlerAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2PickupHandlerAdapter.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.api.v2; -import me.filoghost.holographicdisplays.api.handler.PickupHandler; +import me.filoghost.holographicdisplays.api.hologram.PickupHandler; import org.bukkit.entity.Player; @SuppressWarnings("deprecation") diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchHandlerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchHandlerAdapter.java index 451a47a1..541acee4 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchHandlerAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchHandlerAdapter.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.api.v2; -import me.filoghost.holographicdisplays.api.handler.TouchHandler; +import me.filoghost.holographicdisplays.api.hologram.TouchHandler; import org.bukkit.entity.Player; @SuppressWarnings("deprecation") diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapter.java index de04c311..f8cc66bd 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapter.java @@ -21,8 +21,8 @@ abstract class V2TouchableLineAdapter extends V2HologramLineAdapter implements T } public void onNewTouchHandlerChange( - me.filoghost.holographicdisplays.api.handler.TouchHandler previous, - me.filoghost.holographicdisplays.api.handler.TouchHandler current) { + me.filoghost.holographicdisplays.api.hologram.TouchHandler previous, + me.filoghost.holographicdisplays.api.hologram.TouchHandler current) { if (previous != current) { v2TouchHandler = null; // Clear the field to force a new lazy initialization } @@ -36,7 +36,7 @@ abstract class V2TouchableLineAdapter extends V2HologramLineAdapter implements T // Adapter created from the getTouchHandler() method, simply unwrap it newTouchableLine.setTouchHandler(((V2TouchHandlerAdapter) v2TouchHandler).getNewTouchHandler()); } else { - me.filoghost.holographicdisplays.api.handler.TouchHandler newTouchHandler = newTouchableLine.getTouchHandler(); + me.filoghost.holographicdisplays.api.hologram.TouchHandler newTouchHandler = newTouchableLine.getTouchHandler(); // Adapt the old v2 handler to the new API, creating a new instance only if the wrapped handler changed if (!(newTouchHandler instanceof NewTouchHandlerAdapter) @@ -51,7 +51,7 @@ abstract class V2TouchableLineAdapter extends V2HologramLineAdapter implements T public TouchHandler getTouchHandler() { // Lazy initialization if (v2TouchHandler == null) { - me.filoghost.holographicdisplays.api.handler.TouchHandler newTouchHandler = newTouchableLine.getTouchHandler(); + me.filoghost.holographicdisplays.api.hologram.TouchHandler newTouchHandler = newTouchableLine.getTouchHandler(); if (newTouchHandler == null) { // Keep it null diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManagerAdapter.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManagerAdapter.java index 99f2cad2..d1dce065 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManagerAdapter.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2VisibilityManagerAdapter.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.api.v2; import com.gmail.filoghost.holographicdisplays.api.VisibilityManager; -import me.filoghost.holographicdisplays.api.VisibilitySettings.Visibility; +import me.filoghost.holographicdisplays.api.hologram.VisibilitySettings.Visibility; import me.filoghost.holographicdisplays.plugin.hologram.api.DefaultVisibilitySettings; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java index d91504a0..bcda4202 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.Hologram; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramAdapter; import me.filoghost.holographicdisplays.plugin.disk.Settings; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramLine.java index e80db0c3..3d21a14b 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.api; -import me.filoghost.holographicdisplays.api.line.HologramLine; +import me.filoghost.holographicdisplays.api.hologram.HologramLine; import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramLineAdapter; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java index 3fb109db..434edbd6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.api; -import me.filoghost.holographicdisplays.api.Hologram; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologramManager; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIItemLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIItemLine.java index 2c4a6389..d0e9f041 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIItemLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIItemLine.java @@ -5,9 +5,9 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.api; -import me.filoghost.holographicdisplays.api.handler.PickupHandler; -import me.filoghost.holographicdisplays.api.handler.TouchHandler; -import me.filoghost.holographicdisplays.api.line.ItemLine; +import me.filoghost.holographicdisplays.api.hologram.PickupHandler; +import me.filoghost.holographicdisplays.api.hologram.TouchHandler; +import me.filoghost.holographicdisplays.api.hologram.ItemLine; import me.filoghost.holographicdisplays.plugin.api.v2.V2ItemLineAdapter; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseItemLine; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITextLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITextLine.java index 908d8816..3335900c 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITextLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITextLine.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.api; -import me.filoghost.holographicdisplays.api.handler.TouchHandler; -import me.filoghost.holographicdisplays.api.line.TextLine; +import me.filoghost.holographicdisplays.api.hologram.TouchHandler; +import me.filoghost.holographicdisplays.api.hologram.TextLine; import me.filoghost.holographicdisplays.plugin.api.v2.V2TextLineAdapter; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseTextLine; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITouchableLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITouchableLine.java index bbc2fa43..7ea3ebe6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITouchableLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APITouchableLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.api; -import me.filoghost.holographicdisplays.api.line.TouchableLine; +import me.filoghost.holographicdisplays.api.hologram.TouchableLine; public interface APITouchableLine extends TouchableLine, APIHologramLine { diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java index 5222147c..6785b0fb 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.VisibilitySettings; +import me.filoghost.holographicdisplays.api.hologram.VisibilitySettings; import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import me.filoghost.holographicdisplays.plugin.api.v2.V2VisibilityManagerAdapter; import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseItemLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseItemLine.java index 83bdd30f..5ceefc34 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseItemLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseItemLine.java @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.base; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.logging.Log; -import me.filoghost.holographicdisplays.api.handler.PickupHandler; +import me.filoghost.holographicdisplays.api.hologram.PickupHandler; import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTouchableLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTouchableLine.java index 88cf2237..b72f4e87 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTouchableLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTouchableLine.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.base; import me.filoghost.fcommons.logging.Log; -import me.filoghost.holographicdisplays.api.handler.TouchHandler; +import me.filoghost.holographicdisplays.api.hologram.TouchHandler; import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.common.hologram.StandardTouchableLine; import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; diff --git a/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapterTest.java b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapterTest.java index 64ed9458..0594d88c 100644 --- a/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapterTest.java +++ b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/api/v2/V2TouchableLineAdapterTest.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.api.v2; import com.gmail.filoghost.holographicdisplays.api.line.TextLine; -import me.filoghost.holographicdisplays.api.handler.TouchHandler; +import me.filoghost.holographicdisplays.api.hologram.TouchHandler; import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologram; import me.filoghost.holographicdisplays.plugin.hologram.api.APITextLine; import org.bukkit.entity.Player;