simplify

.github/CONTRIBUTING.md

@@ -16,16 +16,13 @@ WeaponMechanics leverages the following technologies:
 
 ## New contributor guide
 
-When cloning the repository, you will need to either:
-1. Set `devMode=true` in [gradle.properties](../gradle.properties) to disable legacy versions.
-2. Use [download-spigot-libs.bat](../lib/download-spigot-libs.bat) to build legacy versions.
-
-This will allow you to compile the plugin. Make sure to reload the gradle project
-after making changes to gradle files. To build the `.jar` files, run
+To build the plugin for Spigot, run:
 ```shell
 ./gradlew buildForSpigotRelease
 ```
 
+The `.jar` files will be located in the `build/` directory.
+
 ## Making a pull request
 
 When making a pull request, GitHub Actions will automatically run the following

BuildMechanicsCore/build.gradle.kts

@@ -7,22 +7,26 @@ plugins {
 dependencies {
     implementation(project(":MechanicsCore"))
     implementation(project(":CoreCompatibility"))
-    implementation(project(":WorldGuardV6"))
     implementation(project(":WorldGuardV7"))
 
+    // Implementation for all the libraries we shade:
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21")
+    implementation("net.kyori:adventure-api:${Versions.ADVENTURE_API}")
+    implementation("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_BUKKIT}")
+    implementation("net.kyori:adventure-text-serializer-legacy:${Versions.ADVENTURE_API}")
+    implementation("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_API}")
+    implementation("com.zaxxer:HikariCP:5.1.0")
+    implementation("org.slf4j:slf4j-nop:1.7.30")
+    implementation(Dependencies.X_SERIES)
+    implementation(Dependencies.FOLIA_SCHEDULER)
+    implementation(Dependencies.COMMAND_API_SHADE)
+    implementation("net.bytebuddy:byte-buddy:1.15.10")  // Making classes describable
+
     // Add all compatibility modules
-    val devMode = findProperty("devMode") == "true"
     var addedOne = false
     file("../CoreCompatibility").listFiles()?.forEach {
         if (it.isDirectory && it.name.matches(Regex("Core_\\d+_\\d+_R\\d+"))) {
-            // Use check the reobf variant for all modules 1.17+
-            val major = it.name.split("_")[2].toInt()
-
-            if (major >= 17) {
-                implementation(project(":${it.name}", "reobf"))
-            } else if (!devMode) {
-                implementation(project(":${it.name}"))
-            }
+            implementation(project(":${it.name}", "reobf"))
             addedOne = true
         }
     }
@@ -55,19 +59,12 @@ tasks.shadowJar {
     dependencies {
         include(project(":MechanicsCore"))
         include(project(":CoreCompatibility"))
-        include(project(":WorldGuardV6"))
         include(project(":WorldGuardV7"))
 
         // Add all compatibility modules
-        val devMode = findProperty("devMode") == "true"
         var addedOne = false
         file("../CoreCompatibility").listFiles()?.forEach {
             if (it.isDirectory && it.name.matches(Regex("Core_\\d+_\\d+_R\\d+"))) {
-                // Filter out projects when in devMode
-                val major = it.name.split("_")[2].toInt()
-                if (devMode && major < 17)
-                    return@forEach
-
                 include(project(":${it.name}"))
                 addedOne = true
             }
@@ -91,20 +88,20 @@ tasks.shadowJar {
             include(dependency("org.slf4j::"))
         }
 
-        relocate("xyz.jpenilla", "me.deecaad.core.lib.reflection") {
-            include(dependency("xyz.jpenilla::"))
-        }
-
-        relocate("net.fabricmc", "me.deecaad.core.lib.fabric") {
-            include(dependency("net.fabricmc::"))
-        }
-
         relocate("com.cryptomorin.xseries", "me.deecaad.core.lib.xseries") {
             include(dependency("com.github.cryptomorin:XSeries:"))
         }
 
         relocate("com.cjcrafter.foliascheduler", "me.deecaad.core.lib.scheduler") {
             include(dependency("com.cjcrafter:foliascheduler:"))
         }
+
+        relocate("dev.jorel.commandapi", "me.deecaad.core.lib.commandapi") {
+            include(dependency("dev.jorel:commandapi-bukkit-shade:"))
+        }
+
+        relocate("net.bytebuddy", "me.deecaad.core.lib.bytebuddy") {
+            include(dependency("net.bytebuddy::"))
+        }
     }
-}
+}

BuildWeaponMechanics/build.gradle.kts

@@ -10,19 +10,16 @@ plugins {
 dependencies {
     implementation(project(":WeaponMechanics"))
 
+    // Implementation for all the libraries we shade:
+    implementation(Dependencies.BSTATS)
+    implementation("com.jeff_media:SpigotUpdateChecker:3.0.3")
+    implementation(Dependencies.GSON)
+
     // Add all compatibility modules
-    val devMode = findProperty("devMode") == "true"
     var addedOne = false
     file("../WeaponCompatibility").listFiles()?.forEach {
         if (it.isDirectory && it.name.matches(Regex("Weapon_\\d+_\\d+_R\\d+"))) {
-            // Use the reobf variant for all modules 1.17+
-            val major = it.name.split("_")[2].toInt()
-
-            if (major >= 17) {
-                implementation(project(":${it.name}", "reobf"))
-            } else if (!devMode) {
-                implementation(project(":${it.name}"))
-            }
+            implementation(project(":${it.name}", "reobf"))
             addedOne = true
         }
     }
@@ -41,7 +38,7 @@ bukkit {
     foliaSupported = true
 
     authors = listOf("DeeCaaD", "CJCrafter")
-    depend = listOf("ProtocolLib")
+    depend = listOf("packetevents")
     softDepend = listOf("MechanicsCore", "MythicMobs", "CrackShot", "CrackShotPlus", "VivecraftSpigot")
 
     permissions {
@@ -61,15 +58,9 @@ tasks.shadowJar {
     dependencies {
         include(project(":WeaponMechanics"))
 
-        val devMode = findProperty("devMode") == "true"
         var addedOne = false
         file("../WeaponCompatibility").listFiles()?.forEach {
             if (it.isDirectory && it.name.matches(Regex("Weapon_\\d+_\\d+_R\\d+"))) {
-                // Filter out projects when in devMode
-                val major = it.name.split("_")[2].toInt()
-                if (devMode && major < 17)
-                    return@forEach
-
                 include(project(":${it.name}"))
                 addedOne = true
             }
@@ -91,7 +82,9 @@ tasks.shadowJar {
 
     // This doesn't actually include any dependencies, this relocates all references
     // to the mechanics core lib.
+    relocate("kotlin.", "me.deecaad.core.lib.kotlin.")
     relocate("net.kyori", "me.deecaad.core.lib")
-    relocate("kotlin.", "me.deecaad.weaponmechanics.lib.kotlin.")
+    relocate("com.cryptomorin.xseries", "me.deecaad.core.lib.xseries")
     relocate("com.cjcrafter.foliascheduler", "me.deecaad.core.lib.scheduler")
+    relocate("dev.jorel.commandapi", "me.deecaad.core.lib.commandapi")
 }