diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bed3f20..e53a1aa 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 12a0271..dd1f929 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,11 +1,3 @@ kotlin { explicitApi() } - -publishing { - publications { - create("maven") { - from(components["java"]) - } - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index c44cff4..c0b1d60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,15 +1,14 @@ 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 { @@ -17,43 +16,38 @@ dependencies { } 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("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( - "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") @@ -61,12 +55,10 @@ tasks { 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> = provider { } fun parseGitHubChangelog(): Provider = 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("(?("maven") { - from(components["java"]) +tasks { + processResources { + filteringCharset = "UTF-8" + filesMatching("plugin.yml") { + filter( + "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" + ) + ) } } -} \ No newline at end of file +} diff --git a/bukkit/protocol/build.gradle.kts b/bukkit/protocol/build.gradle.kts deleted file mode 100644 index f74a4c1..0000000 --- a/bukkit/protocol/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -subprojects { - group = "${project.group}.protocol" -} - -dependencies { - api(project(":bukkit:protocol:modern")) - api(project(":bukkit:protocol:legacy")) -} \ No newline at end of file diff --git a/bukkit/protocol/common/build.gradle.kts b/bukkit/protocol/common/build.gradle.kts deleted file mode 100644 index 1a201a2..0000000 --- a/bukkit/protocol/common/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -dependencies { - api(project(":core")) - - compileOnly(libs.bukkit) - compileOnly(libs.netty) - - api(libs.objenesis) -} \ No newline at end of file diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/util/Utils.kt b/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/util/Utils.kt deleted file mode 100644 index 875dff4..0000000 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/util/Utils.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.r4g3baby.simplescore.bukkit.protocol.util - -import org.bukkit.Bukkit -import org.objenesis.ObjenesisStd -import org.objenesis.instantiator.ObjectInstantiator - -object Utils { - val OBC: String = Bukkit.getServer().javaClass.getPackage().name - val NMS: String = OBC.replace("org.bukkit.craftbukkit", "net.minecraft.server") - - private val objenesis = ObjenesisStd(true) - fun getInstantiatorOf(clazz: Class): ObjectInstantiator { - return objenesis.getInstantiatorOf(clazz) - } -} \ No newline at end of file diff --git a/bukkit/protocol/legacy/build.gradle.kts b/bukkit/protocol/legacy/build.gradle.kts deleted file mode 100644 index 8b2881d..0000000 --- a/bukkit/protocol/legacy/build.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -dependencies { - api(project(":bukkit:protocol:common")) - - compileOnly(libs.bukkit) - compileOnly(libs.netty) -} \ No newline at end of file diff --git a/bukkit/protocol/modern/build.gradle.kts b/bukkit/protocol/modern/build.gradle.kts deleted file mode 100644 index 8b2881d..0000000 --- a/bukkit/protocol/modern/build.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -dependencies { - api(project(":bukkit:protocol:common")) - - compileOnly(libs.bukkit) - compileOnly(libs.netty) -} \ No newline at end of file diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/BukkitManager.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/BukkitManager.kt index 7c5c4a4..49689d6 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/BukkitManager.kt +++ b/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 diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/MainCmd.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/MainCmd.kt index a3de45d..8abf372 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/MainCmd.kt +++ b/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() } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/SubCmd.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/SubCmd.kt index e1adbb7..604d03e 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/SubCmd.kt +++ b/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 } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Force.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Force.kt index 4b4f406..eb74231 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Force.kt +++ b/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() } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Help.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Help.kt index 767bfc3..e3c92b0 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Help.kt +++ b/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")) } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Info.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Info.kt index 3bd2029..4015fb6 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Info.kt +++ b/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() } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Reload.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Reload.kt index c40eb62..55c12ba 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Reload.kt +++ b/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")) } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Toggle.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Toggle.kt index 5e78c33..b7bf60e 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Toggle.kt +++ b/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() } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Version.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Version.kt index dfe21d2..cf24cd0 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/command/subcmd/Version.kt +++ b/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") { }) } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/ConditionsConfig.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/ConditionsConfig.kt index 6b7a656..e5714d1 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/ConditionsConfig.kt +++ b/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.") } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/MainConfig.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/MainConfig.kt index e582fb7..3d5ddcf 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/MainConfig.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/config/MainConfig.kt @@ -45,4 +45,4 @@ class MainConfig(plugin: BukkitPlugin) : BaseMainConfig emptyList() } } -} \ No newline at end of file +} diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt similarity index 87% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt index 5271442..dd15714 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ChannelInjector.kt +++ b/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") diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt similarity index 99% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt index d66f89a..db69232 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/ProtocolHandler.kt @@ -60,4 +60,4 @@ abstract class ProtocolHandler { } return text to "" } -} \ No newline at end of file +} diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt similarity index 87% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt index c2c2acb..d1c86e4 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/WrappedPacket.kt +++ b/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)) } -} \ No newline at end of file +} diff --git a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt similarity index 99% rename from bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt index 0b95235..e51bf9f 100644 --- a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/LegacyProtocolHandler.kt @@ -104,4 +104,4 @@ open class LegacyProtocolHandler : ProtocolHandler() { } } } -} \ No newline at end of file +} diff --git a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedDisplayObjective.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedDisplayObjective.kt similarity index 90% rename from bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedDisplayObjective.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedDisplayObjective.kt index 32a75c3..3b5c38d 100644 --- a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedDisplayObjective.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedDisplayObjective.kt @@ -1,7 +1,7 @@ package com.r4g3baby.simplescore.bukkit.protocol.legacy.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS import com.r4g3baby.simplescore.core.util.Reflection data class WrappedDisplayObjective( @@ -17,7 +17,7 @@ data class WrappedDisplayObjective( init { try { packetPlayOutScoreboardDisplayObjective = Reflection.getClass( - "${Utils.NMS}.PacketPlayOutScoreboardDisplayObjective" + "${NMS}.PacketPlayOutScoreboardDisplayObjective" ) objectiveNameField = Reflection.getField(packetPlayOutScoreboardDisplayObjective, String::class.java) diff --git a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateObjective.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateObjective.kt similarity index 89% rename from bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateObjective.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateObjective.kt index 68c0c6f..1948fe2 100644 --- a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateObjective.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateObjective.kt @@ -1,7 +1,7 @@ package com.r4g3baby.simplescore.bukkit.protocol.legacy.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS import com.r4g3baby.simplescore.core.util.Reflection data class WrappedUpdateObjective( @@ -21,12 +21,10 @@ data class WrappedUpdateObjective( init { try { - packetPlayOutScoreboardObjective = Reflection.getClass( - "${Utils.NMS}.PacketPlayOutScoreboardObjective" - ) + packetPlayOutScoreboardObjective = Reflection.getClass("${NMS}.PacketPlayOutScoreboardObjective") val enumScoreboardHealthDisplay = Reflection.getClass( - $$"$${Utils.NMS}.IScoreboardCriteria$EnumScoreboardHealthDisplay" + $$"$${NMS}.IScoreboardCriteria$EnumScoreboardHealthDisplay" ) nameField = Reflection.getField(packetPlayOutScoreboardObjective, String::class.java, 0) diff --git a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateScore.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateScore.kt similarity index 89% rename from bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateScore.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateScore.kt index 7fdb2bf..d6421e5 100644 --- a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateScore.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateScore.kt @@ -1,7 +1,7 @@ package com.r4g3baby.simplescore.bukkit.protocol.legacy.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS import com.r4g3baby.simplescore.core.util.Reflection data class WrappedUpdateScore( @@ -21,12 +21,10 @@ data class WrappedUpdateScore( init { try { - packetPlayOutScoreboardScore = Reflection.getClass( - "${Utils.NMS}.PacketPlayOutScoreboardScore" - ) + packetPlayOutScoreboardScore = Reflection.getClass("${NMS}.PacketPlayOutScoreboardScore") val enumScoreboardAction = Reflection.getClass( - $$"$${Utils.NMS}.PacketPlayOutScoreboardScore$EnumScoreboardAction" + $$"$${NMS}.PacketPlayOutScoreboardScore$EnumScoreboardAction" ) objectiveNameField = Reflection.getField(packetPlayOutScoreboardScore, String::class.java, 1) diff --git a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateTeam.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateTeam.kt similarity index 93% rename from bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateTeam.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateTeam.kt index 8bc59c1..b07f38a 100644 --- a/bukkit/protocol/legacy/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateTeam.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/legacy/packet/WrappedUpdateTeam.kt @@ -1,7 +1,7 @@ package com.r4g3baby.simplescore.bukkit.protocol.legacy.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS import com.r4g3baby.simplescore.core.util.Reflection data class WrappedUpdateTeam( @@ -24,9 +24,7 @@ data class WrappedUpdateTeam( init { try { - packetPlayOutScoreboardTeam = Reflection.getClass( - "${Utils.NMS}.PacketPlayOutScoreboardTeam" - ) + packetPlayOutScoreboardTeam = Reflection.getClass("${NMS}.PacketPlayOutScoreboardTeam") teamNameField = Reflection.getField(packetPlayOutScoreboardTeam, String::class.java, 0) modeField = Reflection.getField(packetPlayOutScoreboardTeam, Int::class.java, 1) @@ -52,4 +50,4 @@ data class WrappedUpdateTeam( if (suffix != null) suffixField.set(handle, suffix) if (players != null) playersField.set(handle, players) } -} \ No newline at end of file +} diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveScore.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveScore.kt similarity index 98% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveScore.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveScore.kt index c142d7c..592b4e5 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveScore.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveScore.kt @@ -5,4 +5,4 @@ data class ObjectiveScore( val text: String, val value: Int, val hideNumber: Boolean -) \ No newline at end of file +) diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveTitle.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveTitle.kt similarity index 98% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveTitle.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveTitle.kt index 704ca7f..696a992 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveTitle.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/ObjectiveTitle.kt @@ -3,4 +3,4 @@ package com.r4g3baby.simplescore.bukkit.protocol.model data class ObjectiveTitle( val lineUID: String, val text: String, -) \ No newline at end of file +) diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/PlayerObjective.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/PlayerObjective.kt similarity index 98% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/PlayerObjective.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/PlayerObjective.kt index 5a6e243..251878f 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/PlayerObjective.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/model/PlayerObjective.kt @@ -3,4 +3,4 @@ package com.r4g3baby.simplescore.bukkit.protocol.model data class PlayerObjective( val title: ObjectiveTitle, val scores: Map -) \ No newline at end of file +) diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/ModernProtocolHandler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/ModernProtocolHandler.kt similarity index 99% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/ModernProtocolHandler.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/ModernProtocolHandler.kt index 3be8036..c08d7cf 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/ModernProtocolHandler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/ModernProtocolHandler.kt @@ -80,4 +80,4 @@ class ModernProtocolHandler : ProtocolHandler() { } } } -} \ No newline at end of file +} diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/TeamsProtocolHandler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/TeamsProtocolHandler.kt similarity index 99% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/TeamsProtocolHandler.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/TeamsProtocolHandler.kt index bca0194..8064aff 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/TeamsProtocolHandler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/TeamsProtocolHandler.kt @@ -113,4 +113,4 @@ class TeamsProtocolHandler : ProtocolHandler() { val (prefix, suffix) = splitScoreLine(line) return fromString(prefix) to fromString(suffix) } -} \ No newline at end of file +} diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/WrappedChatComponent.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/WrappedChatComponent.kt similarity index 83% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/WrappedChatComponent.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/WrappedChatComponent.kt index 3a564d7..d61fc2c 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/WrappedChatComponent.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/WrappedChatComponent.kt @@ -1,6 +1,7 @@ package com.r4g3baby.simplescore.bukkit.protocol.modern.chat -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 class WrappedChatComponent(val handle: Any) { @@ -13,11 +14,10 @@ class WrappedChatComponent(val handle: Any) { try { clazz = Reflection.findClass( "net.minecraft.network.chat.Component", - "net.minecraft.network.chat.IChatBaseComponent", - "${Utils.NMS}.IChatBaseComponent" + "net.minecraft.network.chat.IChatBaseComponent", "${NMS}.IChatBaseComponent" ) - val craftChatMessage = Reflection.getClass("${Utils.OBC}.util.CraftChatMessage") + val craftChatMessage = Reflection.getClass("${OBC}.util.CraftChatMessage") val arrayOfIChatBaseComponent = Reflection.getArrayClass(clazz) fromString = Reflection.getMethod(craftChatMessage, arrayOfIChatBaseComponent, String::class.java) diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/numbers/WrappedNumberFormat.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/numbers/WrappedNumberFormat.kt similarity index 99% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/numbers/WrappedNumberFormat.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/numbers/WrappedNumberFormat.kt index c3cf7c5..0a8be63 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/numbers/WrappedNumberFormat.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/chat/numbers/WrappedNumberFormat.kt @@ -26,4 +26,4 @@ class WrappedNumberFormat(val handle: Any) { init { require(clazz.isAssignableFrom(handle::class.java)) } -} \ No newline at end of file +} diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedDisplayObjective.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedDisplayObjective.kt similarity index 87% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedDisplayObjective.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedDisplayObjective.kt index 0a50dd4..d647ee5 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedDisplayObjective.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedDisplayObjective.kt @@ -1,8 +1,9 @@ package com.r4g3baby.simplescore.bukkit.protocol.modern.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket -import com.r4g3baby.simplescore.bukkit.protocol.util.ServerVersion -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS +import com.r4g3baby.simplescore.bukkit.util.ServerVersion +import com.r4g3baby.simplescore.bukkit.util.getInstantiatorOf import com.r4g3baby.simplescore.core.util.Reflection import org.objenesis.instantiator.ObjectInstantiator @@ -24,9 +25,9 @@ data class WrappedDisplayObjective( val packetPlayOutScoreboardDisplayObjective = Reflection.findClass( "net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardDisplayObjective", - "${Utils.NMS}.PacketPlayOutScoreboardDisplayObjective" + "${NMS}.PacketPlayOutScoreboardDisplayObjective" ) - packetInstantiator = Utils.getInstantiatorOf(packetPlayOutScoreboardDisplayObjective) + packetInstantiator = getInstantiatorOf(packetPlayOutScoreboardDisplayObjective) objectiveNameField = Reflection.getField(packetPlayOutScoreboardDisplayObjective, String::class.java) @@ -56,4 +57,4 @@ data class WrappedDisplayObjective( displaySlotField.set(handle, displaySlotFieldEnums[position.id]) } else displaySlotField.set(handle, position.id) } -} \ No newline at end of file +} diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedResetScore.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedResetScore.kt similarity index 89% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedResetScore.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedResetScore.kt index 3c7db81..6b06ee1 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedResetScore.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedResetScore.kt @@ -1,7 +1,7 @@ package com.r4g3baby.simplescore.bukkit.protocol.modern.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.getInstantiatorOf import com.r4g3baby.simplescore.core.util.Reflection import org.objenesis.instantiator.ObjectInstantiator @@ -20,7 +20,7 @@ data class WrappedResetScore( val clientboundResetScorePacket = Reflection.getClass( "net.minecraft.network.protocol.game.ClientboundResetScorePacket" ) - packetInstantiator = Utils.getInstantiatorOf(clientboundResetScorePacket) + packetInstantiator = getInstantiatorOf(clientboundResetScorePacket) entityNameField = Reflection.getField(clientboundResetScorePacket, String::class.java, 0) objectiveNameField = Reflection.getField(clientboundResetScorePacket, String::class.java, 1) diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateObjective.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateObjective.kt similarity index 89% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateObjective.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateObjective.kt index efee41e..4cf02f7 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateObjective.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateObjective.kt @@ -3,12 +3,13 @@ package com.r4g3baby.simplescore.bukkit.protocol.modern.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket import com.r4g3baby.simplescore.bukkit.protocol.modern.chat.WrappedChatComponent import com.r4g3baby.simplescore.bukkit.protocol.modern.chat.numbers.WrappedNumberFormat -import com.r4g3baby.simplescore.bukkit.protocol.util.ServerVersion -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS +import com.r4g3baby.simplescore.bukkit.util.ServerVersion +import com.r4g3baby.simplescore.bukkit.util.getInstantiatorOf import com.r4g3baby.simplescore.core.util.Reflection import org.objenesis.instantiator.ObjectInstantiator import java.lang.reflect.Modifier -import java.util.Optional +import java.util.* data class WrappedUpdateObjective( val name: String, @@ -35,14 +36,14 @@ data class WrappedUpdateObjective( val packetPlayOutScoreboardObjective = Reflection.findClass( "net.minecraft.network.protocol.game.ClientboundSetObjectivePacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardObjective", - "${Utils.NMS}.PacketPlayOutScoreboardObjective" + "${NMS}.PacketPlayOutScoreboardObjective" ) - packetInstantiator = Utils.getInstantiatorOf(packetPlayOutScoreboardObjective) + packetInstantiator = getInstantiatorOf(packetPlayOutScoreboardObjective) val enumScoreboardHealthDisplay = Reflection.findClass( $$"net.minecraft.world.scores.criteria.ObjectiveCriteria$RenderType", $$"net.minecraft.world.scores.criteria.IScoreboardCriteria$EnumScoreboardHealthDisplay", - $$"$${Utils.NMS}.IScoreboardCriteria$EnumScoreboardHealthDisplay" + $$"$${NMS}.IScoreboardCriteria$EnumScoreboardHealthDisplay" ) nameField = Reflection.getField(packetPlayOutScoreboardObjective, String::class.java) diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateScore.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateScore.kt similarity index 91% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateScore.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateScore.kt index 7b8d1ce..64192ff 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateScore.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateScore.kt @@ -3,11 +3,12 @@ package com.r4g3baby.simplescore.bukkit.protocol.modern.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket import com.r4g3baby.simplescore.bukkit.protocol.modern.chat.WrappedChatComponent import com.r4g3baby.simplescore.bukkit.protocol.modern.chat.numbers.WrappedNumberFormat -import com.r4g3baby.simplescore.bukkit.protocol.util.ServerVersion -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS +import com.r4g3baby.simplescore.bukkit.util.ServerVersion +import com.r4g3baby.simplescore.bukkit.util.getInstantiatorOf import com.r4g3baby.simplescore.core.util.Reflection import org.objenesis.instantiator.ObjectInstantiator -import java.util.Optional +import java.util.* data class WrappedUpdateScore( val entityName: String, @@ -36,9 +37,9 @@ data class WrappedUpdateScore( val packetPlayOutScoreboardScore = Reflection.findClass( "net.minecraft.network.protocol.game.ClientboundSetScorePacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardScore", - "${Utils.NMS}.PacketPlayOutScoreboardScore" + "${NMS}.PacketPlayOutScoreboardScore" ) - packetInstantiator = Utils.getInstantiatorOf(packetPlayOutScoreboardScore) + packetInstantiator = getInstantiatorOf(packetPlayOutScoreboardScore) entityNameField = Reflection.getField(packetPlayOutScoreboardScore, String::class.java, 0) objectiveNameField = Reflection.getField(packetPlayOutScoreboardScore, String::class.java, 1) @@ -57,7 +58,7 @@ data class WrappedUpdateScore( } else { val enumAction = Reflection.findClass( $$"net.minecraft.server.ServerScoreboard$Method", - $$"net.minecraft.server.ScoreboardServer$Action", $$"$${Utils.NMS}.ScoreboardServer$Action" + $$"net.minecraft.server.ScoreboardServer$Action", $$"$${NMS}.ScoreboardServer$Action" ) actionField = Reflection.getField(packetPlayOutScoreboardScore, enumAction) diff --git a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateTeam.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateTeam.kt similarity index 94% rename from bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateTeam.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateTeam.kt index f7fc90b..9cb7f31 100644 --- a/bukkit/protocol/modern/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateTeam.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/modern/packet/WrappedUpdateTeam.kt @@ -2,8 +2,9 @@ package com.r4g3baby.simplescore.bukkit.protocol.modern.packet import com.r4g3baby.simplescore.bukkit.protocol.WrappedPacket import com.r4g3baby.simplescore.bukkit.protocol.modern.chat.WrappedChatComponent -import com.r4g3baby.simplescore.bukkit.protocol.util.ServerVersion -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils +import com.r4g3baby.simplescore.bukkit.util.NMS +import com.r4g3baby.simplescore.bukkit.util.ServerVersion +import com.r4g3baby.simplescore.bukkit.util.getInstantiatorOf import com.r4g3baby.simplescore.core.util.Reflection import org.objenesis.instantiator.ObjectInstantiator import java.lang.reflect.Modifier @@ -40,9 +41,9 @@ data class WrappedUpdateTeam( val packetPlayOutScoreboardTeam = Reflection.findClass( "net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam", - "${Utils.NMS}.PacketPlayOutScoreboardTeam" + "${NMS}.PacketPlayOutScoreboardTeam" ) - packetInstantiator = Utils.getInstantiatorOf(packetPlayOutScoreboardTeam) + packetInstantiator = getInstantiatorOf(packetPlayOutScoreboardTeam) teamNameField = Reflection.getField(packetPlayOutScoreboardTeam, String::class.java, 0) modeField = Reflection.getField(packetPlayOutScoreboardTeam, Int::class.java, 0) { @@ -60,7 +61,7 @@ data class WrappedUpdateTeam( chatFormatField = null chatFormatFieldEnums = null } else { - val enumChatFormat = Reflection.getClass("${Utils.NMS}.EnumChatFormat") + val enumChatFormat = Reflection.getClass("${NMS}.EnumChatFormat") teamParametersField = null displayNameField = Reflection.getField(packetPlayOutScoreboardTeam, WrappedChatComponent.clazz, 0) @@ -131,7 +132,7 @@ data class WrappedUpdateTeam( "net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket", "net.minecraft.network.protocol.game.PacketPlayOutScoreboardTeam" ).declaredClasses[0] - classInstantiator = Utils.getInstantiatorOf(teamInfoClass) + classInstantiator = getInstantiatorOf(teamInfoClass) displayNameField = Reflection.getField(teamInfoClass, WrappedChatComponent.clazz, 0) prefixField = Reflection.getField(teamInfoClass, WrappedChatComponent.clazz, 1) diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/BukkitScheduler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/BukkitScheduler.kt index 04f3555..b5d5c16 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/BukkitScheduler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/BukkitScheduler.kt @@ -24,4 +24,4 @@ class BukkitScheduler(private val plugin: BukkitPlugin) : Scheduler { override fun runTaskTimerAsync(delay: Long, period: Long, task: Runnable) { bukkitScheduler.runTaskTimerAsynchronously(plugin, task, delay, period) } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/FoliaScheduler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/FoliaScheduler.kt index 54cd18d..adff17b 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/FoliaScheduler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/FoliaScheduler.kt @@ -59,4 +59,4 @@ class FoliaScheduler(private val plugin: BukkitPlugin) : Scheduler { val task: Consumer = Consumer { task.run() } runTaskTimerAsync.invoke(foliaAsyncScheduler, plugin, task, delay * 50, period * 50, TimeUnit.MILLISECONDS) } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/Scheduler.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/Scheduler.kt index e9020a9..e626b92 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/Scheduler.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scheduler/Scheduler.kt @@ -6,4 +6,4 @@ interface Scheduler { fun runTaskAsync(task: Runnable) fun runTaskTimer(delay: Long, period: Long, task: Runnable) fun runTaskTimerAsync(delay: Long, period: Long, task: Runnable) -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/ScoreboardTask.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/ScoreboardTask.kt index e6d873d..ebb71b7 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/ScoreboardTask.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/ScoreboardTask.kt @@ -54,4 +54,4 @@ class ScoreboardTask( protocolHandler.updateScoreboard(player, title, scores) } } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/VarReplacer.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/VarReplacer.kt index ad40c9f..7f680dd 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/VarReplacer.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/VarReplacer.kt @@ -14,7 +14,7 @@ import kotlin.math.min import kotlin.math.roundToInt class VarReplacer(plugin: BukkitPlugin) : VarReplacer { - private val usePlaceholderAPI = plugin.server.pluginManager.getPlugin("PlaceholderAPI") != null + private val usePlaceholderAPI = plugin.server.pluginManager.isPluginEnabled("PlaceholderAPI") override fun replace(text: String, viewer: Player): String { var result = if (usePlaceholderAPI) PlaceholderAPI.setPlaceholders(viewer, text) else text diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/condition/HasPermission.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/condition/HasPermission.kt index 92d0d9d..584fc12 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/condition/HasPermission.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/condition/HasPermission.kt @@ -12,4 +12,4 @@ data class HasPermission( val perm = if (parsePermission) varReplacer.replace(permission, viewer) else permission return viewer.hasPermission(perm) } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/data/Viewer.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/data/Viewer.kt index d783be0..08d97ed 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/data/Viewer.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/scoreboard/data/Viewer.kt @@ -76,4 +76,4 @@ data class Viewer( private fun invalidateCache() { isCacheDirty = true } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Adventure.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Adventure.kt index 31bef4b..5d89893 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Adventure.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Adventure.kt @@ -1,6 +1,5 @@ package com.r4g3baby.simplescore.bukkit.util -import com.r4g3baby.simplescore.bukkit.protocol.util.ServerVersion import com.r4g3baby.simplescore.core.util.Reflection.classExists import net.kyori.adventure.text.minimessage.MiniMessage import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer @@ -95,4 +94,4 @@ object Adventure { return result.toString() } -} \ No newline at end of file +} diff --git a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/util/ServerVersion.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/ServerVersion.kt similarity index 98% rename from bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/util/ServerVersion.kt rename to bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/ServerVersion.kt index c0c7685..d21ef51 100644 --- a/bukkit/protocol/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/protocol/util/ServerVersion.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/ServerVersion.kt @@ -1,4 +1,4 @@ -package com.r4g3baby.simplescore.bukkit.protocol.util +package com.r4g3baby.simplescore.bukkit.util import org.bukkit.Bukkit import java.util.regex.Pattern @@ -88,4 +88,4 @@ data class ServerVersion( build.compareTo(other.build).takeIf { it != 0 }?.let { return it } return 0 } -} \ No newline at end of file +} diff --git a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Utils.kt b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Utils.kt index 49e8a79..cff429d 100644 --- a/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Utils.kt +++ b/bukkit/src/main/kotlin/com/r4g3baby/simplescore/bukkit/util/Utils.kt @@ -1,13 +1,24 @@ package com.r4g3baby.simplescore.bukkit.util import com.r4g3baby.simplescore.api.scoreboard.data.Provider -import com.r4g3baby.simplescore.bukkit.protocol.util.Utils import com.r4g3baby.simplescore.core.util.Reflection +import org.bukkit.Bukkit import org.bukkit.entity.Player import org.bukkit.plugin.Plugin +import org.objenesis.ObjenesisStd +import org.objenesis.instantiator.ObjectInstantiator import java.util.function.Function +val OBC: String = Bukkit.getServer().javaClass.getPackage().name +val NMS: String = OBC.replace("org.bukkit.craftbukkit", "net.minecraft.server") + +private val objenesis = ObjenesisStd(true) +fun getInstantiatorOf(clazz: Class): ObjectInstantiator { + return objenesis.getInstantiatorOf(clazz) +} + fun String.lazyReplace(oldValue: String, newValueFunc: () -> String): String { + if (oldValue.isEmpty()) return this var occurrenceIndex = this.indexOf(oldValue, ignoreCase = true) if (occurrenceIndex < 0) return this @@ -49,14 +60,14 @@ val getPlayerPing = object : Function { init { if (getPingMethod == null) { getPlayerHandle = try { - val craftPlayer = Reflection.getClass("${Utils.OBC}.entity.CraftPlayer") + val craftPlayer = Reflection.getClass("${OBC}.entity.CraftPlayer") Reflection.getMethodByName(craftPlayer, "getHandle") } catch (_: Exception) { null } pingField = try { val entityPlayer = Reflection.findClass( "net.minecraft.server.level.ServerPlayer", - "net.minecraft.server.level.EntityPlayer", "${Utils.NMS}.EntityPlayer" + "net.minecraft.server.level.EntityPlayer", "${NMS}.EntityPlayer" ) Reflection.getField(entityPlayer, Int::class.java, filter = { field -> field.name == "ping" }) } catch (_: Exception) { null } diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index caec5b5..18c7ab9 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -42,4 +42,4 @@ permissions: children: simplescore.cmd.toggle: true simplescore.cmd.version: - description: Grants access to the version command \ No newline at end of file + description: Grants access to the version command diff --git a/bukkit/worldguard/api/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/IWorldGuard.kt b/bukkit/worldguard/api/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/IWorldGuard.kt deleted file mode 100644 index 5d62695..0000000 --- a/bukkit/worldguard/api/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/IWorldGuard.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.r4g3baby.simplescore.bukkit.worldguard - -import org.bukkit.Location -import org.bukkit.entity.Player - -public interface IWorldGuard { - public fun getScoreboardFlag(player: Player, location: Location): List -} \ No newline at end of file diff --git a/bukkit/worldguard/build.gradle.kts b/bukkit/worldguard/build.gradle.kts index f7fa3fe..ebec0bb 100644 --- a/bukkit/worldguard/build.gradle.kts +++ b/bukkit/worldguard/build.gradle.kts @@ -1,7 +1,3 @@ -subprojects { - group = "${project.group}.worldguard" -} - dependencies { api(project(":core")) @@ -9,4 +5,4 @@ dependencies { implementation(project(":bukkit:worldguard:v7")) compileOnly(libs.bukkit) -} \ No newline at end of file +} diff --git a/bukkit/worldguard/api/build.gradle.kts b/bukkit/worldguard/common/build.gradle.kts similarity index 61% rename from bukkit/worldguard/api/build.gradle.kts rename to bukkit/worldguard/common/build.gradle.kts index 704cac6..a080a37 100644 --- a/bukkit/worldguard/api/build.gradle.kts +++ b/bukkit/worldguard/common/build.gradle.kts @@ -1,7 +1,3 @@ -kotlin { - explicitApi() -} - dependencies { compileOnly(libs.bukkit) -} \ No newline at end of file +} diff --git a/bukkit/worldguard/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/IWorldGuard.kt b/bukkit/worldguard/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/IWorldGuard.kt new file mode 100644 index 0000000..3add345 --- /dev/null +++ b/bukkit/worldguard/common/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/IWorldGuard.kt @@ -0,0 +1,8 @@ +package com.r4g3baby.simplescore.bukkit.worldguard + +import org.bukkit.Location +import org.bukkit.entity.Player + +interface IWorldGuard { + fun getScoreboardFlag(player: Player, location: Location): List +} diff --git a/bukkit/worldguard/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/WorldGuardAPI.kt b/bukkit/worldguard/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/WorldGuardAPI.kt index 7da056d..32e0d73 100644 --- a/bukkit/worldguard/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/WorldGuardAPI.kt +++ b/bukkit/worldguard/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/WorldGuardAPI.kt @@ -9,7 +9,7 @@ object WorldGuardAPI { private lateinit var worldguard: IWorldGuard fun initialize() { - if (Bukkit.getPluginManager().getPlugin("WorldGuard") == null) return + if (!Bukkit.getPluginManager().isPluginEnabled("WorldGuard")) return if (classExists("com.sk89q.worldguard.WorldGuard")) { worldguard = com.r4g3baby.simplescore.bukkit.worldguard.v7.WorldGuardImpl() @@ -24,4 +24,4 @@ object WorldGuardAPI { } return emptyList() } -} \ No newline at end of file +} diff --git a/bukkit/worldguard/v6/build.gradle.kts b/bukkit/worldguard/v6/build.gradle.kts index 575ad80..c9dc7a3 100644 --- a/bukkit/worldguard/v6/build.gradle.kts +++ b/bukkit/worldguard/v6/build.gradle.kts @@ -1,8 +1,8 @@ dependencies { - api(project(":bukkit:worldguard:api")) + api(project(":bukkit:worldguard:common")) compileOnly(libs.bukkit) compileOnly(libs.worldguardV6) { exclude(module = "bukkit") } -} \ No newline at end of file +} diff --git a/bukkit/worldguard/v6/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v6/WorldGuardImpl.kt b/bukkit/worldguard/v6/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v6/WorldGuardImpl.kt index 3da9972..236ca68 100644 --- a/bukkit/worldguard/v6/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v6/WorldGuardImpl.kt +++ b/bukkit/worldguard/v6/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v6/WorldGuardImpl.kt @@ -38,4 +38,4 @@ class WorldGuardImpl : IWorldGuard { } return emptyList() } -} \ No newline at end of file +} diff --git a/bukkit/worldguard/v7/build.gradle.kts b/bukkit/worldguard/v7/build.gradle.kts index 9c6e619..be80d75 100644 --- a/bukkit/worldguard/v7/build.gradle.kts +++ b/bukkit/worldguard/v7/build.gradle.kts @@ -1,8 +1,8 @@ dependencies { - api(project(":bukkit:worldguard:api")) + api(project(":bukkit:worldguard:common")) compileOnly(libs.bukkit) compileOnly(libs.worldguardV7) { exclude(module = "bukkit") } -} \ No newline at end of file +} diff --git a/bukkit/worldguard/v7/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v7/WorldGuardImpl.kt b/bukkit/worldguard/v7/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v7/WorldGuardImpl.kt index 1999f33..5f47230 100644 --- a/bukkit/worldguard/v7/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v7/WorldGuardImpl.kt +++ b/bukkit/worldguard/v7/src/main/kotlin/com/r4g3baby/simplescore/bukkit/worldguard/v7/WorldGuardImpl.kt @@ -44,4 +44,4 @@ class WorldGuardImpl : IWorldGuard { } return emptyList() } -} \ No newline at end of file +} diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 13d334e..bced16a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -4,17 +4,8 @@ dependencies { api(libs.semver) } -publishing { - publications { - create("maven") { - from(components["java"]) - } - } -} - -val generateProjectInfo = tasks.register("generateProjectInfo") { - val path = "${rootProject.group}.${rootProject.name.lowercase()}" - val outputDir = layout.buildDirectory.dir("generated/source/projectInfo/$path") +val generateProjectInfo: TaskProvider = tasks.register("generateProjectInfo") { + val outputDir = layout.buildDirectory.dir("generated/source/projectInfo/${rootProject.group}") outputs.dir(outputDir) val outputFile = outputDir.map { it.file("ProjectInfo.kt") }.get().asFile @@ -22,7 +13,7 @@ val generateProjectInfo = tasks.register("generateProjectInfo") { outputFile.parentFile.mkdirs() outputFile.writeText( """ - package $path + package ${rootProject.group} import net.swiftzer.semver.SemVer @@ -51,4 +42,4 @@ kotlin { sourceSets.main { kotlin.srcDir(generateProjectInfo.get().outputs) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/BaseManager.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/BaseManager.kt index fabd72d..3c7bc21 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/BaseManager.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/BaseManager.kt @@ -23,4 +23,4 @@ abstract class BaseManager( config.loadConfig() i18n.loadTranslations(config.language) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseConditionsConfig.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseConditionsConfig.kt index 0a9d314..1ce2131 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseConditionsConfig.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseConditionsConfig.kt @@ -8,4 +8,4 @@ abstract class BaseConditionsConfig( dataFolder: File ) : ConditionsConfig, ConfigFile(dataFolder, "conditions.yml") { override val conditions: MutableMap> = mutableMapOf() -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseMainConfig.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseMainConfig.kt index e4a3c42..9b4fdc0 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseMainConfig.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseMainConfig.kt @@ -18,4 +18,4 @@ abstract class BaseMainConfig( conditionsConfig.loadConfig() scoreboardsConfig.loadConfig() } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseScoreboardsConfig.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseScoreboardsConfig.kt index 6ded508..243e3e2 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseScoreboardsConfig.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/BaseScoreboardsConfig.kt @@ -8,4 +8,4 @@ abstract class BaseScoreboardsConfig( dataFolder: File ) : ScoreboardsConfig, ConfigFile(dataFolder, "scoreboards.yml") { override val scoreboards: MutableMap> = mutableMapOf() -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/ConfigFile.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/ConfigFile.kt index 937c890..11d1041 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/ConfigFile.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/config/ConfigFile.kt @@ -24,4 +24,4 @@ abstract class ConfigFile(parent: File, name: String) : File(parent, na loadVariables(config) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/i18n/I18n.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/i18n/I18n.kt index 1e942ee..10ce5e5 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/i18n/I18n.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/i18n/I18n.kt @@ -128,4 +128,4 @@ class I18n(private val platform: Platform) : I18n { return Collections.emptyEnumeration() } } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/Scoreboard.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/Scoreboard.kt index 40491f3..af26798 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/Scoreboard.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/Scoreboard.kt @@ -28,4 +28,4 @@ class Scoreboard( override fun toString(): String { return "Scoreboard(name=$name, titles=$titles, scores=$scores, conditions=$conditions)" } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/ScoreboardScore.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/ScoreboardScore.kt index 78d973a..ffdeada 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/ScoreboardScore.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/ScoreboardScore.kt @@ -45,4 +45,4 @@ class ScoreboardScore( override fun toString(): String { return "ScoreboardScore(value=$value, lines=$lines, hideNumber=$hideNumber, conditions=$conditions)" } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Contains.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Contains.kt index 4b68185..dabb548 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Contains.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Contains.kt @@ -14,4 +14,4 @@ data class Contains( val parsedValue = if (parseValue) varReplacer.replace(value, viewer) else value return parsedInput.contains(parsedValue, ignoreCase) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/EndsWith.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/EndsWith.kt index 60e3b97..756365d 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/EndsWith.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/EndsWith.kt @@ -14,4 +14,4 @@ data class EndsWith( val parsedValue = if (parseValue) varReplacer.replace(value, viewer) else value return parsedInput.endsWith(parsedValue, ignoreCase) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Equals.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Equals.kt index e74c764..f6b371c 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Equals.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/Equals.kt @@ -14,4 +14,4 @@ data class Equals( val parsedValue = if (parseValue) varReplacer.replace(value, viewer) else value return parsedInput.equals(parsedValue, ignoreCase) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/GreaterThan.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/GreaterThan.kt index 06b6a4a..22aa1c3 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/GreaterThan.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/GreaterThan.kt @@ -24,4 +24,4 @@ data class GreaterThan( if (orEqual) stringCompareResult >= 0 else stringCompareResult > 0 } } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/LessThan.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/LessThan.kt index 1c3ea0c..9805023 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/LessThan.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/LessThan.kt @@ -24,4 +24,4 @@ data class LessThan( if (orEqual) stringCompareResult <= 0 else stringCompareResult < 0 } } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/StartsWith.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/StartsWith.kt index 0450fdf..fde7b09 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/StartsWith.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/condition/StartsWith.kt @@ -14,4 +14,4 @@ data class StartsWith( val parsedValue = if (parseValue) varReplacer.replace(value, viewer) else value return parsedInput.startsWith(parsedValue, ignoreCase) } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/FillEffect.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/FillEffect.kt index c5d2f90..40e5e36 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/FillEffect.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/FillEffect.kt @@ -13,4 +13,4 @@ class FillEffect(private val length: Int) : TextEffect { for (i in 1..(padding / 2)) sb.append(" ") return sb.toString() } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/RainbowEffect.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/RainbowEffect.kt index c25223f..4afde34 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/RainbowEffect.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/effect/RainbowEffect.kt @@ -6,4 +6,4 @@ class RainbowEffect : TextEffect { override fun apply(text: String): String { TODO("Not yet implemented") } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/AnimatedLine.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/AnimatedLine.kt index d3fd0c9..13b1e5c 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/AnimatedLine.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/AnimatedLine.kt @@ -54,4 +54,4 @@ class AnimatedLine( override fun toString(): String { return "AnimatedLine(frames=$frames, textEffects=$textEffects, conditions=$conditions)" } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/BlankLine.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/BlankLine.kt index 3574859..a03eecd 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/BlankLine.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/BlankLine.kt @@ -22,4 +22,4 @@ class BlankLine( override fun toString(): String { return "BlankLine(conditions=$conditions)" } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/ScoreboardLine.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/ScoreboardLine.kt index 4409e64..66565cc 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/ScoreboardLine.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/ScoreboardLine.kt @@ -16,4 +16,4 @@ abstract class ScoreboardLine : ScoreboardLine { } override val uid = getNextIdentifier() -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/StaticLine.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/StaticLine.kt index e0813ff..1c34022 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/StaticLine.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/scoreboard/line/StaticLine.kt @@ -29,4 +29,4 @@ class StaticLine( override fun toString(): String { return "StaticLine(text=$text, renderEvery=$renderEvery, textEffects=$textEffects, conditions=$conditions)" } -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Colors.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Colors.kt index 6bab1c2..31cf33f 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Colors.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Colors.kt @@ -60,4 +60,4 @@ private val colorRegex = Regex("[§&]x(?:[§&][a-fA-F0-9]){6}|[§&][0-9a-fk-orA- fun stripColorCodes(text: String): String { return colorRegex.replace(text, "") -} \ No newline at end of file +} diff --git a/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Updates.kt b/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Updates.kt index a246a74..daa4c12 100644 --- a/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Updates.kt +++ b/core/src/main/kotlin/com/r4g3baby/simplescore/core/util/Updates.kt @@ -43,4 +43,4 @@ fun checkForUpdates(onNewVersion: (SemVer) -> Unit, onNoVersion: (Exception?) -> } finally { connection.disconnect() } -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 85fe318..de38537 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,36 +1,44 @@ [versions] -# plugins +# Plugins kotlin = "2.3.0" -shadowJar = "9.3.0" +shadow = "9.3.0" hangar = "0.1.4" minotaur = "2.8.10" -# libraries +# Libraries bukkit = "1.8.8-R0.1-SNAPSHOT" netty = "4.1.97.Final" papi = "2.11.6" adventure = "4.25.0" -objenesis = "3.4" -semver = "2.1.0" -bStats = "3.1.0" - worldguardV6 = "6.2" worldguardV7 = "7.0.0" +bStats = "3.1.0" +semver = "2.1.0" +objenesis = "3.4" [plugins] kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -shadowJar = { id = "com.gradleup.shadow", version.ref = "shadowJar" } +shadow = { id = "com.gradleup.shadow", version.ref = "shadow" } hangar = { id = "io.papermc.hangar-publish-plugin", version.ref = "hangar" } minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" } [libraries] +# Bukkit bukkit = { module = "org.bukkit:bukkit", version.ref = "bukkit" } netty = { module = "io.netty:netty-transport", version.ref = "netty" } papi = { module = "me.clip:placeholderapi", version.ref = "papi" } + +# Adventure adventureMiniMessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" } adventureSerializer = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "adventure" } -objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" } -semver = { module = "net.swiftzer.semver:semver", version.ref = "semver" } -bStatsBukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bStats" } + +# WorldGuard worldguardV6 = { module = "com.sk89q.worldguard:worldguard-legacy", version.ref = "worldguardV6" } worldguardV7 = { module = "com.sk89q.worldguard:worldguard-bukkit", version.ref = "worldguardV7" } + +# bStats +bStatsBukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bStats" } + +# Utilities +semver = { module = "net.swiftzer.semver:semver", version.ref = "semver" } +objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" } diff --git a/jitpack.yml b/jitpack.yml index a202792..727c9ab 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk21 \ No newline at end of file + - openjdk21 diff --git a/settings.gradle.kts b/settings.gradle.kts index 5d6d72f..ead1432 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,14 +10,20 @@ dependencyResolutionManagement { repositories { mavenCentral() - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") - maven("https://repo.helpch.at/releases") - maven("https://maven.enginehub.org/repo/") + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") { + name = "spigotmc-repo" + } + maven("https://repo.helpch.at/releases") { + name = "helpchat-repo" + } + maven("https://maven.enginehub.org/repo/") { + name = "enginehub-repo" + } } } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version("1.0.0") + id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0") } rootProject.name = "SimpleScore" @@ -25,11 +31,7 @@ rootProject.name = "SimpleScore" include("api") include("core") include("bukkit") -include("bukkit:protocol") -include("bukkit:protocol:common") -include("bukkit:protocol:modern") -include("bukkit:protocol:legacy") include("bukkit:worldguard") -include("bukkit:worldguard:api") +include("bukkit:worldguard:common") include("bukkit:worldguard:v6") -include("bukkit:worldguard:v7") \ No newline at end of file +include("bukkit:worldguard:v7")