From 5bab55fb79e11623cfe06fa501e6dbaf9535dba2 Mon Sep 17 00:00:00 2001 From: filoghost Date: Sat, 4 Jun 2022 18:04:18 +0200 Subject: [PATCH] Move API to non-beta package --- .../api/{beta => }/HolographicDisplaysAPI.java | 18 +++++++++--------- .../api/{beta => }/Position.java | 4 ++-- .../api/{beta => }/hologram/Hologram.java | 6 +++--- .../api/{beta => }/hologram/HologramLines.java | 8 ++++---- .../hologram/PlaceholderSetting.java | 2 +- .../hologram/VisibilitySettings.java | 2 +- .../hologram/line/ClickableHologramLine.java | 2 +- .../{beta => }/hologram/line/HologramLine.java | 2 +- .../hologram/line/HologramLineClickEvent.java | 2 +- .../line/HologramLineClickListener.java | 2 +- .../hologram/line/HologramLinePickupEvent.java | 2 +- .../line/HologramLinePickupListener.java | 2 +- .../hologram/line/ItemHologramLine.java | 2 +- .../hologram/line/TextHologramLine.java | 2 +- .../HolographicDisplaysAPIProvider.java | 6 +++--- .../placeholder/GlobalPlaceholder.java | 2 +- .../placeholder/GlobalPlaceholderFactory.java | 2 +- .../GlobalPlaceholderReplaceFunction.java | 2 +- .../placeholder/IndividualPlaceholder.java | 2 +- .../IndividualPlaceholderFactory.java | 2 +- .../IndividualPlaceholderReplaceFunction.java | 2 +- .../{beta => }/placeholder/Placeholder.java | 2 +- .../core/HolographicDisplaysCore.java | 2 +- .../core/api/current/APIHologram.java | 6 +++--- .../core/api/current/APIHologramLine.java | 2 +- .../core/api/current/APIHologramLines.java | 8 ++++---- .../core/api/current/APIHologramManager.java | 2 +- .../core/api/current/APIItemHologramLine.java | 6 +++--- .../core/api/current/APITextHologramLine.java | 6 +++--- .../current/DefaultHolographicDisplaysAPI.java | 18 +++++++++--------- .../DefaultHolographicDisplaysAPIProvider.java | 6 +++--- .../api/current/DefaultVisibilitySettings.java | 2 +- .../current/SimpleHologramLineClickEvent.java | 2 +- .../current/SimpleHologramLinePickupEvent.java | 2 +- .../core/api/v2/V2VisibilityManager.java | 4 ++-- .../core/base/BaseHologramLines.java | 2 +- .../core/base/ImmutablePosition.java | 2 +- .../registry/GlobalPlaceholderExpansion.java | 4 ++-- .../IndividualPlaceholderExpansion.java | 4 ++-- .../LegacyGlobalPlaceholderExpansion.java | 2 +- .../registry/PlaceholderRegistry.java | 12 ++++++------ .../registry/SimpleGlobalPlaceholder.java | 4 ++-- .../registry/SimpleIndividualPlaceholder.java | 4 ++-- .../example/deathholograms/DeathHolograms.java | 4 ++-- .../filoghost/example/powerups/PowerUps.java | 8 ++++---- .../api/internal/HologramsAPIProvider.java | 2 +- .../plugin/HolographicDisplays.java | 4 ++-- .../commands/InternalHologramEditor.java | 2 +- .../plugin/commands/subs/AlignCommand.java | 2 +- .../plugin/commands/subs/CreateCommand.java | 2 +- .../plugin/commands/subs/MoveHereCommand.java | 2 +- .../plugin/commands/subs/NearCommand.java | 2 +- .../plugin/config/InternalHologramConfig.java | 2 +- .../plugin/format/DisplayFormat.java | 2 +- .../internal/hologram/InternalHologram.java | 8 ++++---- .../hologram/InternalHologramLine.java | 2 +- .../hologram/InternalHologramManager.java | 4 ++-- .../hologram/ItemInternalHologramLine.java | 2 +- .../hologram/TextInternalHologramLine.java | 2 +- .../placeholder/AnimationPlaceholder.java | 2 +- .../AnimationPlaceholderFactory.java | 4 ++-- .../placeholder/DefaultPlaceholders.java | 2 +- .../placeholder/ImmutablePlaceholder.java | 2 +- .../OnlinePlayersPlaceholderFactory.java | 4 ++-- .../PlaceholderAPIPlaceholderFactory.java | 4 ++-- .../WorldPlayersPlaceholderFactory.java | 4 ++-- 66 files changed, 124 insertions(+), 124 deletions(-) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/HolographicDisplaysAPI.java (84%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/Position.java (93%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/Hologram.java (93%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/HologramLines.java (91%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/PlaceholderSetting.java (75%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/VisibilitySettings.java (97%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/ClickableHologramLine.java (91%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/HologramLine.java (76%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/HologramLineClickEvent.java (75%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/HologramLineClickListener.java (85%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/HologramLinePickupEvent.java (75%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/HologramLinePickupListener.java (86%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/ItemHologramLine.java (94%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/hologram/line/TextHologramLine.java (89%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/internal/HolographicDisplaysAPIProvider.java (88%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/GlobalPlaceholder.java (91%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/GlobalPlaceholderFactory.java (83%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/GlobalPlaceholderReplaceFunction.java (87%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/IndividualPlaceholder.java (87%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/IndividualPlaceholderFactory.java (83%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/IndividualPlaceholderReplaceFunction.java (89%) rename api/src/main/java/me/filoghost/holographicdisplays/api/{beta => }/placeholder/Placeholder.java (76%) diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/HolographicDisplaysAPI.java b/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java similarity index 84% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/HolographicDisplaysAPI.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java index 17b2511f..a87933c8 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/HolographicDisplaysAPI.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/HolographicDisplaysAPI.java @@ -3,16 +3,16 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta; +package me.filoghost.holographicdisplays.api; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; -import me.filoghost.holographicdisplays.api.beta.internal.HolographicDisplaysAPIProvider; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderReplaceFunction; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderFactory; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplaceFunction; import org.bukkit.Location; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/Position.java b/api/src/main/java/me/filoghost/holographicdisplays/api/Position.java similarity index 93% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/Position.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/Position.java index f73989d1..c313da17 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/Position.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/Position.java @@ -3,9 +3,9 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta; +package me.filoghost.holographicdisplays.api; -import me.filoghost.holographicdisplays.api.beta.internal.HolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/Hologram.java similarity index 93% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/Hologram.java index 6dc3b621..a0654ff8 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/Hologram.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/Hologram.java @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram; +package me.filoghost.holographicdisplays.api.hologram; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; import org.bukkit.Location; import org.bukkit.World; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/HologramLines.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/HologramLines.java similarity index 91% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/HologramLines.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/HologramLines.java index 945ac0c4..f275f102 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/HologramLines.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/HologramLines.java @@ -3,11 +3,11 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram; +package me.filoghost.holographicdisplays.api.hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLine; -import me.filoghost.holographicdisplays.api.beta.hologram.line.ItemHologramLine; -import me.filoghost.holographicdisplays.api.beta.hologram.line.TextHologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.ItemHologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.TextHologramLine; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/PlaceholderSetting.java similarity index 75% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/PlaceholderSetting.java index 31c92392..975a7488 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/PlaceholderSetting.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/PlaceholderSetting.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram; +package me.filoghost.holographicdisplays.api.hologram; public enum PlaceholderSetting { diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/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/beta/hologram/VisibilitySettings.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/VisibilitySettings.java index be49e173..3bb40c8d 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/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.beta.hologram; +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/beta/hologram/line/ClickableHologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java similarity index 91% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/ClickableHologramLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java index af30d28d..d0f4263b 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/ClickableHologramLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ClickableHologramLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLine.java similarity index 76% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLine.java index b545dbde..7fe7a371 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; /** * Interface to represent a line in a Hologram. diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLineClickEvent.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickEvent.java similarity index 75% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLineClickEvent.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickEvent.java index 88af59d1..23dcc42d 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLineClickEvent.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickEvent.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.bukkit.entity.Player; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLineClickListener.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java similarity index 85% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLineClickListener.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java index 609684ff..bbdd4992 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLineClickListener.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLineClickListener.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLinePickupEvent.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupEvent.java similarity index 75% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLinePickupEvent.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupEvent.java index 8142710e..7c056715 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLinePickupEvent.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupEvent.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.bukkit.entity.Player; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLinePickupListener.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java similarity index 86% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLinePickupListener.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java index 03763486..6b12c7e6 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/HologramLinePickupListener.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/HologramLinePickupListener.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/ItemHologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java similarity index 94% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/ItemHologramLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java index 0a82098d..d9c5b335 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/ItemHologramLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/ItemHologramLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/TextHologramLine.java b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/TextHologramLine.java similarity index 89% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/TextHologramLine.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/TextHologramLine.java index 4eed7ec4..a88c792f 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/hologram/line/TextHologramLine.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/hologram/line/TextHologramLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.hologram.line; +package me.filoghost.holographicdisplays.api.hologram.line; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/internal/HolographicDisplaysAPIProvider.java b/api/src/main/java/me/filoghost/holographicdisplays/api/internal/HolographicDisplaysAPIProvider.java similarity index 88% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/internal/HolographicDisplaysAPIProvider.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/internal/HolographicDisplaysAPIProvider.java index 2ca71b88..47958ae7 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/internal/HolographicDisplaysAPIProvider.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/internal/HolographicDisplaysAPIProvider.java @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.internal; +package me.filoghost.holographicdisplays.api.internal; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.Position; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholder.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java similarity index 91% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholder.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java index 98d0318d..725e52a2 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholder.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholder.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholderFactory.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderFactory.java similarity index 83% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholderFactory.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderFactory.java index 1e04e0cd..f78c76ae 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholderFactory.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderFactory.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholderReplaceFunction.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplaceFunction.java similarity index 87% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholderReplaceFunction.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplaceFunction.java index aa66b908..0693ee0b 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/GlobalPlaceholderReplaceFunction.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/GlobalPlaceholderReplaceFunction.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholder.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholder.java similarity index 87% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholder.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholder.java index d910976e..1ce6f15a 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholder.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholder.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholderFactory.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderFactory.java similarity index 83% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholderFactory.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderFactory.java index c19a4ed7..21baebad 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholderFactory.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderFactory.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholderReplaceFunction.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderReplaceFunction.java similarity index 89% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholderReplaceFunction.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderReplaceFunction.java index 9cbea522..ea0eb1b7 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/IndividualPlaceholderReplaceFunction.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/IndividualPlaceholderReplaceFunction.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/Placeholder.java b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/Placeholder.java similarity index 76% rename from api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/Placeholder.java rename to api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/Placeholder.java index 1e7d101b..625d9cec 100644 --- a/api/src/main/java/me/filoghost/holographicdisplays/api/beta/placeholder/Placeholder.java +++ b/api/src/main/java/me/filoghost/holographicdisplays/api/placeholder/Placeholder.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.api.beta.placeholder; +package me.filoghost.holographicdisplays.api.placeholder; public interface Placeholder { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/HolographicDisplaysCore.java b/core/src/main/java/me/filoghost/holographicdisplays/core/HolographicDisplaysCore.java index bb5c4d0b..f0ea159f 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/HolographicDisplaysCore.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/HolographicDisplaysCore.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.core; import com.gmail.filoghost.holographicdisplays.api.internal.HologramsAPIProvider; import me.filoghost.fcommons.FCommonsPlugin.PluginEnableException; import me.filoghost.fcommons.logging.ErrorCollector; -import me.filoghost.holographicdisplays.api.beta.internal.HolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; import me.filoghost.holographicdisplays.core.NMSVersion.OutdatedVersionException; import me.filoghost.holographicdisplays.core.NMSVersion.UnknownVersionException; import me.filoghost.holographicdisplays.core.api.current.APIHologramManager; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologram.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologram.java index d690875c..ba642729 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologram.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologram.java @@ -6,9 +6,9 @@ package me.filoghost.holographicdisplays.core.api.current; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.Position; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.PlaceholderSetting; +import me.filoghost.holographicdisplays.api.Position; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.PlaceholderSetting; import me.filoghost.holographicdisplays.core.base.BaseHologram; import me.filoghost.holographicdisplays.core.base.ImmutablePosition; import me.filoghost.holographicdisplays.core.tracking.LineTrackerManager; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLine.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLine.java index c9a96c37..003dfdc1 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLine.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.core.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLine; import me.filoghost.holographicdisplays.core.base.EditableHologramLine; import org.bukkit.plugin.Plugin; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLines.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLines.java index 8d30ca5c..385fa8fc 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLines.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramLines.java @@ -6,10 +6,10 @@ package me.filoghost.holographicdisplays.core.api.current; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.hologram.HologramLines; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLine; -import me.filoghost.holographicdisplays.api.beta.hologram.line.ItemHologramLine; -import me.filoghost.holographicdisplays.api.beta.hologram.line.TextHologramLine; +import me.filoghost.holographicdisplays.api.hologram.HologramLines; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.ItemHologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.TextHologramLine; import me.filoghost.holographicdisplays.core.base.BaseHologramLines; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramManager.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramManager.java index a5f22f4f..17545391 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramManager.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIHologramManager.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.core.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import me.filoghost.holographicdisplays.core.base.BaseHologramManager; import me.filoghost.holographicdisplays.core.base.ImmutablePosition; import me.filoghost.holographicdisplays.core.tracking.LineTrackerManager; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIItemHologramLine.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIItemHologramLine.java index d5a98e51..58c40c1c 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIItemHologramLine.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIItemHologramLine.java @@ -5,9 +5,9 @@ */ package me.filoghost.holographicdisplays.core.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLineClickListener; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLinePickupListener; -import me.filoghost.holographicdisplays.api.beta.hologram.line.ItemHologramLine; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLinePickupListener; +import me.filoghost.holographicdisplays.api.hologram.line.ItemHologramLine; import me.filoghost.holographicdisplays.core.base.BaseItemHologramLine; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APITextHologramLine.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APITextHologramLine.java index 7b602a2a..d3c2b2e0 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APITextHologramLine.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APITextHologramLine.java @@ -5,9 +5,9 @@ */ package me.filoghost.holographicdisplays.core.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.PlaceholderSetting; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLineClickListener; -import me.filoghost.holographicdisplays.api.beta.hologram.line.TextHologramLine; +import me.filoghost.holographicdisplays.api.hologram.PlaceholderSetting; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickListener; +import me.filoghost.holographicdisplays.api.hologram.line.TextHologramLine; import me.filoghost.holographicdisplays.core.base.BaseTextHologramLine; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPI.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPI.java index dd8573e8..e91ae9e9 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPI.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPI.java @@ -6,15 +6,15 @@ package me.filoghost.holographicdisplays.core.api.current; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderReplaceFunction; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderFactory; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.Position; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplaceFunction; import me.filoghost.holographicdisplays.core.base.ImmutablePosition; import me.filoghost.holographicdisplays.core.placeholder.registry.PlaceholderRegistry; import org.bukkit.Location; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPIProvider.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPIProvider.java index 4893e6c9..34fe103f 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPIProvider.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultHolographicDisplaysAPIProvider.java @@ -6,9 +6,9 @@ package me.filoghost.holographicdisplays.core.api.current; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; -import me.filoghost.holographicdisplays.api.beta.internal.HolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.Position; +import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; import me.filoghost.holographicdisplays.core.base.ImmutablePosition; import me.filoghost.holographicdisplays.core.placeholder.registry.PlaceholderRegistry; import org.bukkit.Location; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultVisibilitySettings.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultVisibilitySettings.java index 68dc7e26..37d13681 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultVisibilitySettings.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/DefaultVisibilitySettings.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.core.api.current; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.hologram.VisibilitySettings; +import me.filoghost.holographicdisplays.api.hologram.VisibilitySettings; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLineClickEvent.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLineClickEvent.java index a38ea011..d6125ee1 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLineClickEvent.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLineClickEvent.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.core.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLineClickEvent; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLineClickEvent; import org.bukkit.entity.Player; class SimpleHologramLineClickEvent implements HologramLineClickEvent { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLinePickupEvent.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLinePickupEvent.java index bf6b267e..29c7baba 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLinePickupEvent.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/current/SimpleHologramLinePickupEvent.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.core.api.current; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLinePickupEvent; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLinePickupEvent; import org.bukkit.entity.Player; class SimpleHologramLinePickupEvent implements HologramLinePickupEvent { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/api/v2/V2VisibilityManager.java b/core/src/main/java/me/filoghost/holographicdisplays/core/api/v2/V2VisibilityManager.java index bd597fe0..254cd6cb 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/api/v2/V2VisibilityManager.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/api/v2/V2VisibilityManager.java @@ -6,8 +6,8 @@ package me.filoghost.holographicdisplays.core.api.v2; import com.gmail.filoghost.holographicdisplays.api.VisibilityManager; -import me.filoghost.holographicdisplays.api.beta.hologram.VisibilitySettings; -import me.filoghost.holographicdisplays.api.beta.hologram.VisibilitySettings.Visibility; +import me.filoghost.holographicdisplays.api.hologram.VisibilitySettings; +import me.filoghost.holographicdisplays.api.hologram.VisibilitySettings.Visibility; import me.filoghost.holographicdisplays.core.api.current.DefaultVisibilitySettings; import org.bukkit.entity.Player; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/base/BaseHologramLines.java b/core/src/main/java/me/filoghost/holographicdisplays/core/base/BaseHologramLines.java index 8b533730..71a47a49 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/base/BaseHologramLines.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/base/BaseHologramLines.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.core.base; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/base/ImmutablePosition.java b/core/src/main/java/me/filoghost/holographicdisplays/core/base/ImmutablePosition.java index ec898578..f1cb1894 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/base/ImmutablePosition.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/base/ImmutablePosition.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.core.base; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/GlobalPlaceholderExpansion.java b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/GlobalPlaceholderExpansion.java index b6a5111d..3fa95fc3 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/GlobalPlaceholderExpansion.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/GlobalPlaceholderExpansion.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.core.placeholder.registry; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import me.filoghost.holographicdisplays.core.placeholder.PlaceholderException; import me.filoghost.holographicdisplays.core.placeholder.StandardPlaceholder; import org.bukkit.entity.Player; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/IndividualPlaceholderExpansion.java b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/IndividualPlaceholderExpansion.java index b422f2a7..a1c3d423 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/IndividualPlaceholderExpansion.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/IndividualPlaceholderExpansion.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.core.placeholder.registry; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; import me.filoghost.holographicdisplays.core.placeholder.PlaceholderException; import me.filoghost.holographicdisplays.core.placeholder.StandardPlaceholder; import org.bukkit.entity.Player; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/LegacyGlobalPlaceholderExpansion.java b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/LegacyGlobalPlaceholderExpansion.java index 73a3524e..87e606ea 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/LegacyGlobalPlaceholderExpansion.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/LegacyGlobalPlaceholderExpansion.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.core.placeholder.registry; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import org.bukkit.plugin.Plugin; public class LegacyGlobalPlaceholderExpansion extends GlobalPlaceholderExpansion { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/PlaceholderRegistry.java b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/PlaceholderRegistry.java index b2632861..4fc7037d 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/PlaceholderRegistry.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/PlaceholderRegistry.java @@ -11,12 +11,12 @@ import com.google.common.collect.Table; import me.filoghost.fcommons.collection.CaseInsensitiveString; import me.filoghost.fcommons.collection.CollectionUtils; import me.filoghost.fcommons.logging.Log; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderReplaceFunction; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderFactory; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplaceFunction; import me.filoghost.holographicdisplays.core.placeholder.PlaceholderIdentifier; import me.filoghost.holographicdisplays.core.placeholder.PlaceholderOccurrence; import me.filoghost.holographicdisplays.core.placeholder.PluginName; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleGlobalPlaceholder.java b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleGlobalPlaceholder.java index 22d796e7..0a36f5a1 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleGlobalPlaceholder.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleGlobalPlaceholder.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.core.placeholder.registry; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderReplaceFunction; class SimpleGlobalPlaceholder implements GlobalPlaceholder { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleIndividualPlaceholder.java b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleIndividualPlaceholder.java index baccc112..d986cb9a 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleIndividualPlaceholder.java +++ b/core/src/main/java/me/filoghost/holographicdisplays/core/placeholder/registry/SimpleIndividualPlaceholder.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.core.placeholder.registry; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplaceFunction; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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 b11b287e..47fa09b8 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.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.hologram.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 1910b2df..6b66adfe 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,10 +5,10 @@ */ package me.filoghost.example.powerups; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.line.HologramLinePickupEvent; -import me.filoghost.holographicdisplays.api.beta.hologram.line.ItemHologramLine; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.line.HologramLinePickupEvent; +import me.filoghost.holographicdisplays.api.hologram.line.ItemHologramLine; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Effect; diff --git a/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/HologramsAPIProvider.java b/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/HologramsAPIProvider.java index 30b69249..758a024d 100644 --- a/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/HologramsAPIProvider.java +++ b/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/HologramsAPIProvider.java @@ -7,7 +7,7 @@ package com.gmail.filoghost.holographicdisplays.api.internal; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; -import me.filoghost.holographicdisplays.api.beta.internal.HolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java index 0a68bfb2..5bd5b865 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java @@ -9,8 +9,8 @@ import me.filoghost.fcommons.FCommonsPlugin; import me.filoghost.fcommons.FeatureSupport; import me.filoghost.fcommons.logging.ErrorCollector; import me.filoghost.fcommons.logging.Log; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.core.HolographicDisplaysCore; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker; import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/InternalHologramEditor.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/InternalHologramEditor.java index 9d378441..27907878 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/InternalHologramEditor.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/InternalHologramEditor.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.commands; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.config.ConfigManager; import me.filoghost.holographicdisplays.plugin.config.InternalHologramLineParser; import me.filoghost.holographicdisplays.plugin.config.InternalHologramLoadException; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java index 4385d950..9477f758 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/AlignCommand.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.commands.subs; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.commands.InternalHologramEditor; import me.filoghost.holographicdisplays.plugin.event.InternalHologramChangeEvent.ChangeType; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java index d3291286..645dc191 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/CreateCommand.java @@ -9,7 +9,7 @@ import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.commands.InternalHologramEditor; import me.filoghost.holographicdisplays.plugin.event.InternalHologramChangeEvent.ChangeType; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MoveHereCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MoveHereCommand.java index adabbb87..4805c5b3 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MoveHereCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/MoveHereCommand.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.commands.subs; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.commands.InternalHologramEditor; import me.filoghost.holographicdisplays.plugin.event.InternalHologramChangeEvent.ChangeType; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java index ccaee2bd..8ae88e62 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/NearCommand.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.commands.subs; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.commands.InternalHologramEditor; import me.filoghost.holographicdisplays.plugin.format.DisplayFormat; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/config/InternalHologramConfig.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/config/InternalHologramConfig.java index b1fec196..76fa7bb6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/config/InternalHologramConfig.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/config/InternalHologramConfig.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.config; import me.filoghost.fcommons.collection.CollectionUtils; import me.filoghost.fcommons.config.ConfigSection; import me.filoghost.fcommons.config.exception.ConfigValueException; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologram; import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologramLine; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/format/DisplayFormat.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/format/DisplayFormat.java index 0dfa5a81..65f08247 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/format/DisplayFormat.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/format/DisplayFormat.java @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.plugin.format; import me.filoghost.fcommons.Colors; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.Position; import me.filoghost.holographicdisplays.plugin.config.StaticReplacements; import me.filoghost.holographicdisplays.plugin.internal.hologram.InternalHologram; import net.md_5.bungee.api.ChatColor; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologram.java index 78aff1d2..5de72987 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologram.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.plugin.internal.hologram; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.PlaceholderSetting; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.Position; +import me.filoghost.holographicdisplays.api.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.PlaceholderSetting; import me.filoghost.holographicdisplays.plugin.event.InternalHologramChangeEvent; import me.filoghost.holographicdisplays.plugin.event.InternalHologramChangeEvent.ChangeType; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramLine.java index 9390add3..a4dd7cc5 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.internal.hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.Hologram; public abstract class InternalHologramLine { diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramManager.java index cbe7e53b..1e2c035a 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/InternalHologramManager.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.internal.hologram; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; -import me.filoghost.holographicdisplays.api.beta.Position; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.Position; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/ItemInternalHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/ItemInternalHologramLine.java index 2f1e568d..5776f1f2 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/ItemInternalHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/ItemInternalHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.internal.hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.Hologram; import org.bukkit.inventory.ItemStack; public class ItemInternalHologramLine extends InternalHologramLine { diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/TextInternalHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/TextInternalHologramLine.java index 54e2d00c..76d78ff6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/TextInternalHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/hologram/TextInternalHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.internal.hologram; -import me.filoghost.holographicdisplays.api.beta.hologram.Hologram; +import me.filoghost.holographicdisplays.api.hologram.Hologram; public class TextInternalHologramLine extends InternalHologramLine { diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java index b390af30..c6925a96 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholder.java @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import com.google.common.collect.ImmutableList; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; import java.util.List; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java index afeb111b..1a94a902 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/AnimationPlaceholderFactory.java @@ -7,8 +7,8 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.collection.CaseInsensitiveHashMap; import me.filoghost.fcommons.collection.CaseInsensitiveMap; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import java.util.Map; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/DefaultPlaceholders.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/DefaultPlaceholders.java index 30f7abe2..e8dbf3df 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/DefaultPlaceholders.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/DefaultPlaceholders.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.collection.CollectionUtils; -import me.filoghost.holographicdisplays.api.beta.HolographicDisplaysAPI; +import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.ServerInfo; import me.filoghost.holographicdisplays.plugin.config.Settings; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java index 8410a5ad..20538ad6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/ImmutablePlaceholder.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.internal.placeholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; public class ImmutablePlaceholder implements GlobalPlaceholder { diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java index 4d32a73a..de4caeaf 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/OnlinePlayersPlaceholderFactory.java @@ -6,8 +6,8 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.Strings; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker; import org.bukkit.Bukkit; import org.jetbrains.annotations.Nullable; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/PlaceholderAPIPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/PlaceholderAPIPlaceholderFactory.java index 2a1b3ac7..421a7212 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/PlaceholderAPIPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/PlaceholderAPIPlaceholderFactory.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.internal.placeholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.IndividualPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java index 382d9be0..cf21a0d0 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/internal/placeholder/WorldPlayersPlaceholderFactory.java @@ -6,8 +6,8 @@ package me.filoghost.holographicdisplays.plugin.internal.placeholder; import me.filoghost.fcommons.Strings; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholder; -import me.filoghost.holographicdisplays.api.beta.placeholder.GlobalPlaceholderFactory; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholder; +import me.filoghost.holographicdisplays.api.placeholder.GlobalPlaceholderFactory; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player;