Fix multiversion folder structure & Slightly adjust Gradle configuration

Iridium-Development · Mar 6, 2024 · e3ed77f · e3ed77f
1 parent 7f293f6
commit e3ed77f
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 45 deletions.
diff --git a/...e/multiversion/MultiVersion_V1_18_R2.java → ...e/multiversion/MultiVersion_V1_18_R2.java b/...e/multiversion/MultiVersion_V1_18_R2.java → ...e/multiversion/MultiVersion_V1_18_R2.java
@@ -1,7 +1,6 @@
-package iridiumcore.multiversion;
+package com.iridium.iridiumcore.multiversion;
 
 import com.cryptomorin.xseries.XMaterial;
-import com.iridium.iridiumcore.multiversion.MultiVersion;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;

diff --git a/...in/java/iridiumcore/nms/NMS_V1_18_R2.java → ...iridium/iridiumcore/nms/NMS_V1_18_R2.java b/...in/java/iridiumcore/nms/NMS_V1_18_R2.java → ...iridium/iridiumcore/nms/NMS_V1_18_R2.java
@@ -1,7 +1,6 @@
-package iridiumcore.nms;
+package com.iridium.iridiumcore.nms;
 
 import com.iridium.iridiumcore.Color;
-import com.iridium.iridiumcore.nms.NMS;
 import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
 import net.minecraft.server.MinecraftServer;

diff --git a/...e/multiversion/MultiVersion_V1_19_R1.java → ...e/multiversion/MultiVersion_V1_19_R1.java b/...e/multiversion/MultiVersion_V1_19_R1.java → ...e/multiversion/MultiVersion_V1_19_R1.java
@@ -1,7 +1,6 @@
-package iridiumcore.multiversion;
+package com.iridium.iridiumcore.multiversion;
 
 import com.cryptomorin.xseries.XMaterial;
-import com.iridium.iridiumcore.multiversion.MultiVersion;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;

diff --git a/...in/java/iridiumcore/nms/NMS_V1_19_R1.java → ...iridium/iridiumcore/nms/NMS_V1_19_R1.java b/...in/java/iridiumcore/nms/NMS_V1_19_R1.java → ...iridium/iridiumcore/nms/NMS_V1_19_R1.java
@@ -1,14 +1,9 @@
-package iridiumcore.nms;
+package com.iridium.iridiumcore.nms;
 
 import com.iridium.iridiumcore.Color;
-import com.iridium.iridiumcore.nms.NMS;
 import net.minecraft.server.MinecraftServer;
-import org.bukkit.WorldBorder;
+import org.bukkit.*;
 import org.bukkit.World.Environment;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.List;

diff --git a/...e/multiversion/MultiVersion_V1_19_R2.java → ...e/multiversion/MultiVersion_V1_19_R2.java b/...e/multiversion/MultiVersion_V1_19_R2.java → ...e/multiversion/MultiVersion_V1_19_R2.java
@@ -1,7 +1,6 @@
-package iridiumcore.multiversion;
+package com.iridium.iridiumcore.multiversion;
 
 import com.cryptomorin.xseries.XMaterial;
-import com.iridium.iridiumcore.multiversion.MultiVersion;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;

diff --git a/...in/java/iridiumcore/nms/NMS_V1_19_R2.java → ...iridium/iridiumcore/nms/NMS_V1_19_R2.java b/...in/java/iridiumcore/nms/NMS_V1_19_R2.java → ...iridium/iridiumcore/nms/NMS_V1_19_R2.java
@@ -1,14 +1,9 @@
-package iridiumcore.nms;
+package com.iridium.iridiumcore.nms;
 
 import com.iridium.iridiumcore.Color;
-import com.iridium.iridiumcore.nms.NMS;
 import net.minecraft.server.MinecraftServer;
-import org.bukkit.WorldBorder;
+import org.bukkit.*;
 import org.bukkit.World.Environment;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.List;

diff --git a/...e/multiversion/MultiVersion_V1_19_R3.java → ...e/multiversion/MultiVersion_V1_19_R3.java b/...e/multiversion/MultiVersion_V1_19_R3.java → ...e/multiversion/MultiVersion_V1_19_R3.java
@@ -1,7 +1,6 @@
-package iridiumcore.multiversion;
+package com.iridium.iridiumcore.multiversion;
 
 import com.cryptomorin.xseries.XMaterial;
-import com.iridium.iridiumcore.multiversion.MultiVersion;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;

