From 73f0d23410bd428dbf33252f4faee5b5979cdaf5 Mon Sep 17 00:00:00 2001 From: filoghost Date: Sun, 20 Jun 2021 11:14:26 +0200 Subject: [PATCH] Rename module "core" to "common" --- {core => common}/pom.xml | 4 ++-- .../common}/DebugLogger.java | 6 +++--- .../holographicdisplays/common}/Utils.java | 2 +- .../common}/hologram/StandardHologram.java | 2 +- .../common}/hologram/StandardHologramLine.java | 2 +- .../common}/hologram/StandardItemLine.java | 6 +++--- .../common}/hologram/StandardTextLine.java | 4 ++-- .../hologram/StandardTouchableLine.java | 6 +++--- .../common}/nms/NMSCommons.java | 2 +- .../common}/nms/NMSManager.java | 14 +++++++------- .../common}/nms/ProtocolPacketSettings.java | 2 +- .../common}/nms/SpawnFailedException.java | 2 +- .../common}/nms/entity/NMSArmorStand.java | 2 +- .../common}/nms/entity/NMSEntity.java | 4 ++-- .../common}/nms/entity/NMSEntityHelper.java | 2 +- .../common}/nms/entity/NMSItem.java | 2 +- .../common}/nms/entity/NMSSlime.java | 2 +- .../common}/nms/entity/NMSVehicle.java | 2 +- nms/v1_10_r1/pom.xml | 2 +- .../nms/v1_10_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_10_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_10_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_10_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_10_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_11_r1/pom.xml | 2 +- .../nms/v1_11_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_11_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_11_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_11_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_11_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_12_r1/pom.xml | 2 +- .../nms/v1_12_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_12_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_12_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_12_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_12_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_13_r1/pom.xml | 2 +- .../nms/v1_13_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_13_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_13_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_13_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_13_R1/VersionNMSManager.java | 18 +++++++++--------- nms/v1_13_r2/pom.xml | 2 +- .../nms/v1_13_R2/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_13_R2/EntityNMSItem.java | 8 ++++---- .../nms/v1_13_R2/EntityNMSSlime.java | 4 ++-- .../nms/v1_13_R2/VersionNMSEntityHelper.java | 2 +- .../nms/v1_13_R2/VersionNMSManager.java | 18 +++++++++--------- nms/v1_14_r1/pom.xml | 2 +- .../nms/v1_14_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_14_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_14_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_14_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_14_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_15_r1/pom.xml | 2 +- .../nms/v1_15_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_15_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_15_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_15_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_15_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_16_r1/pom.xml | 2 +- .../nms/v1_16_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_16_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_16_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_16_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_16_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_16_r2/pom.xml | 2 +- .../nms/v1_16_R2/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_16_R2/EntityNMSItem.java | 8 ++++---- .../nms/v1_16_R2/EntityNMSSlime.java | 4 ++-- .../nms/v1_16_R2/VersionNMSEntityHelper.java | 2 +- .../nms/v1_16_R2/VersionNMSManager.java | 16 ++++++++-------- nms/v1_16_r3/pom.xml | 2 +- .../nms/v1_16_R3/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_16_R3/EntityNMSItem.java | 8 ++++---- .../nms/v1_16_R3/EntityNMSSlime.java | 4 ++-- .../nms/v1_16_R3/VersionNMSEntityHelper.java | 2 +- .../nms/v1_16_R3/VersionNMSManager.java | 16 ++++++++-------- nms/v1_8_r2/pom.xml | 2 +- .../nms/v1_8_R2/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_8_R2/EntityNMSItem.java | 8 ++++---- .../nms/v1_8_R2/EntityNMSSlime.java | 4 ++-- .../nms/v1_8_R2/VersionNMSEntityHelper.java | 2 +- .../nms/v1_8_R2/VersionNMSManager.java | 16 ++++++++-------- nms/v1_8_r3/pom.xml | 2 +- .../nms/v1_8_R3/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_8_R3/EntityNMSItem.java | 8 ++++---- .../nms/v1_8_R3/EntityNMSSlime.java | 4 ++-- .../nms/v1_8_R3/VersionNMSEntityHelper.java | 2 +- .../nms/v1_8_R3/VersionNMSManager.java | 16 ++++++++-------- nms/v1_9_r1/pom.xml | 2 +- .../nms/v1_9_R1/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_9_R1/EntityNMSItem.java | 8 ++++---- .../nms/v1_9_R1/EntityNMSSlime.java | 4 ++-- .../nms/v1_9_R1/VersionNMSEntityHelper.java | 2 +- .../nms/v1_9_R1/VersionNMSManager.java | 16 ++++++++-------- nms/v1_9_r2/pom.xml | 2 +- .../nms/v1_9_R2/EntityNMSArmorStand.java | 10 +++++----- .../nms/v1_9_R2/EntityNMSItem.java | 8 ++++---- .../nms/v1_9_R2/EntityNMSSlime.java | 4 ++-- .../nms/v1_9_R2/VersionNMSEntityHelper.java | 2 +- .../nms/v1_9_R2/VersionNMSManager.java | 16 ++++++++-------- plugin/pom.xml | 2 +- .../plugin/HolographicDisplays.java | 4 ++-- .../DefaultHolographicDisplaysAPIProvider.java | 2 +- .../plugin/api/v2/V2HologramsAPIProvider.java | 2 +- .../bridge/bungeecord/BungeeServerTracker.java | 2 +- .../bridge/bungeecord/pinger/PingResponse.java | 2 +- .../bridge/protocollib/PacketListener.java | 12 ++++++------ .../bridge/protocollib/PacketSender.java | 18 +++++++++--------- .../bridge/protocollib/ProtocolLibHook.java | 8 ++++---- .../commands/HologramCommandManager.java | 4 ++-- .../commands/HologramCommandValidate.java | 2 +- .../plugin/commands/subs/DebugCommand.java | 6 +++--- .../plugin/disk/Configuration.java | 2 +- .../plugin/hologram/api/APIHologram.java | 2 +- .../plugin/hologram/api/APIHologramLine.java | 2 +- .../hologram/api/APIHologramManager.java | 2 +- .../api/DefaultVisibilitySettings.java | 2 +- .../plugin/hologram/base/BaseHologram.java | 6 +++--- .../plugin/hologram/base/BaseHologramLine.java | 10 +++++----- .../hologram/base/BaseHologramManager.java | 2 +- .../plugin/hologram/base/BaseItemLine.java | 8 ++++---- .../plugin/hologram/base/BaseTextLine.java | 6 +++--- .../hologram/base/BaseTouchableLine.java | 10 +++++----- .../hologram/internal/InternalHologram.java | 2 +- .../internal/InternalHologramLine.java | 2 +- .../internal/InternalHologramManager.java | 2 +- .../plugin/listener/ChunkListener.java | 4 ++-- .../plugin/listener/InteractListener.java | 8 ++++---- .../plugin/listener/SpawnListener.java | 2 +- .../internal/AnimationRegistry.java | 2 +- .../tracking/PlaceholderLineTracker.java | 4 ++-- .../placeholder/tracking/TrackedLine.java | 4 ++-- .../plugin/util/NMSVersion.java | 4 ++-- pom.xml | 4 ++-- 136 files changed, 406 insertions(+), 406 deletions(-) rename {core => common}/pom.xml (88%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/DebugLogger.java (89%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/Utils.java (95%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/hologram/StandardHologram.java (93%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/hologram/StandardHologramLine.java (88%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/hologram/StandardItemLine.java (60%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/hologram/StandardTextLine.java (67%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/hologram/StandardTouchableLine.java (60%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/NMSCommons.java (91%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/NMSManager.java (70%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/ProtocolPacketSettings.java (78%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/SpawnFailedException.java (91%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/entity/NMSArmorStand.java (91%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/entity/NMSEntity.java (79%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/entity/NMSEntityHelper.java (89%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/entity/NMSItem.java (84%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/entity/NMSSlime.java (71%) rename {core/src/main/java/me/filoghost/holographicdisplays/core => common/src/main/java/me/filoghost/holographicdisplays/common}/nms/entity/NMSVehicle.java (77%) diff --git a/core/pom.xml b/common/pom.xml similarity index 88% rename from core/pom.xml rename to common/pom.xml index 7c82da40..2b4e1481 100644 --- a/core/pom.xml +++ b/common/pom.xml @@ -9,8 +9,8 @@ 3.0.0-SNAPSHOT - holographicdisplays-core - HolographicDisplays Core + holographicdisplays-common + HolographicDisplays Common diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/DebugLogger.java b/common/src/main/java/me/filoghost/holographicdisplays/common/DebugLogger.java similarity index 89% rename from core/src/main/java/me/filoghost/holographicdisplays/core/DebugLogger.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/DebugLogger.java index 6807578a..2ac6367c 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/DebugLogger.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/DebugLogger.java @@ -3,11 +3,11 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core; +package me.filoghost.holographicdisplays.common; import me.filoghost.fcommons.logging.Log; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; public class DebugLogger { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/Utils.java b/common/src/main/java/me/filoghost/holographicdisplays/common/Utils.java similarity index 95% rename from core/src/main/java/me/filoghost/holographicdisplays/core/Utils.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/Utils.java index d0b36ebf..d83899b3 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/Utils.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/Utils.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core; +package me.filoghost.holographicdisplays.common; import me.filoghost.fcommons.Strings; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologram.java b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologram.java similarity index 93% rename from core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologram.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologram.java index 4d47fc2d..af8a2b72 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologram.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologram.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.hologram; +package me.filoghost.holographicdisplays.common.hologram; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologramLine.java b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologramLine.java similarity index 88% rename from core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologramLine.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologramLine.java index 6841cbbe..410ef0b3 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardHologramLine.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologramLine.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.hologram; +package me.filoghost.holographicdisplays.common.hologram; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardItemLine.java b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardItemLine.java similarity index 60% rename from core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardItemLine.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardItemLine.java index 4e281205..2da9a41d 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardItemLine.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardItemLine.java @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.hologram; +package me.filoghost.holographicdisplays.common.hologram; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import org.bukkit.entity.Player; public interface StandardItemLine extends StandardTouchableLine { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardTextLine.java b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardTextLine.java similarity index 67% rename from core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardTextLine.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardTextLine.java index bf2dfaee..a7914d72 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardTextLine.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardTextLine.java @@ -3,9 +3,9 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.hologram; +package me.filoghost.holographicdisplays.common.hologram; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; public interface StandardTextLine extends StandardTouchableLine { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardTouchableLine.java b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardTouchableLine.java similarity index 60% rename from core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardTouchableLine.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardTouchableLine.java index bc5fa00a..69de4a09 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/hologram/StandardTouchableLine.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardTouchableLine.java @@ -3,10 +3,10 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.hologram; +package me.filoghost.holographicdisplays.common.hologram; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import org.bukkit.entity.Player; public interface StandardTouchableLine extends StandardHologramLine { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSCommons.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/NMSCommons.java similarity index 91% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSCommons.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/NMSCommons.java index 7f43c60d..dc80c56e 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSCommons.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/NMSCommons.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms; +package me.filoghost.holographicdisplays.common.nms; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSManager.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/NMSManager.java similarity index 70% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSManager.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/NMSManager.java index cbf1f88b..6d113c87 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/NMSManager.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/NMSManager.java @@ -3,14 +3,14 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms; +package me.filoghost.holographicdisplays.common.nms; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import org.bukkit.World; import org.bukkit.entity.Entity; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/ProtocolPacketSettings.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/ProtocolPacketSettings.java similarity index 78% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/ProtocolPacketSettings.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/ProtocolPacketSettings.java index f88c2d8f..bef9886d 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/ProtocolPacketSettings.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/ProtocolPacketSettings.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms; +package me.filoghost.holographicdisplays.common.nms; public interface ProtocolPacketSettings { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/SpawnFailedException.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/SpawnFailedException.java similarity index 91% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/SpawnFailedException.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/SpawnFailedException.java index 6fc70373..fc649359 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/SpawnFailedException.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/SpawnFailedException.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms; +package me.filoghost.holographicdisplays.common.nms; public class SpawnFailedException extends Exception { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSArmorStand.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSArmorStand.java similarity index 91% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSArmorStand.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSArmorStand.java index 83c9e67f..6f82357d 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSArmorStand.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSArmorStand.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms.entity; +package me.filoghost.holographicdisplays.common.nms.entity; public interface NMSArmorStand extends NMSVehicle { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntity.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSEntity.java similarity index 79% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntity.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSEntity.java index 18895baa..43faf939 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntity.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSEntity.java @@ -3,9 +3,9 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms.entity; +package me.filoghost.holographicdisplays.common.nms.entity; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; import org.bukkit.entity.Player; /** diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntityHelper.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSEntityHelper.java similarity index 89% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntityHelper.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSEntityHelper.java index e664ed04..23611a9e 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSEntityHelper.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSEntityHelper.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms.entity; +package me.filoghost.holographicdisplays.common.nms.entity; import org.bukkit.entity.Player; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSItem.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSItem.java similarity index 84% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSItem.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSItem.java index f0b59256..77f10bc1 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSItem.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSItem.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms.entity; +package me.filoghost.holographicdisplays.common.nms.entity; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSSlime.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSSlime.java similarity index 71% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSSlime.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSSlime.java index 37aef494..7a3d5848 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSSlime.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSSlime.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms.entity; +package me.filoghost.holographicdisplays.common.nms.entity; public interface NMSSlime extends NMSEntity { diff --git a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSVehicle.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSVehicle.java similarity index 77% rename from core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSVehicle.java rename to common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSVehicle.java index 2b0d1832..1523f75f 100644 --- a/core/src/main/java/me/filoghost/holographicdisplays/core/nms/entity/NMSVehicle.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/NMSVehicle.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-3.0-or-later */ -package me.filoghost.holographicdisplays.core.nms.entity; +package me.filoghost.holographicdisplays.common.nms.entity; public interface NMSVehicle extends NMSEntity { diff --git a/nms/v1_10_r1/pom.xml b/nms/v1_10_r1/pom.xml index 831908ec..f9246ec9 100644 --- a/nms/v1_10_r1/pom.xml +++ b/nms/v1_10_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java index 1a1f72c8..506714d9 100644 --- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java +++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_10_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_10_R1.AxisAlignedBB; import net.minecraft.server.v1_10_R1.DamageSource; import net.minecraft.server.v1_10_R1.Entity; diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java index 30ac7d7d..b18a809a 100644 --- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java +++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_10_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_10_R1.Blocks; import net.minecraft.server.v1_10_R1.DamageSource; import net.minecraft.server.v1_10_R1.Entity; diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSSlime.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSSlime.java index 38d61400..93f94405 100644 --- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSSlime.java +++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_10_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_10_R1.AxisAlignedBB; import net.minecraft.server.v1_10_R1.DamageSource; import net.minecraft.server.v1_10_R1.Entity; diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSEntityHelper.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSEntityHelper.java index 9740d243..61079c85 100644 --- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSEntityHelper.java +++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_10_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_10_R1.Entity; import net.minecraft.server.v1_10_R1.EntityTrackerEntry; import net.minecraft.server.v1_10_R1.Packet; diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java index 00a27d2a..0a53c4b4 100644 --- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java +++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_10_R1.Entity; import net.minecraft.server.v1_10_R1.EntityTypes; import net.minecraft.server.v1_10_R1.MathHelper; diff --git a/nms/v1_11_r1/pom.xml b/nms/v1_11_r1/pom.xml index 5fc9afdc..c1ea2222 100644 --- a/nms/v1_11_r1/pom.xml +++ b/nms/v1_11_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java index 39b82c7b..cbed0dfa 100644 --- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java +++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_11_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_11_R1.AxisAlignedBB; import net.minecraft.server.v1_11_R1.DamageSource; import net.minecraft.server.v1_11_R1.Entity; diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java index 8e7815c4..31c11903 100644 --- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java +++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_11_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_11_R1.Blocks; import net.minecraft.server.v1_11_R1.DamageSource; import net.minecraft.server.v1_11_R1.EntityHuman; diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSSlime.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSSlime.java index c47e7154..f7e78da2 100644 --- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSSlime.java +++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_11_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_11_R1.AxisAlignedBB; import net.minecraft.server.v1_11_R1.DamageSource; import net.minecraft.server.v1_11_R1.EntityDamageSource; diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSEntityHelper.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSEntityHelper.java index e5d73136..a4f7436d 100644 --- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSEntityHelper.java +++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_11_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_11_R1.Entity; import net.minecraft.server.v1_11_R1.EntityTrackerEntry; import net.minecraft.server.v1_11_R1.Packet; diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java index c5304855..1b83dd07 100644 --- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java +++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_11_R1.Entity; import net.minecraft.server.v1_11_R1.EntityTypes; import net.minecraft.server.v1_11_R1.MathHelper; diff --git a/nms/v1_12_r1/pom.xml b/nms/v1_12_r1/pom.xml index 15d3003a..aebb05a8 100644 --- a/nms/v1_12_r1/pom.xml +++ b/nms/v1_12_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java index 45ad7333..b1703615 100644 --- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java +++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_12_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_12_R1.AxisAlignedBB; import net.minecraft.server.v1_12_R1.DamageSource; import net.minecraft.server.v1_12_R1.Entity; diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSItem.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSItem.java index 56902ade..2d12341c 100644 --- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSItem.java +++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_12_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_12_R1.Blocks; import net.minecraft.server.v1_12_R1.DamageSource; import net.minecraft.server.v1_12_R1.EntityHuman; diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSSlime.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSSlime.java index 28f4e0c3..7b33822f 100644 --- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSSlime.java +++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_12_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_12_R1.AxisAlignedBB; import net.minecraft.server.v1_12_R1.DamageSource; import net.minecraft.server.v1_12_R1.EntityDamageSource; diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSEntityHelper.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSEntityHelper.java index 9085d47a..6f1c2030 100644 --- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSEntityHelper.java +++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_12_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_12_R1.Entity; import net.minecraft.server.v1_12_R1.EntityTrackerEntry; import net.minecraft.server.v1_12_R1.Packet; diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java index efe58be7..e7345680 100644 --- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java +++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_12_R1.Entity; import net.minecraft.server.v1_12_R1.EntityTypes; import net.minecraft.server.v1_12_R1.MathHelper; diff --git a/nms/v1_13_r1/pom.xml b/nms/v1_13_r1/pom.xml index df7163ba..bcd37eda 100644 --- a/nms/v1_13_r1/pom.xml +++ b/nms/v1_13_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java index 7c149208..ff6c9d41 100644 --- a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java +++ b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_13_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_13_R1.AxisAlignedBB; import net.minecraft.server.v1_13_R1.DamageSource; import net.minecraft.server.v1_13_R1.Entity; diff --git a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSItem.java b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSItem.java index ccede1f4..987228b2 100644 --- a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSItem.java +++ b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_13_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_13_R1.Blocks; import net.minecraft.server.v1_13_R1.DamageSource; import net.minecraft.server.v1_13_R1.EntityHuman; diff --git a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSSlime.java b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSSlime.java index be572935..42e43721 100644 --- a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSSlime.java +++ b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_13_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_13_R1.AxisAlignedBB; import net.minecraft.server.v1_13_R1.DamageSource; import net.minecraft.server.v1_13_R1.EntityDamageSource; diff --git a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSEntityHelper.java b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSEntityHelper.java index ebaad1fd..10070e49 100644 --- a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSEntityHelper.java +++ b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_13_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_13_R1.Entity; import net.minecraft.server.v1_13_R1.EntityTrackerEntry; import net.minecraft.server.v1_13_R1.Packet; diff --git a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java index a97b1706..e77468b9 100644 --- a/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java +++ b/nms/v1_13_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R1/VersionNMSManager.java @@ -9,15 +9,15 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_13_R1.Entity; import net.minecraft.server.v1_13_R1.EntityTypes; import net.minecraft.server.v1_13_R1.MathHelper; diff --git a/nms/v1_13_r2/pom.xml b/nms/v1_13_r2/pom.xml index 24be3d50..d8478228 100644 --- a/nms/v1_13_r2/pom.xml +++ b/nms/v1_13_r2/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java index d7f52821..338b4a91 100644 --- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java +++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_13_R2; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_13_R2.AxisAlignedBB; import net.minecraft.server.v1_13_R2.DamageSource; import net.minecraft.server.v1_13_R2.Entity; diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSItem.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSItem.java index 0f190a69..15894fad 100644 --- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSItem.java +++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_13_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_13_R2.Blocks; import net.minecraft.server.v1_13_R2.DamageSource; import net.minecraft.server.v1_13_R2.EntityHuman; diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSSlime.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSSlime.java index a500e8ba..1afe46e0 100644 --- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSSlime.java +++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_13_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_13_R2.AxisAlignedBB; import net.minecraft.server.v1_13_R2.DamageSource; import net.minecraft.server.v1_13_R2.EntityDamageSource; diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSEntityHelper.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSEntityHelper.java index cec3b54b..72f63ad1 100644 --- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSEntityHelper.java +++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_13_R2; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_13_R2.Entity; import net.minecraft.server.v1_13_R2.EntityTrackerEntry; import net.minecraft.server.v1_13_R2.Packet; diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java index 976ad5f8..3c3ce13c 100644 --- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java +++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java @@ -9,15 +9,15 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_13_R2.Entity; import net.minecraft.server.v1_13_R2.EntityTypes; import net.minecraft.server.v1_13_R2.IRegistry; diff --git a/nms/v1_14_r1/pom.xml b/nms/v1_14_r1/pom.xml index 05304268..9cb114d0 100644 --- a/nms/v1_14_r1/pom.xml +++ b/nms/v1_14_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java index 58b09db3..cdb3713e 100644 --- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java +++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_14_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_14_R1.AxisAlignedBB; import net.minecraft.server.v1_14_R1.DamageSource; import net.minecraft.server.v1_14_R1.Entity; diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSItem.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSItem.java index 49065141..d6b54cc0 100644 --- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSItem.java +++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_14_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_14_R1.Blocks; import net.minecraft.server.v1_14_R1.DamageSource; import net.minecraft.server.v1_14_R1.EntityHuman; diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSSlime.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSSlime.java index e80a0bce..78097578 100644 --- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSSlime.java +++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_14_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_14_R1.AxisAlignedBB; import net.minecraft.server.v1_14_R1.DamageSource; import net.minecraft.server.v1_14_R1.EntityDamageSource; diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSEntityHelper.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSEntityHelper.java index 7e7c97dd..7c03369c 100644 --- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSEntityHelper.java +++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_14_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_14_R1.Entity; import net.minecraft.server.v1_14_R1.Packet; import net.minecraft.server.v1_14_R1.PlayerChunkMap.EntityTracker; diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java index e0af4340..e0374779 100644 --- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java +++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_14_R1.Entity; import net.minecraft.server.v1_14_R1.EntityTypes; import net.minecraft.server.v1_14_R1.EnumCreatureType; diff --git a/nms/v1_15_r1/pom.xml b/nms/v1_15_r1/pom.xml index 6201d954..37cae0a2 100644 --- a/nms/v1_15_r1/pom.xml +++ b/nms/v1_15_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSArmorStand.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSArmorStand.java index 03a9aaac..52ae1546 100644 --- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSArmorStand.java +++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_15_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_15_R1.AxisAlignedBB; import net.minecraft.server.v1_15_R1.DamageSource; import net.minecraft.server.v1_15_R1.Entity; diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSItem.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSItem.java index 39e1f26f..c5321986 100644 --- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSItem.java +++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_15_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_15_R1.Blocks; import net.minecraft.server.v1_15_R1.DamageSource; import net.minecraft.server.v1_15_R1.EntityHuman; diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSSlime.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSSlime.java index 6c9ae6bf..93507669 100644 --- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSSlime.java +++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_15_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_15_R1.AxisAlignedBB; import net.minecraft.server.v1_15_R1.DamageSource; import net.minecraft.server.v1_15_R1.EntityDamageSource; diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSEntityHelper.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSEntityHelper.java index 8168fc37..397e3a8e 100644 --- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSEntityHelper.java +++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_15_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_15_R1.Entity; import net.minecraft.server.v1_15_R1.Packet; import net.minecraft.server.v1_15_R1.PlayerChunkMap.EntityTracker; diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java index 623ef8c6..ad6661d1 100644 --- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java +++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_15_R1.Entity; import net.minecraft.server.v1_15_R1.EntityTypes; import net.minecraft.server.v1_15_R1.EnumCreatureType; diff --git a/nms/v1_16_r1/pom.xml b/nms/v1_16_r1/pom.xml index a65403db..a879f54c 100644 --- a/nms/v1_16_r1/pom.xml +++ b/nms/v1_16_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSArmorStand.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSArmorStand.java index 492622c5..7f8bfd91 100644 --- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSArmorStand.java +++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_16_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_16_R1.AxisAlignedBB; import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R1.Entity; diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java index 4561e681..5a3e4dbc 100644 --- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java +++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_16_R1.Blocks; import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R1.EntityHuman; diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSSlime.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSSlime.java index 8dcf819e..2b23edf1 100644 --- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSSlime.java +++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_16_R1.AxisAlignedBB; import net.minecraft.server.v1_16_R1.DamageSource; import net.minecraft.server.v1_16_R1.EntityDamageSource; diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSEntityHelper.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSEntityHelper.java index 97244ead..a35a8164 100644 --- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSEntityHelper.java +++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R1.Packet; import net.minecraft.server.v1_16_R1.PlayerChunkMap.EntityTracker; diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java index 11b47dc5..8c39a38b 100644 --- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java +++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_16_R1.Entity; import net.minecraft.server.v1_16_R1.EntityTypes; import net.minecraft.server.v1_16_R1.EnumCreatureType; diff --git a/nms/v1_16_r2/pom.xml b/nms/v1_16_r2/pom.xml index 41ad632c..ccf50bd6 100644 --- a/nms/v1_16_r2/pom.xml +++ b/nms/v1_16_r2/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSArmorStand.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSArmorStand.java index bf0cfa91..3ad1784f 100644 --- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSArmorStand.java +++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_16_R2; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_16_R2.AxisAlignedBB; import net.minecraft.server.v1_16_R2.DamageSource; import net.minecraft.server.v1_16_R2.Entity; diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSItem.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSItem.java index 50fbbb42..55a97693 100644 --- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSItem.java +++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_16_R2.Blocks; import net.minecraft.server.v1_16_R2.DamageSource; import net.minecraft.server.v1_16_R2.EntityHuman; diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSSlime.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSSlime.java index f6950aa3..0823cc6b 100644 --- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSSlime.java +++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_16_R2.AxisAlignedBB; import net.minecraft.server.v1_16_R2.DamageSource; import net.minecraft.server.v1_16_R2.EntityDamageSource; diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSEntityHelper.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSEntityHelper.java index ad83cf31..22ff7867 100644 --- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSEntityHelper.java +++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R2; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_16_R2.Entity; import net.minecraft.server.v1_16_R2.Packet; import net.minecraft.server.v1_16_R2.PlayerChunkMap.EntityTracker; diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java index 047d912b..7dd85bf7 100644 --- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java +++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_16_R2.Entity; import net.minecraft.server.v1_16_R2.EntityTypes; import net.minecraft.server.v1_16_R2.EnumCreatureType; diff --git a/nms/v1_16_r3/pom.xml b/nms/v1_16_r3/pom.xml index 99797784..52b9b756 100644 --- a/nms/v1_16_r3/pom.xml +++ b/nms/v1_16_r3/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSArmorStand.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSArmorStand.java index 12514cfe..95fe2674 100644 --- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSArmorStand.java +++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_16_R3; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_16_R3.AxisAlignedBB; import net.minecraft.server.v1_16_R3.DamageSource; import net.minecraft.server.v1_16_R3.Entity; diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSItem.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSItem.java index 191368c3..38b7cd1a 100644 --- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSItem.java +++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R3; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_16_R3.Blocks; import net.minecraft.server.v1_16_R3.DamageSource; import net.minecraft.server.v1_16_R3.EntityHuman; diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSSlime.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSSlime.java index 4c1d7b91..de3f2553 100644 --- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSSlime.java +++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R3; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_16_R3.AxisAlignedBB; import net.minecraft.server.v1_16_R3.DamageSource; import net.minecraft.server.v1_16_R3.EntityDamageSource; diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSEntityHelper.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSEntityHelper.java index c726d4d5..9aa608d8 100644 --- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSEntityHelper.java +++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_16_R3; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_16_R3.Entity; import net.minecraft.server.v1_16_R3.Packet; import net.minecraft.server.v1_16_R3.PlayerChunkMap.EntityTracker; diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java index 13af9ff6..d18e5438 100644 --- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java +++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_16_R3.Entity; import net.minecraft.server.v1_16_R3.EntityTypes; import net.minecraft.server.v1_16_R3.EnumCreatureType; diff --git a/nms/v1_8_r2/pom.xml b/nms/v1_8_r2/pom.xml index 67148635..1cb5d5d3 100644 --- a/nms/v1_8_r2/pom.xml +++ b/nms/v1_8_r2/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java index 3494928a..1f19bce3 100644 --- a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java +++ b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSArmorStand.java @@ -9,11 +9,11 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_8_R2.AxisAlignedBB; import net.minecraft.server.v1_8_R2.DamageSource; import net.minecraft.server.v1_8_R2.Entity; diff --git a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java index e889e166..2bc905b8 100644 --- a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java +++ b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_8_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_8_R2.Blocks; import net.minecraft.server.v1_8_R2.DamageSource; import net.minecraft.server.v1_8_R2.EntityHuman; diff --git a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSSlime.java b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSSlime.java index a1492ae4..10a2de1a 100644 --- a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSSlime.java +++ b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_8_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_8_R2.AxisAlignedBB; import net.minecraft.server.v1_8_R2.DamageSource; import net.minecraft.server.v1_8_R2.EntityDamageSource; diff --git a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSEntityHelper.java b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSEntityHelper.java index 1e48b2ab..6056152e 100644 --- a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSEntityHelper.java +++ b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_8_R2; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_8_R2.Entity; import net.minecraft.server.v1_8_R2.EntityTrackerEntry; import net.minecraft.server.v1_8_R2.Packet; diff --git a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java index 679609c1..454d595f 100644 --- a/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java +++ b/nms/v1_8_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R2/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_8_R2.Entity; import net.minecraft.server.v1_8_R2.EntityTypes; import net.minecraft.server.v1_8_R2.MathHelper; diff --git a/nms/v1_8_r3/pom.xml b/nms/v1_8_r3/pom.xml index 08b937b2..424172cd 100644 --- a/nms/v1_8_r3/pom.xml +++ b/nms/v1_8_r3/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java index df26d4ec..54344ac3 100644 --- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java +++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSArmorStand.java @@ -9,11 +9,11 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_8_R3.AxisAlignedBB; import net.minecraft.server.v1_8_R3.DamageSource; import net.minecraft.server.v1_8_R3.Entity; diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java index 1b518aa4..6ab4cc2f 100644 --- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java +++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_8_R3; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_8_R3.Blocks; import net.minecraft.server.v1_8_R3.DamageSource; import net.minecraft.server.v1_8_R3.EntityHuman; diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSSlime.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSSlime.java index b1d9a4aa..0e5fe2d5 100644 --- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSSlime.java +++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_8_R3; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_8_R3.AxisAlignedBB; import net.minecraft.server.v1_8_R3.DamageSource; import net.minecraft.server.v1_8_R3.EntityDamageSource; diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSEntityHelper.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSEntityHelper.java index 48e316f0..a5f189c0 100644 --- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSEntityHelper.java +++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_8_R3; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityTrackerEntry; import net.minecraft.server.v1_8_R3.Packet; diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java index 8117e095..ff3b5ebd 100644 --- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java +++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityTypes; import net.minecraft.server.v1_8_R3.MathHelper; diff --git a/nms/v1_9_r1/pom.xml b/nms/v1_9_r1/pom.xml index 95df754b..ca155ec9 100644 --- a/nms/v1_9_r1/pom.xml +++ b/nms/v1_9_r1/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java index da7f11b4..adb62eb6 100644 --- a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java +++ b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_9_R1; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_9_R1.AxisAlignedBB; import net.minecraft.server.v1_9_R1.DamageSource; import net.minecraft.server.v1_9_R1.Entity; diff --git a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java index 74a3f651..556a5bd4 100644 --- a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java +++ b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_9_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_9_R1.Blocks; import net.minecraft.server.v1_9_R1.DamageSource; import net.minecraft.server.v1_9_R1.Entity; diff --git a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSSlime.java b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSSlime.java index 59811bbd..7fbe4eaf 100644 --- a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSSlime.java +++ b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_9_R1; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_9_R1.AxisAlignedBB; import net.minecraft.server.v1_9_R1.DamageSource; import net.minecraft.server.v1_9_R1.Entity; diff --git a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSEntityHelper.java b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSEntityHelper.java index 023a6839..db92ec43 100644 --- a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSEntityHelper.java +++ b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_9_R1; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_9_R1.Entity; import net.minecraft.server.v1_9_R1.EntityTrackerEntry; import net.minecraft.server.v1_9_R1.Packet; diff --git a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java index af9a5462..5c0f7151 100644 --- a/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java +++ b/nms/v1_9_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R1/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_9_R1.Entity; import net.minecraft.server.v1_9_R1.EntityTypes; import net.minecraft.server.v1_9_R1.MathHelper; diff --git a/nms/v1_9_r2/pom.xml b/nms/v1_9_r2/pom.xml index c0a6b3ee..4321c042 100644 --- a/nms/v1_9_r2/pom.xml +++ b/nms/v1_9_r2/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java index d4048b11..defcb943 100644 --- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java +++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSArmorStand.java @@ -8,11 +8,11 @@ package me.filoghost.holographicdisplays.nms.v1_9_R2; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.reflection.ReflectField; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import net.minecraft.server.v1_9_R2.AxisAlignedBB; import net.minecraft.server.v1_9_R2.DamageSource; import net.minecraft.server.v1_9_R2.Entity; diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java index fcafc51d..19e44365 100644 --- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java +++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSItem.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.nms.v1_9_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSCommons; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSCommons; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_9_R2.Blocks; import net.minecraft.server.v1_9_R2.DamageSource; import net.minecraft.server.v1_9_R2.Entity; diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSSlime.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSSlime.java index a44b25a9..82ca7fa7 100644 --- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSSlime.java +++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/EntityNMSSlime.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.nms.v1_9_R2; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import net.minecraft.server.v1_9_R2.AxisAlignedBB; import net.minecraft.server.v1_9_R2.DamageSource; import net.minecraft.server.v1_9_R2.Entity; diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSEntityHelper.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSEntityHelper.java index ce5636f9..2ef439b5 100644 --- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSEntityHelper.java +++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSEntityHelper.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.nms.v1_9_R2; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntityHelper; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntityHelper; import net.minecraft.server.v1_9_R2.Entity; import net.minecraft.server.v1_9_R2.EntityTrackerEntry; import net.minecraft.server.v1_9_R2.Packet; diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java index e47a7010..566ff872 100644 --- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java +++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java @@ -9,14 +9,14 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.reflection.ClassToken; import me.filoghost.fcommons.reflection.ReflectField; import me.filoghost.fcommons.reflection.ReflectMethod; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import net.minecraft.server.v1_9_R2.Entity; import net.minecraft.server.v1_9_R2.EntityTypes; import net.minecraft.server.v1_9_R2.MathHelper; diff --git a/plugin/pom.xml b/plugin/pom.xml index 980b44e9..af4fe1b0 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -20,7 +20,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common 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 bafb42bc..217f3339 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java @@ -16,8 +16,8 @@ import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTra import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook; import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.disk.HologramDatabase; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPIProvider.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPIProvider.java index 905ff3e2..74f40792 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPIProvider.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/current/DefaultHolographicDisplaysAPIProvider.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.api.current; import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI; import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologramManager; import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; import org.bukkit.entity.Entity; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2HologramsAPIProvider.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2HologramsAPIProvider.java index 6bf19bff..578d51e9 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2HologramsAPIProvider.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/api/v2/V2HologramsAPIProvider.java @@ -9,7 +9,7 @@ import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.internal.HologramsAPIProvider; import com.gmail.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologram; 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/bridge/bungeecord/BungeeServerTracker.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java index 546f100f..d4840b72 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java @@ -9,7 +9,7 @@ import me.filoghost.fcommons.logging.Log; import me.filoghost.holographicdisplays.plugin.HolographicDisplays; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger.PingResponse; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger.ServerPinger; -import me.filoghost.holographicdisplays.core.DebugLogger; +import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.disk.ServerAddress; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java index 6d08052a..a465e7f5 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/pinger/PingResponse.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger; -import me.filoghost.holographicdisplays.core.DebugLogger; +import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.plugin.disk.ServerAddress; import org.json.simple.JSONObject; import org.json.simple.JSONValue; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java index 881bd59d..cc310192 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java @@ -18,12 +18,12 @@ import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.Wrapper import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntityLiving; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.TrackedLine; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardTextLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import me.filoghost.holographicdisplays.plugin.util.NMSVersion; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java index ad287de5..2e4aa8e6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java @@ -14,15 +14,15 @@ import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.Wrapper import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntity; import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntity.ObjectTypes; import me.filoghost.holographicdisplays.plugin.bridge.protocollib.packet.WrapperPlayServerSpawnEntityLiving; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.hologram.StandardTextLine; -import me.filoghost.holographicdisplays.core.hologram.StandardTouchableLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; +import me.filoghost.holographicdisplays.common.hologram.StandardTouchableLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import me.filoghost.holographicdisplays.plugin.util.NMSVersion; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java index fa412679..16ca6c2b 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/ProtocolLibHook.java @@ -8,10 +8,10 @@ package me.filoghost.holographicdisplays.plugin.bridge.protocollib; import me.filoghost.fcommons.Preconditions; import me.filoghost.fcommons.logging.ErrorCollector; import me.filoghost.fcommons.logging.Log; -import me.filoghost.holographicdisplays.core.Utils; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.Utils; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.util.VersionUtils; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java index 2ec57e8f..fdf2b751 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java @@ -31,8 +31,8 @@ import me.filoghost.holographicdisplays.plugin.commands.subs.HelpCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.InfoCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.InsertlineCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.ListCommand; -import me.filoghost.holographicdisplays.core.Utils; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.Utils; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java index 7c0236e5..8a0a2391 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandValidate.java @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.plugin.commands; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; -import me.filoghost.holographicdisplays.core.Utils; +import me.filoghost.holographicdisplays.common.Utils; import me.filoghost.holographicdisplays.plugin.disk.HologramLineParser; import me.filoghost.holographicdisplays.plugin.disk.HologramLoadException; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java index cc5f5758..3f6cf88d 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java @@ -8,9 +8,9 @@ package me.filoghost.holographicdisplays.plugin.commands.subs; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.holographicdisplays.plugin.Colors; import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java index 46582913..b023495e 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/Configuration.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.disk; import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.logging.ErrorCollector; -import me.filoghost.holographicdisplays.core.DebugLogger; +import me.filoghost.holographicdisplays.common.DebugLogger; import org.bukkit.ChatColor; import java.time.DateTimeException; 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 daeebbad..8bd88c83 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 @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.Hologram; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramAdapter; 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 5ca481dd..f975ab19 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 @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.holographicdisplays.api.line.HologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; +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 12f5138b..b402eeef 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 @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.holographicdisplays.api.Hologram; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologramManager; import org.bukkit.Location; 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 b14bdc58..b54c4368 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 @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.VisibilitySettings; import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import me.filoghost.holographicdisplays.plugin.api.v2.V2VisibilityManagerAdapter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java index 62a4a0de..f7690f76 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java @@ -6,9 +6,9 @@ package me.filoghost.holographicdisplays.plugin.hologram.base; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import org.bukkit.Location; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramLine.java index b9716acd..fc67c5e4 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramLine.java @@ -6,11 +6,11 @@ package me.filoghost.holographicdisplays.plugin.hologram.base; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import org.bukkit.World; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramManager.java index 56b6c636..a8a06d1f 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramManager.java @@ -6,7 +6,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.base; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.core.hologram.StandardHologram; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import org.bukkit.Chunk; import java.util.ArrayList; 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 df7cbf05..960d0ff9 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 @@ -8,10 +8,10 @@ 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.core.hologram.StandardItemLine; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSItem; +import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTextLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTextLine.java index 976808f0..d2cca201 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTextLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseTextLine.java @@ -5,9 +5,9 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.base; -import me.filoghost.holographicdisplays.core.hologram.StandardTextLine; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; import org.bukkit.World; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; 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 463c0cf6..c9fbaacb 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 @@ -7,11 +7,11 @@ package me.filoghost.holographicdisplays.plugin.hologram.base; import me.filoghost.fcommons.logging.Log; import me.filoghost.holographicdisplays.api.handler.TouchHandler; -import me.filoghost.holographicdisplays.core.DebugLogger; -import me.filoghost.holographicdisplays.core.hologram.StandardTouchableLine; -import me.filoghost.holographicdisplays.core.nms.SpawnFailedException; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.core.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.common.DebugLogger; +import me.filoghost.holographicdisplays.common.hologram.StandardTouchableLine; +import me.filoghost.holographicdisplays.common.nms.SpawnFailedException; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; import org.bukkit.World; import org.bukkit.entity.Player; import org.jetbrains.annotations.Nullable; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java index 8350d572..c877b46c 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java @@ -8,7 +8,7 @@ package me.filoghost.holographicdisplays.plugin.hologram.internal; import me.filoghost.holographicdisplays.plugin.HolographicDisplays; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologram; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramLine.java index c9771118..45dd5529 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramLine.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.internal; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; public interface InternalHologramLine extends StandardHologramLine { diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramManager.java index 256cf170..8e170345 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologramManager.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.internal; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologramManager; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import org.bukkit.Location; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java index 7b0aae9c..1b25d301 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/ChunkListener.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.listener; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologramManager; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; import me.filoghost.holographicdisplays.plugin.util.SchedulerUtils; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java index fe1b0cc6..3a0e68ea 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.plugin.listener; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.core.hologram.StandardHologramLine; -import me.filoghost.holographicdisplays.core.hologram.StandardTouchableLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; +import me.filoghost.holographicdisplays.common.hologram.StandardTouchableLine; import org.bukkit.GameMode; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java index 5c1fea51..c066452a 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/SpawnListener.java @@ -5,7 +5,7 @@ */ package me.filoghost.holographicdisplays.plugin.listener; -import me.filoghost.holographicdisplays.core.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java index 537522df..5d1ecba2 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java @@ -7,7 +7,7 @@ package me.filoghost.holographicdisplays.plugin.placeholder.internal; import me.filoghost.fcommons.config.exception.ConfigSaveException; import me.filoghost.fcommons.logging.ErrorCollector; -import me.filoghost.holographicdisplays.core.DebugLogger; +import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.disk.TextFormatter; import me.filoghost.holographicdisplays.api.placeholder.Placeholder; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java index bd8ace10..a6b572ae 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/PlaceholderLineTracker.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.placeholder.tracking; -import me.filoghost.holographicdisplays.core.hologram.StandardTextLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders; import org.jetbrains.annotations.Nullable; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java index 614cc73b..e13b74e1 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java @@ -5,8 +5,8 @@ */ package me.filoghost.holographicdisplays.plugin.placeholder.tracking; -import me.filoghost.holographicdisplays.core.hologram.StandardTextLine; -import me.filoghost.holographicdisplays.core.nms.entity.NMSArmorStand; +import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; +import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderReplaceFunction; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java index ce0b3445..4ed3c34e 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/util/NMSVersion.java @@ -6,8 +6,8 @@ package me.filoghost.holographicdisplays.plugin.util; import me.filoghost.fcommons.Preconditions; -import me.filoghost.holographicdisplays.core.nms.NMSManager; -import me.filoghost.holographicdisplays.core.nms.ProtocolPacketSettings; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; import org.bukkit.Bukkit; import java.util.regex.Matcher; diff --git a/pom.xml b/pom.xml index 567392ec..9ec47749 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ - core + common api legacy-api nms @@ -73,7 +73,7 @@ ${project.groupId} - holographicdisplays-core + holographicdisplays-common ${project.version}