Major refactoring of the codebase projects

.github/workflows/test.yml

@@ -26,4 +26,4 @@ jobs:
         uses: gradle/actions/setup-gradle@v5
 
       - name: Test with Gradle Wrapper
-        run: ./gradlew test --build-cache
+        run: ./gradlew test

api/build.gradle.kts

@@ -1,11 +1,3 @@
 kotlin {
     explicitApi()
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            from(components["java"])
-        }
-    }
-}

build.gradle.kts

@@ -1,72 +1,64 @@
 import io.papermc.hangarpublishplugin.model.Platforms
-import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
     id("maven-publish")
     alias(libs.plugins.kotlin)
-    alias(libs.plugins.shadowJar)
+    alias(libs.plugins.shadow)
     alias(libs.plugins.hangar)
     alias(libs.plugins.minotaur)
 }
 
-group = "com.r4g3baby"
+group = "com.r4g3baby.simplescore"
 version = "4.1.1-dev"
 
 dependencies {
     api(project("bukkit"))
 }
 
 subprojects {
-    group = "${rootProject.group}.${rootProject.name.lowercase()}"
+    group = rootProject.group
     version = rootProject.version
 
     apply(plugin = "org.jetbrains.kotlin.jvm")
     apply(plugin = "maven-publish")
 
-    java {
-        withSourcesJar()
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                artifactId = "${rootProject.name}-${path.replace(":", "-").drop(1)}".lowercase()
+
+                from(components["java"])
+            }
+        }
     }
 }
 
 allprojects {
+    java {
+        withSourcesJar()
+    }
+
     kotlin {
         jvmToolchain {
             languageVersion = JavaLanguageVersion.of(8)
         }
     }
-
-    tasks {
-        processResources {
-            filteringCharset = "UTF-8"
-            filesMatching(listOf("**plugin.yml")) {
-                filter<ReplaceTokens>(
-                    "tokens" to mapOf(
-                        "name" to rootProject.name,
-                        "version" to rootProject.version,
-                        "description" to "A simple animated scoreboard plugin for your server.",
-                        "package" to "${rootProject.group}.${rootProject.name.lowercase()}",
-                        "website" to "https://ruipereira.dev"
-                    )
-                )
-            }
-        }
-    }
 }
 
 tasks {
+    jar { enabled = false }
+
     shadowJar {
         archiveFileName.set("${project.name}-${project.version}.jar")
 
         manifest {
             attributes["paperweight-mappings-namespace"] = "mojang"
         }
 
-        val libs = "${project.group}.${project.name.lowercase()}.lib"
+        val libs = "${project.group}.lib"
         relocate("org.objenesis", "$libs.objenesis")
         relocate("net.swiftzer.semver", "$libs.semver")
         relocate("org.bstats", "$libs.bstats")
-        // relocate("com.zaxxer.hikari", "$libs.hikari")
-        // relocate("org.slf4j", "$libs.slf4j")
 
         relocate("org.jetbrains", "$libs.jetbrains")
         relocate("kotlin", "$libs.kotlin")
@@ -126,14 +118,13 @@ fun mapVersions(propertyName: String): Provider<List<String>> = provider {
 }
 
 fun parseGitHubChangelog(): Provider<String> = provider {
-    val changelog = System.getenv("GITHUB_CHANGELOG")
-        ?: return@provider "(No changelog provided)"
+    val changelog = System.getenv("GITHUB_CHANGELOG") ?: return@provider "(No changelog provided)"
 
     val userRegex = Regex("(?<!\\w)@([A-Za-z0-9-]+)")
     val pullRegex = Regex("https://github\\.com/[\\w-]+/[\\w-]+/pull/(\\d+)")
     val compareRegex = Regex("https://github\\.com/[\\w-]+/[\\w-]+/compare/([\\w\\.]+)")
 
-    changelog.replace(userRegex) {
+    return@provider changelog.replace(userRegex) {
         val user = it.groupValues[1]
         "[@$user](https://github.com/$user)"
     }.replace(pullRegex) {

bukkit/build.gradle.kts

@@ -1,20 +1,32 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
 dependencies {
     api(project(":core"))
-    implementation(project(":bukkit:protocol"))
     implementation(project(":bukkit:worldguard"))
 
     compileOnly(libs.bukkit)
+    compileOnly(libs.netty)
     compileOnly(libs.papi)
     compileOnly(libs.adventureMiniMessage)
     compileOnly(libs.adventureSerializer)
 
+    implementation(libs.objenesis)
     implementation(libs.bStatsBukkit)
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            from(components["java"])
+tasks {
+    processResources {
+        filteringCharset = "UTF-8"
+        filesMatching("plugin.yml") {
+            filter<ReplaceTokens>(
+                "tokens" to mapOf(
+                    "name" to rootProject.name,
+                    "version" to rootProject.version,
+                    "package" to rootProject.group,
+                    "description" to "A simple animated scoreboard plugin for your server.",
+                    "website" to "https://ruipereira.dev"
+                )
+            )
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/BukkitManager.kt

@@ -9,10 +9,10 @@ import com.r4g3baby.simplescore.bukkit.listener.PlayerListener
 import com.r4g3baby.simplescore.bukkit.protocol.legacy.LegacyProtocolHandler
 import com.r4g3baby.simplescore.bukkit.protocol.modern.ModernProtocolHandler
 import com.r4g3baby.simplescore.bukkit.protocol.modern.TeamsProtocolHandler
-import com.r4g3baby.simplescore.bukkit.protocol.util.ServerVersion
 import com.r4g3baby.simplescore.bukkit.scoreboard.ScoreboardTask
 import com.r4g3baby.simplescore.bukkit.scoreboard.VarReplacer
 import com.r4g3baby.simplescore.bukkit.scoreboard.data.Viewer
+import com.r4g3baby.simplescore.bukkit.util.ServerVersion
 import com.r4g3baby.simplescore.bukkit.worldguard.WorldGuardAPI
 import com.r4g3baby.simplescore.core.BaseManager
 import org.bukkit.Location

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/MainCmd.kt

@@ -48,4 +48,4 @@ class MainCmd(private val plugin: BukkitPlugin) : CommandExecutor, TabExecutor {
             else -> emptyList()
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/SubCmd.kt

@@ -22,4 +22,4 @@ abstract class SubCmd(plugin: BukkitPlugin, val name: String) {
         }
         return players.map { it.name }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Force.kt

@@ -79,4 +79,4 @@ class Force(private val plugin: BukkitPlugin) : SubCmd(plugin, "force") {
             else -> emptyList()
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Help.kt

@@ -15,4 +15,4 @@ class Help(private val plugin: BukkitPlugin, private val mainCmd: MainCmd) : Sub
             }
         } else sender.sendMessage(plugin.i18n.t("cmd.help.noCommands"))
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Info.kt

@@ -40,4 +40,4 @@ class Info(private val plugin: BukkitPlugin) : SubCmd(plugin, "info") {
             getTargetsFor(sender).filter { it.startsWith(args[0], true) }
         } else emptyList()
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Reload.kt

@@ -10,4 +10,4 @@ class Reload(private val plugin: BukkitPlugin) : SubCmd(plugin, "reload") {
         plugin.manager.loadConfiguration()
         sender.sendMessage(plugin.i18n.t("cmd.reload.finished"))
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Toggle.kt

@@ -74,4 +74,4 @@ class Toggle(private val plugin: BukkitPlugin) : SubCmd(plugin, "toggle") {
             else -> emptyList()
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Version.kt

@@ -21,4 +21,4 @@ class Version(private val plugin: BukkitPlugin) : SubCmd(plugin, "version") {
             })
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/ConditionsConfig.kt

@@ -130,4 +130,4 @@ class ConditionsConfig(
             } else plugin.logger.warning("Invalid type value for condition: $name, type: $type.")
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/MainConfig.kt

@@ -45,4 +45,4 @@ class MainConfig(plugin: BukkitPlugin) : BaseMainConfig<Player, YamlConfiguratio
             }
         }
     }
-}
+}

bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/ScoreboardsConfig.kt

@@ -227,4 +227,4 @@ class ScoreboardsConfig(
             else -> emptyList()
         }
     }
-}
+}

bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt → bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt

@@ -1,11 +1,12 @@
 package com.r4g3baby.simplescore.bukkit.protocol
 
-import com.r4g3baby.simplescore.bukkit.protocol.util.Utils
+import com.r4g3baby.simplescore.bukkit.util.NMS
+import com.r4g3baby.simplescore.bukkit.util.OBC
 import com.r4g3baby.simplescore.core.util.Reflection
 import io.netty.channel.Channel
 import org.bukkit.entity.Player
+import java.util.*
 import java.util.Collections.synchronizedMap
-import java.util.WeakHashMap
 
 class ChannelInjector {
     companion object {
@@ -18,18 +19,18 @@ class ChannelInjector {
 
         init {
             try {
-                val craftPlayer = Reflection.getClass("${Utils.OBC}.entity.CraftPlayer")
+                val craftPlayer = Reflection.getClass("${OBC}.entity.CraftPlayer")
                 val entityPlayer = Reflection.findClass(
                     "net.minecraft.server.level.ServerPlayer",
-                    "net.minecraft.server.level.EntityPlayer", "${Utils.NMS}.EntityPlayer"
+                    "net.minecraft.server.level.EntityPlayer", "${NMS}.EntityPlayer"
                 )
                 val playerConnection = Reflection.findClass(
                     "net.minecraft.server.network.ServerGamePacketListenerImpl",
-                    "net.minecraft.server.network.PlayerConnection", "${Utils.NMS}.PlayerConnection"
+                    "net.minecraft.server.network.PlayerConnection", "${NMS}.PlayerConnection"
                 )
                 val networkManager = Reflection.findClass(
                     "net.minecraft.network.Connection",
-                    "net.minecraft.network.NetworkManager", "${Utils.NMS}.NetworkManager"
+                    "net.minecraft.network.NetworkManager", "${NMS}.NetworkManager"
                 )
 
                 getPlayerHandle = Reflection.getMethodByName(craftPlayer, "getHandle")

bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt → bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt

@@ -60,4 +60,4 @@ abstract class ProtocolHandler {
         }
         return text to ""
     }
-}
+}

bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt → bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt

@@ -1,6 +1,6 @@
 package com.r4g3baby.simplescore.bukkit.protocol
 
-import com.r4g3baby.simplescore.bukkit.protocol.util.Utils
+import com.r4g3baby.simplescore.bukkit.util.NMS
 import com.r4g3baby.simplescore.core.util.Reflection
 
 abstract class WrappedPacket(val handle: Any) {
@@ -10,7 +10,7 @@ abstract class WrappedPacket(val handle: Any) {
         init {
             try {
                 clazz = Reflection.findClass(
-                    "net.minecraft.network.protocol.Packet", "${Utils.NMS}.Packet"
+                    "net.minecraft.network.protocol.Packet", "${NMS}.Packet"
                 )
             } catch (throwable: Throwable) {
                 throw ExceptionInInitializerError(throwable)
@@ -21,4 +21,4 @@ abstract class WrappedPacket(val handle: Any) {
     init {
         require(clazz.isAssignableFrom(handle::class.java))
     }
-}
+}

bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt → bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt

@@ -104,4 +104,4 @@ open class LegacyProtocolHandler : ProtocolHandler() {
             }
         }
     }
-}
+}