Move Hologram1_20_6.java to main module

FancyMcPlugins · Aug 12, 2024 · 3ffac16 · 3ffac16
1 parent adf2dfa
commit 3ffac16
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 38 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,7 +22,7 @@ val supportedVersions =
 allprojects {
     group = "de.oliver"
     val buildId = System.getenv("BUILD_ID")
-    version = "2.3.1" + (if (buildId != null) ".$buildId" else "")
+    version = "2.3.1-DEV" + (if (buildId != null) ".$buildId" else "")
     description = "Simple, lightweight and fast hologram plugin using display entities"
 
     repositories {
@@ -43,7 +43,6 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:${findProperty("minecraftVersion")}-R0.1-SNAPSHOT")
 
     implementation(project(":api"))
-    implementation(project(":implementation_1_20_6"))
     implementation(project(":implementation_1_20_4", configuration = "reobf"))
     implementation(project(":implementation_1_20_2", configuration = "reobf"))
     implementation(project(":implementation_1_20_1", configuration = "reobf"))

diff --git a/implementation_1_20_6/build.gradle.kts b/implementation_1_20_6/build.gradle.kts
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,6 @@
 rootProject.name = "FancyHolograms"
 
 include("api")
-include("implementation_1_20_6")
 include("implementation_1_20_4")
 include("implementation_1_20_2")
 include("implementation_1_20_1")

diff --git a/src/main/java/de/oliver/fancyholograms/FancyHolograms.java b/src/main/java/de/oliver/fancyholograms/FancyHolograms.java
@@ -223,7 +223,7 @@ public ExecutorService getFileStorageExecutor() {
 
         // check if the server version is supported by FancySitula
         if (ServerVersion.isVersionSupported(version)) {
-            return Hologram1_20_6::new;
+            return HologramImpl::new;
         }
 
         return switch (version) {

diff --git a/...rams/hologram/version/Hologram1_20_6.java → ...ograms/hologram/version/HologramImpl.java b/...rams/hologram/version/Hologram1_20_6.java → ...ograms/hologram/version/HologramImpl.java
@@ -11,11 +11,11 @@
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
 
-public final class Hologram1_20_6 extends Hologram {
+public final class HologramImpl extends Hologram {
 
     private FS_Display fsDisplay;
 
-    public Hologram1_20_6(@NotNull final HologramData data) {
+    public HologramImpl(@NotNull final HologramData data) {
         super(data);
     }