diff --git a/legacy-v1/pom.xml b/legacy-api/pom.xml similarity index 92% rename from legacy-v1/pom.xml rename to legacy-api/pom.xml index 4639bc87..042665ae 100644 --- a/legacy-v1/pom.xml +++ b/legacy-api/pom.xml @@ -9,8 +9,8 @@ 3.0.0-SNAPSHOT - holographicdisplays-legacy-v1 - HolographicDisplays Legacy v1 + holographicdisplays-legacy-api + HolographicDisplays Legacy API diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/FloatingItem.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/FloatingItem.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/FloatingItem.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/FloatingItem.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/Hologram.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/Hologram.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/Hologram.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/Hologram.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/HolographicDisplaysAPI.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/HolographicDisplaysAPI.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/HolographicDisplaysAPI.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/HolographicDisplaysAPI.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/ItemTouchHandler.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/ItemTouchHandler.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/ItemTouchHandler.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/ItemTouchHandler.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/PickupHandler.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/PickupHandler.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/PickupHandler.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/PickupHandler.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/TouchHandler.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/TouchHandler.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/TouchHandler.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/TouchHandler.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/FloatingItemAdapter.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/FloatingItemAdapter.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/FloatingItemAdapter.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/FloatingItemAdapter.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramAdapter.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramAdapter.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramAdapter.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramAdapter.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramTouchHandlerAdapter.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramTouchHandlerAdapter.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramTouchHandlerAdapter.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/HologramTouchHandlerAdapter.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/ItemTouchHandlerAdapter.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/ItemTouchHandlerAdapter.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/ItemTouchHandlerAdapter.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/ItemTouchHandlerAdapter.java diff --git a/legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/PickupHandlerAdapter.java b/legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/PickupHandlerAdapter.java similarity index 100% rename from legacy-v1/src/main/java/com/gmail/filoghost/holograms/api/adapter/PickupHandlerAdapter.java rename to legacy-api/src/main/java/com/gmail/filoghost/holograms/api/adapter/PickupHandlerAdapter.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/Hologram.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/Hologram.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/Hologram.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/Hologram.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/VisibilityManager.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/VisibilityManager.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/VisibilityManager.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/VisibilityManager.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/PickupHandler.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/PickupHandler.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/PickupHandler.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/PickupHandler.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/TouchHandler.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/TouchHandler.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/TouchHandler.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/handler/TouchHandler.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/BackendAPI.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/BackendAPI.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/BackendAPI.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/BackendAPI.java index 714e7ae2..45a7a374 100644 --- a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/BackendAPI.java +++ b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/internal/BackendAPI.java @@ -5,8 +5,8 @@ */ package com.gmail.filoghost.holographicdisplays.api.internal; -import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; +import com.gmail.filoghost.holographicdisplays.api.Hologram; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.plugin.Plugin; diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/CollectableLine.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/CollectableLine.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/CollectableLine.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/CollectableLine.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/HologramLine.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/HologramLine.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/HologramLine.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/HologramLine.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/ItemLine.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/ItemLine.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/ItemLine.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/ItemLine.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TextLine.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TextLine.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TextLine.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TextLine.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TouchableLine.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TouchableLine.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TouchableLine.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/line/TouchableLine.java diff --git a/legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java b/legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java similarity index 100% rename from legacy-v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java rename to legacy-api/src/main/java/com/gmail/filoghost/holographicdisplays/api/placeholder/PlaceholderReplacer.java diff --git a/legacy-v2/pom.xml b/legacy-v2/pom.xml deleted file mode 100644 index 7af6ab37..00000000 --- a/legacy-v2/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - - me.filoghost.holographicdisplays - holographicdisplays-parent - 3.0.0-SNAPSHOT - - - holographicdisplays-legacy-v2 - HolographicDisplays Legacy v2 - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - ${project.groupId} - holographicdisplays-api - - - - ${project.groupId} - holographicdisplays-common - - - - org.spigotmc - spigot-api - - - - diff --git a/plugin/pom.xml b/plugin/pom.xml index 1fba2e9b..f6e4a5ef 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -42,13 +42,7 @@ ${project.groupId} - holographicdisplays-legacy-v1 - runtime - - - - ${project.groupId} - holographicdisplays-legacy-v2 + holographicdisplays-legacy-api runtime diff --git a/pom.xml b/pom.xml index 818c0ff7..3167f2cc 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,7 @@ common api - legacy-v1 - legacy-v2 + legacy-api nms plugin example @@ -54,13 +53,7 @@ ${project.groupId} - holographicdisplays-legacy-v1 - ${project.version} - - - - ${project.groupId} - holographicdisplays-legacy-v2 + holographicdisplays-legacy-api ${project.version}