diff --git a/...in/java/iridiumcore/nms/NMS_V1_19_R3.java → ...iridium/iridiumcore/nms/NMS_V1_19_R3.java b/...in/java/iridiumcore/nms/NMS_V1_19_R3.java → ...iridium/iridiumcore/nms/NMS_V1_19_R3.java
@@ -1,7 +1,6 @@
-package iridiumcore.nms;
+package com.iridium.iridiumcore.nms;
 
 import com.iridium.iridiumcore.Color;
-import com.iridium.iridiumcore.nms.NMS;
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.*;
 import org.bukkit.World.Environment;

diff --git a/...e/multiversion/MultiVersion_V1_20_R1.java → ...e/multiversion/MultiVersion_V1_20_R1.java b/...e/multiversion/MultiVersion_V1_20_R1.java → ...e/multiversion/MultiVersion_V1_20_R1.java
@@ -1,7 +1,6 @@
-package iridiumcore.multiversion;
+package com.iridium.iridiumcore.multiversion;
 
 import com.cryptomorin.xseries.XMaterial;
-import com.iridium.iridiumcore.multiversion.MultiVersion;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;

diff --git a/...in/java/iridiumcore/nms/NMS_V1_20_R1.java → ...iridium/iridiumcore/nms/NMS_V1_20_R1.java b/...in/java/iridiumcore/nms/NMS_V1_20_R1.java → ...iridium/iridiumcore/nms/NMS_V1_20_R1.java
@@ -1,7 +1,6 @@
-package iridiumcore.nms;
+package com.iridium.iridiumcore.nms;
 
 import com.iridium.iridiumcore.Color;
-import com.iridium.iridiumcore.nms.NMS;
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.*;
 import org.bukkit.World.Environment;

diff --git a/...e/multiversion/MultiVersion_V1_20_R2.java → ...e/multiversion/MultiVersion_V1_20_R2.java b/...e/multiversion/MultiVersion_V1_20_R2.java → ...e/multiversion/MultiVersion_V1_20_R2.java
@@ -1,7 +1,6 @@
-package iridiumcore.multiversion;
+package com.iridium.iridiumcore.multiversion;
 
 import com.cryptomorin.xseries.XMaterial;
-import com.iridium.iridiumcore.multiversion.MultiVersion;
 import io.papermc.lib.PaperLib;
 import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;

diff --git a/...in/java/iridiumcore/nms/NMS_V1_20_R2.java → ...iridium/iridiumcore/nms/NMS_V1_20_R2.java b/...in/java/iridiumcore/nms/NMS_V1_20_R2.java → ...iridium/iridiumcore/nms/NMS_V1_20_R2.java
@@ -1,7 +1,6 @@
-package iridiumcore.nms;
+package com.iridium.iridiumcore.nms;
 
 import com.iridium.iridiumcore.Color;
-import com.iridium.iridiumcore.nms.NMS;
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.*;
 import org.bukkit.World.Environment;

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -1,22 +1,22 @@
 dependencies {
+    // Include all the multiversion submodules
+    val multiVersionProjects = project(":multiversion").dependencyProject.subprojects
+    multiVersionProjects.forEach { implementation(it) }
+
     // Dependencies that we want to shade in
     implementation("de.tr7zw:item-nbt-api:2.12.2")
     implementation("com.iridium:IridiumColorAPI:1.0.9")
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
-    implementation("com.fasterxml.jackson.core:jackson-core:2.14.2")
-    implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.2")
-    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.14.3")
+    implementation("com.fasterxml.jackson.core:jackson-core:2.14.3")
+    implementation("com.fasterxml.jackson.core:jackson-annotations:2.14.3")
+    implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.3")
     implementation("org.yaml:snakeyaml:2.2")
     implementation("io.papermc:paperlib:1.0.8")
 
     // Other dependencies that are not required or already available at runtime
     compileOnly("org.jetbrains:annotations:24.1.0")
     compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
-
-    // Include all the nms sub-modules
-    val multiVersionProjects = project(":multiversion").dependencyProject.subprojects
-    multiVersionProjects.forEach { compileOnly(it) }
 }
 
 tasks {

diff --git a/plugin/src/main/java/com/iridium/iridiumcore/MinecraftVersion.java b/plugin/src/main/java/com/iridium/iridiumcore/MinecraftVersion.java
@@ -2,8 +2,6 @@
 
 import com.iridium.iridiumcore.multiversion.*;
 import com.iridium.iridiumcore.nms.*;
-import iridiumcore.multiversion.*;
-import iridiumcore.nms.*;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;