Remove multi-module Gradle project (#108)

* Remove multi-module Gradle project

* Minimize the jar

* Add softdepends

build.gradle.kts

@@ -7,52 +7,52 @@ plugins {
 group = "com.iridium"
 version = "3.0.0"
 description = "IridiumSkyblock"
+java.sourceCompatibility = JavaVersion.VERSION_1_8
 
-allprojects {
-    apply(plugin = "java")
-
-    java.sourceCompatibility = JavaVersion.VERSION_1_8
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven("https://repo.codemc.org/repository/maven-public/")
-        maven("https://repo.mvdw-software.com/content/groups/public/")
-        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-        maven("https://maven.sk89q.com/artifactory/repo")
-        maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-        maven("https://ci.ender.zone/plugin/repository/everything/")
-        maven("https://jitpack.io")
-        maven("https://repo.rosewooddev.io/repository/public/")
-        maven("https://nexus.savagelabs.net/repository/maven-releases/")
-        maven("https://papermc.io/repo/repository/maven-public/")
-        maven("https://repo.jeff-media.de/maven2/")
-    }
-
-    dependencies {
-        // Dependencies that we want to shade in
-        implementation("org.jetbrains:annotations:16.0.1")
-        implementation("com.iridium:IridiumCore:1.0.0")
+repositories {
+    maven("https://repo.mvdw-software.com/content/groups/public/")
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+    maven("https://ci.ender.zone/plugin/repository/everything/")
+    maven("https://jitpack.io")
+    maven("https://nexus.savagelabs.net/repository/maven-releases/")
+    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://repo.jeff-media.de/maven2/")
+}
 
-        // Other dependencies that are not required or already available at runtime
-        compileOnly("org.projectlombok:lombok:1.18.20")
+dependencies {
+    // Dependencies that we want to shade in
+    implementation("org.jetbrains:annotations:16.0.1")
+    implementation("com.iridium:IridiumCore:1.0.0")
+    implementation("org.bstats:bstats-bukkit:2.2.1")
+    implementation("org.jetbrains:annotations:16.0.1")
+    implementation("com.github.j256:ormlite-core:master-SNAPSHOT")
+    implementation("com.j256.ormlite:ormlite-jdbc:5.3")
+    implementation("com.fasterxml.jackson.core:jackson-annotations:2.12.1")
+    implementation("de.jeff_media:SpigotUpdateChecker:1.2.0")
 
-        // Enable lombok annotation processing
-        annotationProcessor("org.projectlombok:lombok:1.18.20")
+    // Other dependencies that are not required or already available at runtime
+    compileOnly("org.projectlombok:lombok:1.18.20")
+    compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
+    compileOnly("net.ess3:EssentialsXSpawn:2.16.1")
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7")
+    compileOnly("me.clip:placeholderapi:2.9.2")
+    compileOnly("be.maximvdw:MVdWPlaceholderAPI:2.1.1-SNAPSHOT") {
+        exclude("org.spigotmc")
     }
-}
 
-dependencies {
-    // Shade all the sub-projects into the jar
-    subprojects.forEach { implementation(it) }
+    // Enable lombok annotation processing
+    annotationProcessor("org.projectlombok:lombok:1.18.20")
 }
 
 tasks {
+    // "Replace" the build task with the shadowJar task (probably bad but who cares)
     jar {
         dependsOn("shadowJar")
         enabled = false
     }
 
+    // Relocate dependencies, remove the archive classifier suffix
     shadowJar {
         archiveClassifier.set("")
         relocate("de.tr7zw.changeme.nbtapi", "com.iridium.iridiumskyblock.dependencies.nbtapi")
@@ -63,13 +63,27 @@ tasks {
         relocate("com.fasterxml.jackson", "com.iridium.iridiumskyblock.dependencies.fasterxml")
         relocate("com.j256.ormlite", "com.iridium.iridiumskyblock.dependencies.ormlite")
         relocate("org.bstats", "com.iridium.iridiumskyblock.dependencies.bstats")
+
+        minimize()
     }
 
+    // Set UTF-8 as the encoding
     compileJava {
         options.encoding = "UTF-8"
     }
+
+    // Process Placeholders for the plugin.yml
+    processResources {
+        filesMatching("**/plugin.yml") {
+            expand(rootProject.project.properties)
+        }
+
+        // Always re-run this task
+        outputs.upToDateWhen { false }
+    }
 }
 
+// Maven publishing
 publishing {
     publications.create<MavenPublication>("maven") {
         from(components["java"])

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,18 +1 @@
 rootProject.name = "IridiumSkyblock"
-include("plugin")
-include("multiversion")
-include("multiversion:common")
-include("multiversion:v1_16_R3")
-include("multiversion:v1_16_R2")
-include("multiversion:v1_16_R1")
-include("multiversion:v1_15_R1")
-include("multiversion:v1_14_R1")
-include("multiversion:v1_13_R2")
-include("multiversion:v1_13_R1")
-include("multiversion:v1_12_R1")
-include("multiversion:v1_11_R1")
-include("multiversion:v1_10_R1")
-include("multiversion:v1_9_R2")
-include("multiversion:v1_9_R1")
-include("multiversion:v1_8_R3")
-include("multiversion:v1_8_R2")

plugin/src/main/java/com/iridium/iridiumskyblock/IridiumSkyblock.java → src/main/java/com/iridium/iridiumskyblock/IridiumSkyblock.java

@@ -349,15 +349,33 @@ public void loadConfigs() {
         if (!schematicFolder.exists()) {
             schematicFolder.mkdir();
         }
-        saveFile(schematicFolder, "desert.iridiumschem");
-        saveFile(schematicFolder, "mushroom.iridiumschem");
-        saveFile(schematicFolder, "jungle.iridiumschem");
-        saveFile(schematicFolder, "desert_nether.iridiumschem");
-        saveFile(schematicFolder, "mushroom_nether.iridiumschem");
-        saveFile(schematicFolder, "jungle_nether.iridiumschem");
-        saveFile(schematicFolder, "desert_end.iridiumschem");
-        saveFile(schematicFolder, "mushroom_end.iridiumschem");
-        saveFile(schematicFolder, "jungle_end.iridiumschem");
+        saveFile(schematicFolder,
+            "desert.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "mushroom.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "jungle.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "desert_nether.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "mushroom_nether.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "jungle_nether.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "desert_end.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "mushroom_end.iridiumschem"
+        );
+        saveFile(schematicFolder,
+            "jungle_end.iridiumschem"
+        );
     }
 
     private void saveFile(File parent, String name) {

plugin/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java → src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java

@@ -18,11 +18,29 @@ public class Schematics {
 
     public Map<String, SchematicConfig> schematics = ImmutableMap.<String, SchematicConfig>builder()
             .put("desert", new SchematicConfig(new Item(XMaterial.PLAYER_HEAD, 11, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGY0OTNkZDgwNjUzM2Q5ZDIwZTg0OTUzOTU0MzY1ZjRkMzY5NzA5Y2ViYzlkZGVmMDIyZDFmZDQwZDg2YTY4ZiJ9fX0=", 1, "&b&lDesert Island", Collections.singletonList("&7A starter desert island.")),
-                    -1.5, 95, -0.5, 90, new SchematicWorld(XBiome.PLAINS, "desert.iridiumschem"), new SchematicWorld(XBiome.NETHER_WASTES, "desert_nether.iridiumschem"), new SchematicWorld(XBiome.THE_END, "desert_end.iridiumschem")))
+                    -1.5, 95, -0.5, 90, new SchematicWorld(XBiome.PLAINS,
+                "desert.iridiumschem"
+            ), new SchematicWorld(XBiome.NETHER_WASTES,
+                "desert_nether.iridiumschem"
+            ), new SchematicWorld(XBiome.THE_END,
+                "desert_end.iridiumschem"
+            )))
             .put("jungle", new SchematicConfig(new Item(XMaterial.PLAYER_HEAD, 13, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjgzYWRmNDU2MGRlNDc0MTQwNDA5M2FjNjFjMzNmYjU1NmIzZDllZTUxNDBmNjIwMzYyNTg5ZmRkZWRlZmEyZCJ9fX0=", 1, "&b&lJungle Island", Collections.singletonList("&7A starter jungle island.")),
-                    1.5, 95, 0.5, 90, new SchematicWorld(XBiome.PLAINS, "jungle.iridiumschem"), new SchematicWorld(XBiome.NETHER_WASTES, "jungle_nether.iridiumschem"), new SchematicWorld(XBiome.THE_END, "jungle_end.iridiumschem")))
+                    1.5, 95, 0.5, 90, new SchematicWorld(XBiome.PLAINS,
+                "jungle.iridiumschem"
+            ), new SchematicWorld(XBiome.NETHER_WASTES,
+                "jungle_nether.iridiumschem"
+            ), new SchematicWorld(XBiome.THE_END,
+                "jungle_end.iridiumschem"
+            )))
             .put("mushroom", new SchematicConfig(new Item(XMaterial.PLAYER_HEAD, 15, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZWE0NWQxYjQxN2NiZGRjMjE3NjdiMDYwNDRlODk5YjI2NmJmNzhhNjZlMjE4NzZiZTNjMDUxNWFiNTVkNzEifX19", 1, "&b&lMushroom Island", Collections.singletonList("&7A starter mushroom island.")),
-                    -1.5, 95, -0.5, 90, new SchematicWorld(XBiome.PLAINS, "mushroom.iridiumschem"), new SchematicWorld(XBiome.NETHER_WASTES, "mushroom_nether.iridiumschem"), new SchematicWorld(XBiome.THE_END, "mushroom_end.iridiumschem")))
+                    -1.5, 95, -0.5, 90, new SchematicWorld(XBiome.PLAINS,
+                "mushroom.iridiumschem"
+            ), new SchematicWorld(XBiome.NETHER_WASTES,
+                "mushroom_nether.iridiumschem"
+            ), new SchematicWorld(XBiome.THE_END,
+                "mushroom_end.iridiumschem"
+            )))
             .build();
 
     @NoArgsConstructor

plugin/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java → src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java

@@ -283,7 +283,7 @@ private CompletableFuture<List<Chunk>> getIslandChunks(@NotNull Island island, @
 
             for (int x = minX; x <= maxX; x++) {
                 for (int z = minZ; z <= maxZ; z++) {
-                    chunks.add(PaperLib.getChunkAtAsyncUrgently(world, x, z, true));
+                    chunks.add(PaperLib.getChunkAtAsync(world, x, z, true));
                 }
             }
             return chunks.stream().map(CompletableFuture::join).collect(Collectors.toList());

plugin/src/main/resources/plugin.yml → src/main/resources/plugin.yml

@@ -5,7 +5,11 @@ main: com.iridium.iridiumskyblock.IridiumSkyblock
 api-version: '1.13'
 author: Peaches_MLG
 depend: [ Vault ]
-softdepend: [ "MVdWPlaceholderAPI","PlaceholderAPI" ]
+softdepend:
+- "MVdWPlaceholderAPI"
+- "PlaceholderAPI"
+- "Essentials"
+- "EssentialsSpawn"
 commands:
   iridiumskyblock:
     aliases: [ "island", is ]