From 3ffac16ebfa8fb0dbd2db380f0eeaaa3db553286 Mon Sep 17 00:00:00 2001
From: OliverSchlueter <OliverSchlueter@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:49:23 +0200
Subject: [PATCH] Move Hologram1_20_6.java to main module

---
 build.gradle.kts                              |  3 +-
 implementation_1_20_6/build.gradle.kts        | 32 -------------------
 settings.gradle.kts                           |  1 -
 .../oliver/fancyholograms/FancyHolograms.java |  2 +-
 .../hologram/version/HologramImpl.java        |  4 +--
 5 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 implementation_1_20_6/build.gradle.kts
 rename implementation_1_20_6/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_6.java => src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java (98%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5fe8015a..567f184d 100644
--- 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
deleted file mode 100644
index 440c6196..00000000
--- a/implementation_1_20_6/build.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-plugins {
-    id("java-library")
-}
-
-
-val minecraftVersion = "1.20.6"
-
-dependencies {
-    compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
-
-    compileOnly(project(":api"))
-    compileOnly("de.oliver:FancyLib:${findProperty("fancyLibVersion")}")
-    compileOnly("de.oliver:FancySitula:${findProperty("fancySitulaVersion")}")
-    compileOnly("com.viaversion:viaversion-api:${findProperty("viaversionVersion")}")
-}
-
-
-tasks {
-    named("assemble") {
-        dependsOn(named("reobfJar"))
-    }
-
-    javadoc {
-        options.encoding = Charsets.UTF_8.name()
-    }
-
-    compileJava {
-        options.encoding = Charsets.UTF_8.name()
-
-        options.release.set(21)
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 58a8d006..854f7dd2 100644
--- 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
index ea0b28ee..e2f22e1f 100644
--- 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/implementation_1_20_6/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_6.java b/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java
similarity index 98%
rename from implementation_1_20_6/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_6.java
rename to src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java
index 5f6d0f81..e94e553f 100644
--- a/implementation_1_20_6/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_6.java
+++ b/src/main/java/de/oliver/fancyholograms/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);
     }