diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12b3274..fb7a8dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,4 +35,4 @@ jobs: run: chmod +x ./gradlew - name: Build and test - run: ./gradlew clean build + run: ./gradlew clean build -x spotlessCheck -x detektMain -x detektTest diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..389ea11 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,42 @@ +name: Lint + +on: + pull_request: + branches: + - main + types: [opened, synchronize, reopened, ready_for_review] + push: + branches: + - main + - develop + +concurrency: + group: lint-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + lint: + name: lint + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v7 + + - name: Set up JDK + uses: actions/setup-java@v6 + with: + distribution: 'temurin' + java-version: '25' + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 + + - name: Make gradlew executable + run: chmod +x ./gradlew + + - name: Run spotless and detekt + run: ./gradlew spotlessCheck detektMain detektTest --continue diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47b038d..29d345e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: run: ./gradlew clean build $GRADLE_ARGS - name: Publish to SimpleCloud Repository - run: ./gradlew publish $GRADLE_ARGS + run: ./gradlew publish :build-logic:publish $GRADLE_ARGS env: SIMPLECLOUD_USERNAME: ${{ secrets.SIMPLECLOUD_USERNAME }} SIMPLECLOUD_PASSWORD: ${{ secrets.SIMPLECLOUD_PASSWORD }} diff --git a/README.md b/README.md index 20c7096..07ae51b 100644 --- a/README.md +++ b/README.md @@ -39,20 +39,20 @@ This repository holds classes that are very commonly used in plugins. ### Gradle Kotlin ```kt -implementation("app.simplecloud.plugin:plugin-shared:VERSION") +implementation("app.simplecloud.api.plugin:plugin-shared:VERSION") ``` ### Gradle Groovy ```groovy -implementation "app.simplecloud.plugin:plugin-shared:VERSION" +implementation "app.simplecloud.api.plugin:plugin-shared:VERSION" ``` ### Maven ```xml - app.simplecloud.plugin + app.simplecloud.api.plugin plugin-shared VERSION @@ -82,16 +82,16 @@ This repository is licensed under [Apache 2.0][license]. [modrinth]: https://modrinth.com/organization/simplecloud -[dev]: https://repo.simplecloud.app/#/snapshots/app/simplecloud/plugin +[dev]: https://repo.simplecloud.app/#/snapshots/app/simplecloud/api/plugin -[artifacts]: https://repo.simplecloud.app/#/snapshots/app/simplecloud/plugin +[artifacts]: https://repo.simplecloud.app/#/snapshots/app/simplecloud/api/plugin -[dev-artifacts]: https://repo.simplecloud.app/#/snapshots/app/simplecloud/plugin +[dev-artifacts]: https://repo.simplecloud.app/#/snapshots/app/simplecloud/api/plugin [badge-maven-central]: https://img.shields.io/maven-central/v/app.simplecloud.droplet.api/droplet-api?labelColor=18181b&style=flat-square&color=65a30d&label=Release -[badge-dev]: https://repo.simplecloud.app/api/badge/latest/snapshots/app/simplecloud/plugin/plugin-shared?name=Dev&style=flat-square&color=0ea5e9 +[badge-dev]: https://repo.simplecloud.app/api/badge/latest/snapshots/app/simplecloud/api/plugin/plugin-shared?name=Dev&style=flat-square&color=0ea5e9 diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 0000000..c37a710 --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,33 @@ +plugins { + `kotlin-dsl` + `maven-publish` +} + +val baseVersion = "1.0.0" +val isRelease = providers.gradleProperty("release").isPresent +val commitHash = providers.exec { + commandLine("git", "rev-parse", "--short", "HEAD") +}.standardOutput.asText.get().trim() + +group = "app.simplecloud.gradle" +version = if (isRelease) baseVersion else "$baseVersion-dev.$commitHash" + +dependencies { + implementation(libs.kotlin.gradle.plugin) + implementation(libs.shadow.gradle.plugin) + implementation(libs.spotless.gradle.plugin) + implementation(libs.detekt.gradle.plugin) +} + +publishing { + repositories { + maven { + name = "simplecloud" + url = uri("https://repo.simplecloud.app/snapshots") + credentials { + username = System.getenv("SIMPLECLOUD_USERNAME") + password = System.getenv("SIMPLECLOUD_PASSWORD") + } + } + } +} diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 0000000..2f210de --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1,14 @@ +dependencyResolutionManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } + + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} + +rootProject.name = "build-logic" diff --git a/build-logic/src/main/kotlin/app/simplecloud/gradle/WriteTextFile.kt b/build-logic/src/main/kotlin/app/simplecloud/gradle/WriteTextFile.kt new file mode 100644 index 0000000..2b6e86b --- /dev/null +++ b/build-logic/src/main/kotlin/app/simplecloud/gradle/WriteTextFile.kt @@ -0,0 +1,23 @@ +package app.simplecloud.gradle + +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction + +/** Writes [text] to [outputFile]. */ +abstract class WriteTextFile : DefaultTask() { + + @get:Input + abstract val text: Property + + @get:OutputFile + abstract val outputFile: RegularFileProperty + + @TaskAction + fun write() { + outputFile.get().asFile.writeText(text.get()) + } +} diff --git a/build-logic/src/main/kotlin/simplecloud.base-conventions.gradle.kts b/build-logic/src/main/kotlin/simplecloud.base-conventions.gradle.kts new file mode 100644 index 0000000..d610377 --- /dev/null +++ b/build-logic/src/main/kotlin/simplecloud.base-conventions.gradle.kts @@ -0,0 +1,47 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion + +plugins { + kotlin("jvm") + id("com.gradleup.shadow") + id("simplecloud.spotless-conventions") + id("simplecloud.detekt-conventions") +} + +repositories { + mavenCentral() + mavenLocal() + maven("https://buf.build/gen/maven") + maven("https://repo.spectr.is/snapshots") + maven("https://repo.simplecloud.app/snapshots") + maven("https://repo.papermc.io/repository/maven-public") +} + +dependencies { + testImplementation(kotlin("test")) +} + +kotlin { + jvmToolchain(25) + compilerOptions { + jvmTarget = JvmTarget.JVM_25 + languageVersion = KotlinVersion.KOTLIN_2_4 + apiVersion = KotlinVersion.KOTLIN_2_4 + } +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(25)) +} + +tasks.test { + useJUnitPlatform() +} + +tasks.processResources { + val properties = mapOf("version" to project.version.toString()) + inputs.properties(properties) + filesMatching(listOf("plugin.yml", "paper-plugin.yml")) { + expand(properties) + } +} diff --git a/build-logic/src/main/kotlin/simplecloud.detekt-conventions.gradle.kts b/build-logic/src/main/kotlin/simplecloud.detekt-conventions.gradle.kts new file mode 100644 index 0000000..def8a7a --- /dev/null +++ b/build-logic/src/main/kotlin/simplecloud.detekt-conventions.gradle.kts @@ -0,0 +1,30 @@ +import app.simplecloud.gradle.WriteTextFile + +plugins { + id("dev.detekt") +} + +val defaultConfigText = checkNotNull(javaClass.getResource("/detekt/detekt.yml")) { "detekt.yml not found" }.readText() +val projectConfig = rootProject.file("config/detekt/detekt.yml") + +val extractDetektConfig = tasks.register("extractDetektConfig") { + description = "Extracts the detekt config" + text = defaultConfigText + outputFile = layout.buildDirectory.file("detekt/detekt.yml") +} + +detekt { + buildUponDefaultConfig = true + parallel = true + config.setFrom(extractDetektConfig.flatMap { it.outputFile }) + if (projectConfig.exists()) { + config.from(projectConfig) + } +} + +pluginManager.withPlugin("org.jetbrains.kotlin.jvm") { + tasks.named("check") { + setDependsOn(dependsOn.filterNot { it is TaskProvider<*> && it.name == "detekt" }) + dependsOn("detektMain", "detektTest") + } +} diff --git a/build-logic/src/main/kotlin/simplecloud.spotless-conventions.gradle.kts b/build-logic/src/main/kotlin/simplecloud.spotless-conventions.gradle.kts new file mode 100644 index 0000000..ea1ec31 --- /dev/null +++ b/build-logic/src/main/kotlin/simplecloud.spotless-conventions.gradle.kts @@ -0,0 +1,23 @@ +plugins { + id("com.diffplug.spotless") +} + +val ktlintVersion = "1.8.0" +val ktlintEditorConfig = mapOf( + "ktlint_code_style" to "intellij_idea", + "max_line_length" to "120", + "ij_kotlin_packages_to_use_import_on_demand" to "kotlin.**,kotlinx.**,io.ktor.**", + "ktlint_standard_function-signature" to "disabled", + "ktlint_standard_multiline-expression-wrapping" to "disabled", + "ktlint_standard_chain-method-continuation" to "disabled", +) + +spotless { + kotlin { + ktlint(ktlintVersion).editorConfigOverride(ktlintEditorConfig) + } + + kotlinGradle { + ktlint(ktlintVersion).editorConfigOverride(ktlintEditorConfig) + } +} diff --git a/build-logic/src/main/resources/detekt/detekt.yml b/build-logic/src/main/resources/detekt/detekt.yml new file mode 100644 index 0000000..e459542 --- /dev/null +++ b/build-logic/src/main/resources/detekt/detekt.yml @@ -0,0 +1,41 @@ +complexity: + TooManyFunctions: + active: false + LongParameterList: + allowedFunctionParameters: 6 + allowedConstructorParameters: 8 + ignoreDefaultParameters: true + LongMethod: + allowedLines: 80 + CyclomaticComplexMethod: + ignoreSimpleWhenEntries: true + +style: + ForbiddenMethodCall: + active: true + methods: + - 'kotlin.io.print' + - 'kotlin.io.println' + - 'java.math.BigDecimal.(kotlin.Double)' + - 'java.math.BigDecimal.(kotlin.String)' + - 'kotlin.system.measureTimeMillis' + - 'kotlin.apply' + - 'kotlin.also' + - 'kotlin.let' + - 'kotlin.run' + - 'kotlin.with' + - 'kotlin.takeIf' + - 'kotlin.takeUnless' + MagicNumber: + active: false + # formatting is handled by ktlint + MaxLineLength: + active: false + ReturnCount: + max: 3 + excludeGuardClauses: true + ThrowsCount: + max: 3 + excludeGuardClauses: true + WildcardImport: + active: false diff --git a/build.gradle.kts b/build.gradle.kts index 53464ea..1c0ac2c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,6 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.gradle.dsl.KotlinVersion - plugins { id("maven-publish") - alias(libs.plugins.kotlin) + id("simplecloud.base-conventions") apply false } val baseVersion = "1.0.0" @@ -13,51 +10,24 @@ val commitHash = providers.exec { }.standardOutput.asText.get().trim() allprojects { - group = "app.simplecloud.plugin" + group = "app.simplecloud.api.plugin" version = if (isRelease) baseVersion else "$baseVersion-dev.$commitHash" - - repositories { - mavenCentral() - mavenLocal() - maven("https://buf.build/gen/maven") - maven("https://repo.spectr.is/snapshots") - maven("https://repo.simplecloud.app/snapshots") - maven("https://repo.papermc.io/repository/maven-public") - } } subprojects { apply { plugin("maven-publish") - plugin("org.jetbrains.kotlin.jvm") + plugin("simplecloud.base-conventions") } dependencies { - testImplementation(rootProject.libs.kotlin.test) - compileOnly(rootProject.libs.kotlin.jvm) - compileOnly(rootProject.libs.kotlin.coroutines) - compileOnly(rootProject.libs.simplecloud.api) - compileOnly(rootProject.libs.bundles.cloud) - compileOnly(rootProject.libs.bundles.adventure) - compileOnly(rootProject.libs.bundles.configurate) - compileOnly(rootProject.libs.slf4j.api) - } - - kotlin { - jvmToolchain(25) - compilerOptions { - jvmTarget = JvmTarget.JVM_25 - languageVersion = KotlinVersion.KOTLIN_2_4 - apiVersion = KotlinVersion.KOTLIN_2_4 - } - } - - java { - toolchain.languageVersion.set(JavaLanguageVersion.of(25)) - } - - tasks.test { - useJUnitPlatform() + "compileOnly"(rootProject.libs.kotlin.jvm) + "compileOnly"(rootProject.libs.kotlin.coroutines) + "compileOnly"(rootProject.libs.simplecloud.api) + "compileOnly"(rootProject.libs.bundles.cloud) + "compileOnly"(rootProject.libs.bundles.adventure) + "compileOnly"(rootProject.libs.bundles.configurate) + "compileOnly"(rootProject.libs.slf4j.api) } publishing { @@ -79,4 +49,4 @@ subprojects { } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..02d89b8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=1g +org.gradle.configuration-cache=true +org.gradle.caching=true +org.gradle.parallel=true +org.gradle.tooling.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index adaa298..3e744b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,10 @@ cloud = "2.1.0" cloud-platform = "2.0.0" cloud-minestom = "2.2.0-SNAPSHOT" +shadow = "9.6.1" +spotless = "8.10.4" +detekt = "2.0.0-alpha.6" + [libraries] kotlin-jvm = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } @@ -47,6 +51,11 @@ cloud-bungee = { module = "org.incendo:cloud-bungee", version.ref = "cloud-platf cloud-paper = { module = "org.incendo:cloud-paper", version.ref = "cloud-platform" } cloud-minestom = { module = "org.incendo:cloud-minestom", version.ref = "cloud-minestom" } +kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +shadow-gradle-plugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" } +spotless-gradle-plugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" } +detekt-gradle-plugin = { module = "dev.detekt:detekt-gradle-plugin", version.ref = "detekt" } + [bundles] adventure = ["adventure", "adventure-text-minimessage"] configurate = ["configurate-yaml", "configurate-gson", "configurate-extra-kotlin"] diff --git a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSender.kt b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSender.kt index e70ffb0..9177998 100644 --- a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSender.kt +++ b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSender.kt @@ -7,24 +7,15 @@ import net.md_5.bungee.api.CommandSender import net.md_5.bungee.api.connection.ProxiedPlayer import java.util.UUID -class BungeeCloudSender( - private val commandSender: CommandSender -) : CloudSender { +class BungeeCloudSender(private val commandSender: CommandSender) : CloudSender { - fun getCommandSender(): CommandSender { - return commandSender - } + fun getCommandSender(): CommandSender = commandSender - override fun getUniqueId(): UUID? { - return (commandSender as? ProxiedPlayer)?.uniqueId - } + override fun getUniqueId(): UUID? = (commandSender as? ProxiedPlayer)?.uniqueId - override fun hasPermission(permission: String): Boolean { - return commandSender.hasPermission(permission) - } + override fun hasPermission(permission: String): Boolean = commandSender.hasPermission(permission) override fun sendMessage(message: Component) { commandSender.sendMessage(BungeeComponentConverter.toBungee(message)) } - } diff --git a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSenderMapper.kt b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSenderMapper.kt index 698ddee..c90a281 100644 --- a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSenderMapper.kt +++ b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/command/BungeeCloudSenderMapper.kt @@ -5,12 +5,7 @@ import org.incendo.cloud.SenderMapper class BungeeCloudSenderMapper : SenderMapper { - override fun map(base: CommandSender): BungeeCloudSender { - return BungeeCloudSender(base) - } - - override fun reverse(mapped: BungeeCloudSender): CommandSender { - return mapped.getCommandSender() - } + override fun map(base: CommandSender): BungeeCloudSender = BungeeCloudSender(base) + override fun reverse(mapped: BungeeCloudSender): CommandSender = mapped.getCommandSender() } diff --git a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/permission/BungeeCordPermissionChecker.kt b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/permission/BungeeCordPermissionChecker.kt index 9753dfb..6e09d0a 100644 --- a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/permission/BungeeCordPermissionChecker.kt +++ b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/permission/BungeeCordPermissionChecker.kt @@ -5,8 +5,5 @@ import net.md_5.bungee.api.connection.ProxiedPlayer class BungeeCordPermissionChecker : PermissionChecker { - override fun checkPermission(player: ProxiedPlayer, name: String): Boolean { - return player.hasPermission(name) - } - + override fun checkPermission(player: ProxiedPlayer, name: String): Boolean = player.hasPermission(name) } diff --git a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/text/BungeeComponentConverter.kt b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/text/BungeeComponentConverter.kt index 9d85dc2..f1e1632 100644 --- a/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/text/BungeeComponentConverter.kt +++ b/plugin-bungeecord/src/main/kotlin/app/simplecloud/plugin/api/bungeecord/text/BungeeComponentConverter.kt @@ -5,22 +5,16 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer import net.md_5.bungee.api.chat.BaseComponent import net.md_5.bungee.chat.ComponentSerializer -/** - * Converts between Adventure and BungeeCord components. - */ +/** Converts between Adventure and BungeeCord components. */ object BungeeComponentConverter { private val serializer = GsonComponentSerializer.gson() - /** - * Converts the given [component] into a [BaseComponent]. - */ + /** Converts the given [component] into a [BaseComponent]. */ fun toBungee(component: Component): BaseComponent = ComponentSerializer.deserialize(serializer.serialize(component)) - /** - * Converts the given [component] into an Adventure [Component]. - */ + /** Converts the given [component] into an Adventure [Component]. */ fun fromBungee(component: BaseComponent): Component = serializer.deserialize(ComponentSerializer.toString(component)) } diff --git a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSender.kt b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSender.kt index 92067f5..8476ee7 100644 --- a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSender.kt +++ b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSender.kt @@ -7,25 +7,16 @@ import net.minestom.server.command.CommandSender import net.minestom.server.entity.Player import java.util.UUID -class MinestomCloudSender( - private val commandSender: CommandSender, - private val permissions: MinestomPermissions -) : CloudSender { +class MinestomCloudSender(private val commandSender: CommandSender, private val permissions: MinestomPermissions) : + CloudSender { - fun getCommandSender(): CommandSender { - return commandSender - } + fun getCommandSender(): CommandSender = commandSender - override fun getUniqueId(): UUID? { - return (commandSender as? Player)?.uuid - } + override fun getUniqueId(): UUID? = (commandSender as? Player)?.uuid - override fun hasPermission(permission: String): Boolean { - return permissions.hasPermission(commandSender, permission) - } + override fun hasPermission(permission: String): Boolean = permissions.hasPermission(commandSender, permission) override fun sendMessage(message: Component) { commandSender.sendMessage(message) } - } diff --git a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSenderMapper.kt b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSenderMapper.kt index 6ca2b6a..2be8866 100644 --- a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSenderMapper.kt +++ b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/command/MinestomCloudSenderMapper.kt @@ -4,16 +4,10 @@ import app.simplecloud.plugin.api.minestom.permission.MinestomPermissions import net.minestom.server.command.CommandSender import org.incendo.cloud.SenderMapper -class MinestomCloudSenderMapper( - private val permissions: MinestomPermissions -) : SenderMapper { +class MinestomCloudSenderMapper(private val permissions: MinestomPermissions) : + SenderMapper { - override fun map(base: CommandSender): MinestomCloudSender { - return MinestomCloudSender(base, permissions) - } - - override fun reverse(mapped: MinestomCloudSender): CommandSender { - return mapped.getCommandSender() - } + override fun map(base: CommandSender): MinestomCloudSender = MinestomCloudSender(base, permissions) + override fun reverse(mapped: MinestomCloudSender): CommandSender = mapped.getCommandSender() } diff --git a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissionChecker.kt b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissionChecker.kt index 63ed96c..58685c2 100644 --- a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissionChecker.kt +++ b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissionChecker.kt @@ -5,8 +5,5 @@ import net.minestom.server.entity.Player class MinestomPermissionChecker(private val permissions: MinestomPermissions) : PermissionChecker { - override fun checkPermission(player: Player, name: String): Boolean { - return permissions.hasPermission(player, name) - } - + override fun checkPermission(player: Player, name: String): Boolean = permissions.hasPermission(player, name) } diff --git a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissions.kt b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissions.kt index 7bd91ef..f5027b9 100644 --- a/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissions.kt +++ b/plugin-minestom/src/main/kotlin/app/simplecloud/plugin/api/minestom/permission/MinestomPermissions.kt @@ -6,24 +6,20 @@ import net.minestom.server.entity.Player import java.util.function.BiPredicate /** - * Utility for checking permissions on a Minestom server. - * Without a [check], only players with permission level 4 have permissions. + * Utility for checking permissions on a Minestom server. Without a [check], only players with + * permission level 4 have permissions. */ class MinestomPermissions(private val check: BiPredicate?) { val hasCheck: Boolean = check != null - fun hasPermission(sender: CommandSender, permission: String): Boolean { - if (permission.isEmpty()) return true - if (sender is ConsoleSender) return true - if (sender !is Player) return false - - if (check != null) return check.test(sender, permission) - return sender.permissionLevel >= 4 - } - - fun getChecker(): MinestomPermissionChecker { - return MinestomPermissionChecker(this) + fun hasPermission(sender: CommandSender, permission: String): Boolean = when { + permission.isEmpty() -> true + sender is ConsoleSender -> true + sender !is Player -> false + check != null -> check.test(sender, permission) + else -> sender.permissionLevel >= 4 } + fun getChecker(): MinestomPermissionChecker = MinestomPermissionChecker(this) } diff --git a/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSender.kt b/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSender.kt index e4b0ba3..7757c05 100644 --- a/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSender.kt +++ b/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSender.kt @@ -9,24 +9,15 @@ import java.util.UUID class PaperCloudSender(private val sourceStack: CommandSourceStack) : CloudSender { - fun getSourceStack(): CommandSourceStack { - return sourceStack - } + fun getSourceStack(): CommandSourceStack = sourceStack - fun getCommandSender(): CommandSender { - return sourceStack.sender - } + fun getCommandSender(): CommandSender = sourceStack.sender - override fun getUniqueId(): UUID? { - return (sourceStack.sender as? Player)?.uniqueId - } + override fun getUniqueId(): UUID? = (sourceStack.sender as? Player)?.uniqueId - override fun hasPermission(permission: String): Boolean { - return sourceStack.sender.hasPermission(permission) - } + override fun hasPermission(permission: String): Boolean = sourceStack.sender.hasPermission(permission) override fun sendMessage(message: Component) { sourceStack.sender.sendMessage(message) } - } diff --git a/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSenderMapper.kt b/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSenderMapper.kt index 7ce54d3..c9f2926 100644 --- a/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSenderMapper.kt +++ b/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/command/PaperCloudSenderMapper.kt @@ -5,12 +5,7 @@ import org.incendo.cloud.SenderMapper object PaperCloudSenderMapper : SenderMapper { - override fun map(base: CommandSourceStack): PaperCloudSender { - return PaperCloudSender(base) - } - - override fun reverse(mapped: PaperCloudSender): CommandSourceStack { - return mapped.getSourceStack() - } + override fun map(base: CommandSourceStack): PaperCloudSender = PaperCloudSender(base) + override fun reverse(mapped: PaperCloudSender): CommandSourceStack = mapped.getSourceStack() } diff --git a/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/permission/PaperPermissionChecker.kt b/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/permission/PaperPermissionChecker.kt index f3bda7b..93721ec 100644 --- a/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/permission/PaperPermissionChecker.kt +++ b/plugin-paper/src/main/kotlin/app/simplecloud/plugin/api/paper/permission/PaperPermissionChecker.kt @@ -5,8 +5,5 @@ import org.bukkit.entity.Player class PaperPermissionChecker : PermissionChecker { - override fun checkPermission(player: Player, name: String): Boolean { - return player.hasPermission(name) - } - + override fun checkPermission(player: Player, name: String): Boolean = player.hasPermission(name) } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/adventure/AdventureExt.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/adventure/AdventureExt.kt index 9d87bfc..00f0fd2 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/adventure/AdventureExt.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/adventure/AdventureExt.kt @@ -14,39 +14,48 @@ val miniMessage = MiniMessage.miniMessage() private val playerNameRegex = Regex("""^[^<>:'"\\\s]{1,32}$""") -fun text(message: String, vararg tagResolver: TagResolver): Component { - return miniMessage.deserialize(message, *tagResolver) -} - -fun tags(vararg entries: Pair): TagResolver { - return TagResolver.resolver( - entries.map { (key, value) -> - val text = value?.toString() ?: "" - if (key == "playername" && playerNameRegex.matches(text)) Placeholder.parsed(key, text) else Placeholder.unparsed(key, text) +fun text(message: String, vararg tagResolver: TagResolver): Component = miniMessage.deserialize(message, *tagResolver) + +fun tags(vararg entries: Pair): TagResolver = TagResolver.resolver( + entries.map { (key, value) -> + val text = value?.toString().orEmpty() + if (key == "playername" && playerNameRegex.matches(text)) { + Placeholder.parsed(key, text) + } else { + Placeholder.unparsed(key, text) } - ) -} + }, +) suspend fun String.appendToComponent( server: Server, prefix: String? = null, vararg argumentsResolver: ArgumentsResolver, -): Component { - return PlaceholderProvider.serverPlaceholderProvider.append(server, this, prefix, *argumentsResolver) -} +): Component = PlaceholderProvider.serverPlaceholderProvider.append( + server, + this, + prefix, + *argumentsResolver, +) suspend fun String.appendToComponent( group: Group, prefix: String? = null, - vararg argumentsResolver: ArgumentsResolver -): Component { - return PlaceholderProvider.groupPlaceholderProvider.append(group, this, prefix, *argumentsResolver) -} + vararg argumentsResolver: ArgumentsResolver, +): Component = PlaceholderProvider.groupPlaceholderProvider.append( + group, + this, + prefix, + *argumentsResolver, +) suspend fun String.appendToComponent( persistentServer: PersistentServer, prefix: String? = null, - vararg argumentsResolver: ArgumentsResolver -): Component { - return PlaceholderProvider.persistentServerPlaceholderProvider.append(persistentServer, this, prefix, *argumentsResolver) -} \ No newline at end of file + vararg argumentsResolver: ArgumentsResolver, +): Component = PlaceholderProvider.persistentServerPlaceholderProvider.append( + persistentServer, + this, + prefix, + *argumentsResolver, +) diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSender.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSender.kt index d53c292..5fcea2b 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSender.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSender.kt @@ -3,29 +3,18 @@ package app.simplecloud.plugin.api.shared.command import net.kyori.adventure.text.Component import java.util.UUID -/** - * A command sender, e.g. a player or the console. - */ +/** A command sender, e.g. a player or the console. */ interface CloudSender { - /** - * The unique id of the player, or `null` if the sender is not a player. - */ + /** The unique id of the player, or `null` if the sender is not a player. */ fun getUniqueId(): UUID? - /** - * Whether the sender has the given [permission]. - */ + /** Whether the sender has the given [permission]. */ fun hasPermission(permission: String): Boolean - /** - * Sends the [message] to the sender. - */ + /** Sends the [message] to the sender. */ fun sendMessage(message: Component) - /** - * Whether the sender is a player. - */ + /** Whether the sender is a player. */ fun isPlayer(): Boolean = getUniqueId() != null - } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSuggestions.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSuggestions.kt index 93901fe..78b2393 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSuggestions.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/command/CloudSuggestions.kt @@ -9,17 +9,13 @@ import org.incendo.cloud.kotlin.coroutines.SuspendingSuggestionProvider import org.incendo.cloud.suggestion.Suggestion import org.incendo.cloud.suggestion.SuggestionProvider -/** - * Commonly used suggestion providers for commands. - */ +/** Commonly used suggestion providers for commands. */ object CloudSuggestions { const val TARGET_TYPE_GROUP = "group" const val TARGET_TYPE_PERSISTENT_SERVER = "ps" - /** - * Suggests the names of all groups. - */ + /** Suggests the names of all groups. */ fun groups(api: CloudApi): SuggestionProvider = SuspendingSuggestionProvider { _, _ -> try { @@ -27,101 +23,102 @@ object CloudSuggestions { } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all groups of the given [type]. - */ + /** Suggests the names of all groups of the given [type]. */ fun groups(api: CloudApi, type: GroupServerType): SuggestionProvider = SuspendingSuggestionProvider { _, _ -> try { - api.group().allGroups.await() + api.group() + .allGroups + .await() .filter { it.type == type } .map { Suggestion.suggestion(it.name) } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all proxy groups. - */ + /** Suggests the names of all proxy groups. */ fun proxyGroups(api: CloudApi): SuggestionProvider = groups(api, GroupServerType.PROXY) - /** - * Suggests the names of all server groups. - */ + /** Suggests the names of all server groups. */ fun serverGroups(api: CloudApi): SuggestionProvider = groups(api, GroupServerType.SERVER) /** - * Suggests the numerical ids of the servers of the group stored in the argument [groupArgument]. + * Suggests the numerical ids of the servers of the group stored in the argument + * [groupArgument]. */ fun serverIds(api: CloudApi, groupArgument: String = "group"): SuggestionProvider = SuspendingSuggestionProvider { context, _ -> try { val group = context.get(groupArgument) - api.server().getServersByGroup(group).await() + api.server() + .getServersByGroup(group) + .await() .sortedBy { it.numericalId } .map { Suggestion.suggestion(it.numericalId.toString()) } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all running servers. - */ + /** Suggests the names of all running servers. */ fun servers(api: CloudApi): SuggestionProvider = SuspendingSuggestionProvider { _, _ -> try { - api.server().allServers.await() + api.server() + .allServers + .await() .mapNotNull { serverName(it) } .map { Suggestion.suggestion(it) } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all running servers in one of the given [states]. - */ + /** Suggests the names of all running servers in one of the given [states]. */ fun servers(api: CloudApi, vararg states: ServerState): SuggestionProvider { val stateSet = states.toSet() return SuspendingSuggestionProvider { _, _ -> try { - api.server().allServers.await() + api.server() + .allServers + .await() .filter { it.state in stateSet } .mapNotNull { serverName(it) } .map { Suggestion.suggestion(it) } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() } - /** - * Suggests the names of all running servers that players can join. - */ + /** Suggests the names of all running servers that players can join. */ fun availableServers(api: CloudApi): SuggestionProvider = servers(api, ServerState.AVAILABLE, ServerState.INGAME) - /** - * Suggests the names of all persistent servers. - */ + /** Suggests the names of all persistent servers. */ fun persistentServers(api: CloudApi): SuggestionProvider = SuspendingSuggestionProvider { _, _ -> try { - api.persistentServer().allPersistentServers.await().map { Suggestion.suggestion(it.name) } + api.persistentServer().allPersistentServers.await().map { + Suggestion.suggestion(it.name) + } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all online players. - */ + /** Suggests the names of all online players. */ fun onlinePlayers(api: CloudApi): SuggestionProvider = SuspendingSuggestionProvider { _, _ -> try { @@ -129,98 +126,116 @@ object CloudSuggestions { } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all online players except the command sender. - */ + /** Suggests the names of all online players except the command sender. */ fun otherOnlinePlayers(api: CloudApi): SuggestionProvider = SuspendingSuggestionProvider { context, _ -> try { val uniqueId = context.sender().getUniqueId() - api.player().onlinePlayers.await() + api.player() + .onlinePlayers + .await() .filter { it.uniqueId != uniqueId } .map { Suggestion.suggestion(it.name) } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the names of all players connected to the server stored in the argument [serverArgument]. - */ - //fun playersOnServer(api: CloudApi, serverArgument: String = "server"): SuggestionProvider = + // Suggests the names of all players connected to the server stored in the argument + // [serverArgument]. + // fun playersOnServer(api: CloudApi, serverArgument: String = "server"): + // SuggestionProvider = // SuspendingSuggestionProvider { context, _ -> // try { // val server = context.get(serverArgument) - // api.player().getOnlinePlayers(server).await().map { Suggestion.suggestion(it.name) } + // api.player().getOnlinePlayers(server).await().map { Suggestion.suggestion(it.name) + // } // } catch (_: Exception) { // emptyList() // } // }.asSuggestionProvider() /** - * Suggests the names of all players connected to the proxy stored in the argument [proxyArgument]. + * Suggests the names of all players connected to the proxy stored in the argument + * [proxyArgument]. */ - fun playersOnProxy(api: CloudApi, proxyArgument: String = "proxy"): SuggestionProvider = + fun playersOnProxy( + api: CloudApi, + proxyArgument: String = "proxy", + ): SuggestionProvider = SuspendingSuggestionProvider { context, _ -> try { val proxy = context.get(proxyArgument) - api.player().onlinePlayers.await() + api.player() + .onlinePlayers + .await() .filter { it.connectedProxyName.equals(proxy, true) } .map { Suggestion.suggestion(it.name) } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests the target types [TARGET_TYPE_GROUP] and [TARGET_TYPE_PERSISTENT_SERVER]. - */ + /** Suggests the target types [TARGET_TYPE_GROUP] and [TARGET_TYPE_PERSISTENT_SERVER]. */ fun targetTypes(): SuggestionProvider = of(TARGET_TYPE_GROUP, TARGET_TYPE_PERSISTENT_SERVER) /** - * Suggests group or persistent server names, depending on the target type stored in the argument [targetTypeArgument]. + * Suggests group or persistent server names, depending on the target type stored in the + * argument [targetTypeArgument]. */ - fun targets(api: CloudApi, targetTypeArgument: String = "targetType"): SuggestionProvider = + fun targets( + api: CloudApi, + targetTypeArgument: String = "targetType", + ): SuggestionProvider = SuspendingSuggestionProvider { context, _ -> try { val targetType = context.get(targetTypeArgument) when { - targetType.equals(TARGET_TYPE_GROUP, true) -> api.group().allGroups.await().map { Suggestion.suggestion(it.name) } - targetType.equals(TARGET_TYPE_PERSISTENT_SERVER, true) -> api.persistentServer().allPersistentServers.await().map { Suggestion.suggestion(it.name) } + targetType.equals(TARGET_TYPE_GROUP, true) -> + api.group().allGroups.await().map { Suggestion.suggestion(it.name) } + + targetType.equals(TARGET_TYPE_PERSISTENT_SERVER, true) -> + api.persistentServer().allPersistentServers.await().map { + Suggestion.suggestion(it.name) + } + else -> emptyList() } } catch (_: Exception) { emptyList() } - }.asSuggestionProvider() + } + .asSuggestionProvider() - /** - * Suggests all known [ServerState]s. - */ + /** Suggests all known [ServerState]s. */ fun serverStates(): SuggestionProvider = - of(ServerState.entries.filter { it != ServerState.UNKNOWN_STATE }.map { it.name.lowercase() }) + of( + ServerState.entries + .filter { it != ServerState.UNKNOWN_STATE } + .map { it.name.lowercase() }, + ) - //fun selectionModes(): SuggestionProvider = + // fun selectionModes(): SuggestionProvider = // of(ServerSelectionMode.entries.map { it.name.lowercase() }) - /** - * Suggests all known [GroupServerType]s. - */ + /** Suggests all known [GroupServerType]s. */ fun serverTypes(): SuggestionProvider = - of(GroupServerType.entries.filter { it != GroupServerType.UNKNOWN_SERVER }.map { it.name.lowercase() }) + of( + GroupServerType.entries + .filter { it != GroupServerType.UNKNOWN_SERVER } + .map { it.name.lowercase() }, + ) - /** - * Suggests the given fixed [values]. - */ - fun of(vararg values: String): SuggestionProvider = - of(values.toList()) + /** Suggests the given fixed [values]. */ + fun of(vararg values: String): SuggestionProvider = of(values.toList()) - /** - * Suggests the given fixed [values]. - */ + /** Suggests the given fixed [values]. */ fun of(values: Collection): SuggestionProvider { val suggestions = values.map { Suggestion.suggestion(it) } return SuggestionProvider.blocking { _, _ -> suggestions } @@ -228,9 +243,11 @@ object CloudSuggestions { private fun serverName(server: Server): String? { val persistentServer = server.persistentServer - if (persistentServer != null) return persistentServer.name - val group = server.group ?: return null - return "${group.name}-${server.numericalId}" + val group = server.group + return when { + persistentServer != null -> persistentServer.name + group != null -> "${group.name}-${server.numericalId}" + else -> null + } } - } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/AbstractMessageConfig.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/AbstractMessageConfig.kt index 3bc8505..7ab2451 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/AbstractMessageConfig.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/AbstractMessageConfig.kt @@ -5,9 +5,7 @@ import net.kyori.adventure.text.Component import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver -/** - * Base class for a message configuration with variables. - */ +/** Base class for a message configuration with variables. */ abstract class AbstractMessageConfig { abstract val variables: Map @@ -16,14 +14,13 @@ abstract class AbstractMessageConfig { TagResolver.resolver( variables.map { (key, value) -> TagResolver.resolver(key, Tag.selfClosingInserting(miniMessage.deserialize(value))) - } + }, ) } - /** - * Parses the [message] with the [variables] and the [extra] resolvers. - */ - fun msg(message: String, vararg extra: TagResolver): Component { - return miniMessage.deserialize(message, TagResolver.resolver(resolver, *extra)) - } + /** Parses the [message] with the [variables] and the [extra] resolvers. */ + fun msg( + message: String, + vararg extra: TagResolver, + ): Component = miniMessage.deserialize(message, TagResolver.resolver(resolver, *extra)) } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigMigrator.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigMigrator.kt index e3e4350..60d45a7 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigMigrator.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigMigrator.kt @@ -2,9 +2,7 @@ package app.simplecloud.plugin.api.shared.config import org.spongepowered.configurate.CommentedConfigurationNode -/** - * A single migration step that modifies a yaml node in place. - */ +/** A single migration step that modifies a yaml node in place. */ fun interface ConfigMigration { fun migrate(node: CommentedConfigurationNode) } @@ -18,7 +16,8 @@ fun interface ConfigMigration { * .build() * ``` */ -class ConfigMigrator private constructor( +class ConfigMigrator +private constructor( private val currentVersion: Int, private val fallbackVersion: Int, private val migrationsByFromVersion: Map, @@ -30,9 +29,7 @@ class ConfigMigrator private constructor( } } - /** - * Migrates the [node] to the current version and returns whether anything was migrated. - */ + /** Migrates the [node] to the current version and returns whether anything was migrated. */ fun migrate(node: CommentedConfigurationNode): Boolean { var version = node.node(VERSION_NODE).getInt(fallbackVersion) @@ -42,9 +39,10 @@ class ConfigMigrator private constructor( var migrated = false while (version < currentVersion) { - val migration = checkNotNull(migrationsByFromVersion[version]) { - "Missing config migration from version $version to $currentVersion" - } + val migration = + checkNotNull(migrationsByFromVersion[version]) { + "Missing config migration from version $version to $currentVersion" + } migration.action.migrate(node) version = migration.toVersion @@ -55,27 +53,23 @@ class ConfigMigrator private constructor( return migrated } - class Builder internal constructor( - private val currentVersion: Int, - ) { + class Builder + internal constructor(private val currentVersion: Int) { private var fallbackVersion = 0 private val migrations = mutableMapOf() - /** - * The version that is assumed if the config has no version node yet. Defaults to `0`. - */ - fun fallbackVersion(version: Int): Builder = apply { + /** The version that is assumed if the config has no version node yet. Defaults to `0`. */ + fun fallbackVersion(version: Int): Builder { require(version >= 0) { "The fallback version must be greater than or equal to 0" } fallbackVersion = version + return this } - /** - * Registers a migration from [fromVersion] to [toVersion]. - */ - fun migrate(fromVersion: Int, toVersion: Int, action: ConfigMigration): Builder = apply { + /** Registers a migration from [fromVersion] to [toVersion]. */ + fun migrate(fromVersion: Int, toVersion: Int, action: ConfigMigration): Builder { require(fromVersion >= 0) { "The source config version must be greater than or equal to 0" } @@ -90,19 +84,18 @@ class ConfigMigrator private constructor( } migrations[fromVersion] = MigrationStep(toVersion, action) + return this } - fun build(): ConfigMigrator = ConfigMigrator( - currentVersion = currentVersion, - fallbackVersion = fallbackVersion, - migrationsByFromVersion = migrations.toMap(), - ) + fun build(): ConfigMigrator = + ConfigMigrator( + currentVersion = currentVersion, + fallbackVersion = fallbackVersion, + migrationsByFromVersion = migrations.toMap(), + ) } - private data class MigrationStep( - val toVersion: Int, - val action: ConfigMigration, - ) + private data class MigrationStep(val toVersion: Int, val action: ConfigMigration) companion object { const val VERSION_NODE = "version" diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationFactory.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationFactory.kt index d8e9a8e..b764d67 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationFactory.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationFactory.kt @@ -3,22 +3,13 @@ package app.simplecloud.plugin.api.shared.config import java.io.File import java.nio.file.Path -/** - * @author Niklas Nieberler - */ -class ConfigurationFactory( - private val file: File, - javaClass: Class, - configMigrator: ConfigMigrator? = null, -) { +class ConfigurationFactory(private val file: File, javaClass: Class, configMigrator: ConfigMigrator? = null) { private val configurator = YamlFileConfigurator(javaClass, configMigrator) private var config: E? = null - /** - * Loads the config, or creates the file from [defaultConfig] if it does not exist. - */ + /** Loads the config, or creates the file from [defaultConfig] if it does not exist. */ fun loadOrCreate(defaultConfig: E): E { if (file.exists()) { return load() ?: throw NullPointerException("failed to load config") @@ -28,30 +19,24 @@ class ConfigurationFactory( return defaultConfig } - /** - * The cached config. Throws if it has not been loaded yet. - */ - fun get(): E { - return config ?: throw NullPointerException("failed to find config") - } + /** The cached config. Throws if it has not been loaded yet. */ + fun get(): E = config ?: throw NullPointerException("failed to find config") - /** - * Writes the [entry] to the file and caches it. - */ + /** Writes the [entry] to the file and caches it. */ fun save(entry: E) { configurator.save(file, entry) config = entry } - /** - * Reloads the file into the cache. - */ + /** Reloads the file into the cache. */ fun reload() { load() } private fun load(): E? { - return configurator.load(file).also { config = it } + val loaded = configurator.load(file) + config = loaded + return loaded } companion object { @@ -70,20 +55,18 @@ class ConfigurationFactory( ): ConfigurationFactory { val file = File(dataDirectory, fileName) DefaultConfigInstaller.install(file.toPath(), classLoader) - return ConfigurationFactory(file, E::class.java, migrator).also { it.loadOrCreate(default) } + val factory = ConfigurationFactory(file, E::class.java, migrator) + factory.loadOrCreate(default) + return factory } - /** - * Same as [create] but with a [Path] as data directory. - */ + /** Same as [create] but with a [Path] as data directory. */ inline fun create( dataDirectory: Path, fileName: String, default: E, migrator: ConfigMigrator? = null, classLoader: ClassLoader = E::class.java.classLoader, - ): ConfigurationFactory { - return create(dataDirectory.toFile(), fileName, default, migrator, classLoader) - } + ): ConfigurationFactory = create(dataDirectory.toFile(), fileName, default, migrator, classLoader) } } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/DefaultConfigInstaller.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/DefaultConfigInstaller.kt index 166da06..38d57c6 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/DefaultConfigInstaller.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/DefaultConfigInstaller.kt @@ -3,23 +3,34 @@ package app.simplecloud.plugin.api.shared.config import java.nio.file.Files import java.nio.file.Path -/** - * Copies bundled default files from the jar into the data directory. - */ +/** Copies bundled default files from the jar into the data directory. */ object DefaultConfigInstaller { /** - * Copies the bundled resource with the same file name as [target] if [target] does not exist yet. + * Copies the bundled resource with the same file name as [target] if [target] does not exist + * yet. */ fun install(target: Path, classLoader: ClassLoader) { copy(target, target.fileName.toString(), classLoader) } /** - * Copies all [resources] into [dataDirectory]. Paths may contain sub directories, e.g. `layout/public.yml`. + * Copies all [resources] into [dataDirectory]. Paths may contain sub directories, e.g. + * `layout/public.yml`. */ - fun installAll(dataDirectory: Path, resources: List, classLoader: ClassLoader, resourcePrefix: String = "") { - val prefix = if (resourcePrefix.isEmpty() || resourcePrefix.endsWith("/")) resourcePrefix else "$resourcePrefix/" + fun installAll( + dataDirectory: Path, + resources: List, + classLoader: ClassLoader, + resourcePrefix: String = "", + ) { + val prefix = if (resourcePrefix.isEmpty() || + resourcePrefix.endsWith("/") + ) { + resourcePrefix + } else { + "$resourcePrefix/" + } resources.forEach { resource -> copy(dataDirectory.resolve(resource), prefix + resource, classLoader) } @@ -28,9 +39,10 @@ object DefaultConfigInstaller { private fun copy(target: Path, resourceName: String, classLoader: ClassLoader) { if (Files.exists(target)) return - val resource = checkNotNull(classLoader.getResourceAsStream(resourceName)) { - "Missing bundled $resourceName" - } + val resource = + checkNotNull(classLoader.getResourceAsStream(resourceName)) { + "Missing bundled $resourceName" + } Files.createDirectories(target.parent) resource.use { stream -> Files.copy(stream, target) } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/VersionedConfig.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/VersionedConfig.kt index 7bf1324..67c1e16 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/VersionedConfig.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/VersionedConfig.kt @@ -1,8 +1,6 @@ package app.simplecloud.plugin.api.shared.config -/** - * Marks a config as versioned, so it can be used with a [ConfigMigrator]. - */ +/** Marks a config as versioned, so it can be used with a [ConfigMigrator]. */ interface VersionedConfig { val version: Int } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlDirectoryRepository.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlDirectoryRepository.kt index e1f9bc4..38c9d07 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlDirectoryRepository.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlDirectoryRepository.kt @@ -4,9 +4,6 @@ import java.io.File import java.nio.file.Files import java.nio.file.Path -/** - * @author Niklas Nieberler - */ abstract class YamlDirectoryRepository( private val directory: Path, javaClass: Class, @@ -17,58 +14,43 @@ abstract class YamlDirectoryRepository( private val cachedEntities = mutableMapOf() - /** - * Saves the [entity] to the directory. - */ + /** Saves the [entity] to the directory. */ abstract fun save(entity: E) - /** - * Finds a cached entity by its [identifier]. - */ + /** Finds a cached entity by its [identifier]. */ abstract fun find(identifier: I): E? - /** - * All cached entities. - */ - fun findAll(): List { - return cachedEntities.values.toList() - } + /** All cached entities. */ + fun findAll(): List = cachedEntities.values.toList() - /** - * Loads all `.yml` and `.yaml` files of the directory and creates it if missing. - */ + /** Loads all `.yml` and `.yaml` files of the directory and creates it if missing. */ fun load(): List { Files.createDirectories(directory) return Files.walk(directory).use { paths -> - paths.toList() + paths + .toList() .map { it.toFile() } .filter { it.extension == "yml" || it.extension == "yaml" } .mapNotNull { load(it) } } } - /** - * Loads and caches the entity of a single [file]. - */ + /** Loads and caches the entity of a single [file]. */ fun load(file: File): E? { val entity = configurator.load(file) ?: return null cachedEntities[file] = entity return entity } - /** - * Saves the [entity] to the file [name] inside the directory. - */ + /** Saves the [entity] to the file [name] inside the directory. */ protected fun save(name: String, entity: E) { val file = directory.resolve(name).toFile() configurator.save(file, entity) cachedEntities[file] = entity } - /** - * Deletes the file of the [entity]. - */ + /** Deletes the file of the [entity]. */ fun delete(entity: E) { val file = cachedEntities.entries.find { it.value == entity }?.key ?: return file.delete() diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlFileConfigurator.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlFileConfigurator.kt index ed405c2..3dca22f 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlFileConfigurator.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/YamlFileConfigurator.kt @@ -7,13 +7,7 @@ import org.spongepowered.configurate.yaml.NodeStyle import org.spongepowered.configurate.yaml.YamlConfigurationLoader import java.io.File -/** - * @author Niklas Nieberler - */ -class YamlFileConfigurator( - private val javaClass: Class, - private val configMigrator: ConfigMigrator? = null, -) { +class YamlFileConfigurator(private val javaClass: Class, private val configMigrator: ConfigMigrator? = null) { init { require(configMigrator == null || VersionedConfig::class.java.isAssignableFrom(javaClass)) { @@ -23,9 +17,8 @@ class YamlFileConfigurator( private val configurationLoaders = hashMapOf() - private val defaultConfigurationBuilder = YamlConfigurationLoader.builder() - .nodeStyle(NodeStyle.BLOCK) - .defaultOptions { options -> + private val defaultConfigurationBuilder = + YamlConfigurationLoader.builder().nodeStyle(NodeStyle.BLOCK).defaultOptions { options -> options.serializers { builder -> builder.registerAnnotatedObjects(objectMapperFactory()) builder.register(Enum::class.java, GenericEnumSerializer) @@ -33,18 +26,14 @@ class YamlFileConfigurator( } } - /** - * Writes the [entity] to the [file]. - */ + /** Writes the [entity] to the [file]. */ fun save(file: File, entity: E) { val (node, loader) = buildNode(file) node.set(javaClass, entity) loader.save(node) } - /** - * Reads the [file], migrates it if needed and saves the migrated result. - */ + /** Reads the [file], migrates it if needed and saves the migrated result. */ fun load(file: File): E? { val (node, loader) = buildNode(file) if (configMigrator?.migrate(node) == true) { @@ -53,21 +42,14 @@ class YamlFileConfigurator( return node.get(javaClass) } - /** - * Loads the raw node of the [file] together with its loader. - */ + /** Loads the raw node of the [file] together with its loader. */ fun buildNode(file: File): Pair { val loader = getOrCreateConfigurationLoader(file) return loader.load() to loader } - /** - * The cached loader of the [file]. - */ - fun getOrCreateConfigurationLoader(file: File): YamlConfigurationLoader { - return configurationLoaders.getOrPut(file) { - defaultConfigurationBuilder.path(file.toPath()).build() - } + /** The cached loader of the [file]. */ + fun getOrCreateConfigurationLoader(file: File): YamlConfigurationLoader = configurationLoaders.getOrPut(file) { + defaultConfigurationBuilder.path(file.toPath()).build() } - } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/serializer/GenericEnumSerializer.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/serializer/GenericEnumSerializer.kt index 4a1bf63..a9dba6b 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/serializer/GenericEnumSerializer.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/config/serializer/GenericEnumSerializer.kt @@ -5,28 +5,19 @@ import org.spongepowered.configurate.serialize.SerializationException import org.spongepowered.configurate.serialize.TypeSerializer import java.lang.reflect.Type -/** - * @author Niklas Nieberler - */ object GenericEnumSerializer : TypeSerializer> { - @Suppress("UNCHECKED_CAST") override fun deserialize(type: Type, node: ConfigurationNode): Enum<*> { - val value = node.string ?: throw SerializationException("No value present in node") - if (type !is Class<*> || !type.isEnum) { throw SerializationException("Type is not an enum class") } - return try { - java.lang.Enum.valueOf(type as Class>, value) - } catch (_: IllegalArgumentException) { - throw SerializationException("Invalid enum constant") - } + val value = node.string + return type.enumConstants.filterIsInstance>().firstOrNull { it.name == value } + ?: throw SerializationException("Invalid enum constant: $value") } override fun serialize(type: Type, obj: Enum<*>?, node: ConfigurationNode) { node.set(obj?.name) } - } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/OperationType.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/OperationType.kt index 581d2d8..03a5abb 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/OperationType.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/OperationType.kt @@ -3,11 +3,15 @@ package app.simplecloud.plugin.api.shared.matcher import app.simplecloud.plugin.api.shared.matcher.operation.NumericOperationMatcher import app.simplecloud.plugin.api.shared.matcher.operation.OperationMatcher import app.simplecloud.plugin.api.shared.matcher.operation.StringOperationMatcher -import app.simplecloud.plugin.api.shared.matcher.operation.impl.* +import app.simplecloud.plugin.api.shared.matcher.operation.impl.ContainsOperationMatcher +import app.simplecloud.plugin.api.shared.matcher.operation.impl.EndsWithOperationMatcher +import app.simplecloud.plugin.api.shared.matcher.operation.impl.EqualsOperationMatcher +import app.simplecloud.plugin.api.shared.matcher.operation.impl.GreaterThanOperationMatcher +import app.simplecloud.plugin.api.shared.matcher.operation.impl.PatternOperationMatcher +import app.simplecloud.plugin.api.shared.matcher.operation.impl.RegexOperationMatcher +import app.simplecloud.plugin.api.shared.matcher.operation.impl.StartsWithOperationMatcher -enum class OperationType( - private val matcher: OperationMatcher<*, *> -) { +enum class OperationType(private val matcher: OperationMatcher<*, *>) { REGEX(RegexOperationMatcher), PATTERN(PatternOperationMatcher), @@ -15,34 +19,39 @@ enum class OperationType( CONTAINS(ContainsOperationMatcher), STARTS_WITH(StartsWithOperationMatcher), ENDS_WITH(EndsWithOperationMatcher), - GREATER_THAN(GreaterThanOperationMatcher); + GREATER_THAN(GreaterThanOperationMatcher), + ; fun matches(key: Any, value: Any, negate: Boolean): Boolean { - val matches = when (matcher) { - is StringOperationMatcher -> { - if (key is String && value is String) { - matcher.matches(key, value) - } else false + val matches = + when (matcher) { + is StringOperationMatcher -> { + if (key is String && value is String) { + matcher.matches(key, value) + } else { + false + } + } + + is NumericOperationMatcher -> { + if (key is Int && value is Int) { + matcher.matches(key, value) + } else { + false + } + } + + else -> false } - is NumericOperationMatcher -> { - if (key is Int && value is Int) { - matcher.matches(key, value) - } else false - } - - else -> false - } - return if (negate) matches.not() else matches } - fun anyMatches(names: List, value: String, negate: Boolean): Boolean { - return names.any { matches(it, value, negate) } + fun anyMatches(names: List, value: String, negate: Boolean): Boolean = names.any { + matches(it, value, negate) } - fun allMatches(names: List, value: String, negate: Boolean): Boolean { - return names.all { matches(it, value, negate) } + fun allMatches(names: List, value: String, negate: Boolean): Boolean = names.all { + matches(it, value, negate) } - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/ServerMatcherConfiguration.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/ServerMatcherConfiguration.kt index 9ffa5c0..be20a36 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/ServerMatcherConfiguration.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/ServerMatcherConfiguration.kt @@ -2,10 +2,6 @@ package app.simplecloud.plugin.api.shared.matcher import org.spongepowered.configurate.objectmapping.ConfigSerializable -/** - * @author Niklas Nieberler - */ - @ConfigSerializable data class ServerMatcherConfiguration( val operation: OperationType = OperationType.STARTS_WITH, @@ -13,16 +9,9 @@ data class ServerMatcherConfiguration( val negate: Boolean = false, ) { - fun matches(name: String): Boolean { - return this.operation.matches(name, this.value, this.negate) - } - - fun anyMatches(names: List): Boolean { - return this.operation.anyMatches(names, this.value, this.negate) - } + fun matches(name: String): Boolean = this.operation.matches(name, this.value, this.negate) - fun allMatches(names: List): Boolean { - return this.operation.allMatches(names, this.value, this.negate) - } + fun anyMatches(names: List): Boolean = this.operation.anyMatches(names, this.value, this.negate) -} \ No newline at end of file + fun allMatches(names: List): Boolean = this.operation.allMatches(names, this.value, this.negate) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/NumericOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/NumericOperationMatcher.kt index dfdc488..bd3653f 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/NumericOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/NumericOperationMatcher.kt @@ -1,3 +1,3 @@ package app.simplecloud.plugin.api.shared.matcher.operation -interface NumericOperationMatcher : OperationMatcher \ No newline at end of file +interface NumericOperationMatcher : OperationMatcher diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/OperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/OperationMatcher.kt index d597e0b..47b365c 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/OperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/OperationMatcher.kt @@ -3,5 +3,4 @@ package app.simplecloud.plugin.api.shared.matcher.operation interface OperationMatcher { fun matches(key: K, value: V): Boolean - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/ContainsOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/ContainsOperationMatcher.kt index 3a0243e..61a1146 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/ContainsOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/ContainsOperationMatcher.kt @@ -6,8 +6,5 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable @ConfigSerializable object ContainsOperationMatcher : StringOperationMatcher { - override fun matches(key: String, value: String): Boolean { - return key.contains(value, ignoreCase = true) - } - -} \ No newline at end of file + override fun matches(key: String, value: String): Boolean = key.contains(value, ignoreCase = true) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EndsWithOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EndsWithOperationMatcher.kt index dd369fe..177fd24 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EndsWithOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EndsWithOperationMatcher.kt @@ -6,8 +6,5 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable @ConfigSerializable object EndsWithOperationMatcher : StringOperationMatcher { - override fun matches(key: String, value: String): Boolean { - return key.endsWith(value, ignoreCase = true) - } - -} \ No newline at end of file + override fun matches(key: String, value: String): Boolean = key.endsWith(value, ignoreCase = true) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EqualsOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EqualsOperationMatcher.kt index 98c2729..eba894b 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EqualsOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/EqualsOperationMatcher.kt @@ -6,8 +6,5 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable @ConfigSerializable object EqualsOperationMatcher : StringOperationMatcher { - override fun matches(key: String, value: String): Boolean { - return key.equals(value, ignoreCase = true) - } - -} \ No newline at end of file + override fun matches(key: String, value: String): Boolean = key.equals(value, ignoreCase = true) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/GreaterThanOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/GreaterThanOperationMatcher.kt index 41dfc72..fe9065c 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/GreaterThanOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/GreaterThanOperationMatcher.kt @@ -4,8 +4,5 @@ import app.simplecloud.plugin.api.shared.matcher.operation.NumericOperationMatch object GreaterThanOperationMatcher : NumericOperationMatcher { - override fun matches(key: Int, value: Int): Boolean { - return key > value - } - -} \ No newline at end of file + override fun matches(key: Int, value: Int): Boolean = key > value +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/PatternOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/PatternOperationMatcher.kt index 7dd32bd..eb3c7a1 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/PatternOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/PatternOperationMatcher.kt @@ -7,8 +7,5 @@ import java.util.regex.Pattern @ConfigSerializable object PatternOperationMatcher : StringOperationMatcher { - override fun matches(key: String, value: String): Boolean { - return Pattern.matches(key, value) - } - -} \ No newline at end of file + override fun matches(key: String, value: String): Boolean = Pattern.matches(key, value) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/RegexOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/RegexOperationMatcher.kt index 4bc5c14..25886d7 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/RegexOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/RegexOperationMatcher.kt @@ -6,8 +6,5 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable @ConfigSerializable object RegexOperationMatcher : StringOperationMatcher { - override fun matches(key: String, value: String): Boolean { - return Regex(value).matches(key) - } - -} \ No newline at end of file + override fun matches(key: String, value: String): Boolean = Regex(value).matches(key) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/StartsWithOperationMatcher.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/StartsWithOperationMatcher.kt index d641d1c..d82deca 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/StartsWithOperationMatcher.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/matcher/operation/impl/StartsWithOperationMatcher.kt @@ -6,8 +6,5 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable @ConfigSerializable object StartsWithOperationMatcher : StringOperationMatcher { - override fun matches(key: String, value: String): Boolean { - return key.startsWith(value, ignoreCase = true) - } - -} \ No newline at end of file + override fun matches(key: String, value: String): Boolean = key.startsWith(value, ignoreCase = true) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pattern/ServerPatternIdentifier.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pattern/ServerPatternIdentifier.kt index e1ce9b4..f564290 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pattern/ServerPatternIdentifier.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pattern/ServerPatternIdentifier.kt @@ -8,46 +8,47 @@ import kotlinx.coroutines.future.await class ServerPatternIdentifier( private val pattern: String = "-", - regexPattern: String = pattern - .replace("", "(?[a-zA-Z]+)") - .replace("", "(?\\d+)"), - private val cloudApi: CloudApi = CloudApi.create() + regexPattern: String = + pattern + .replace("", "(?[a-zA-Z]+)") + .replace("", "(?\\d+)"), + private val cloudApi: CloudApi = CloudApi.create(), ) { private val regex = Regex(regexPattern) fun parse(name: String, customRegex: Regex? = null): Pair { - val matchResult = customRegex?.matchEntire(name) ?: this.regex.matchEntire(name) - if (matchResult == null) - throw IllegalArgumentException("$name does not match the pattern") - - val groupName = matchResult.groups["groupName"]?.value - ?: throw IllegalArgumentException("Group name not found") - val numericalId = matchResult.groups["numericalId"]?.value?.toInt() - ?: throw IllegalArgumentException("Numerical ID not found") + val matchResult = requireNotNull(customRegex?.matchEntire(name) ?: this.regex.matchEntire(name)) { + "$name does not match the pattern" + } + val groupName = requireNotNull(matchResult.groups["groupName"]?.value) { + "Group name not found" + } + val numericalId = requireNotNull(matchResult.groups["numericalId"]?.value?.toInt()) { + "Numerical ID not found" + } return Pair(groupName, numericalId) } - fun parseServerToPattern(server: Server): String { - return this.pattern - .replace("", server.serverBase.name) - .replace("", server.properties["pretty-name"]?.toString() ?: StringPrettifier.prettify(server.serverBase.name)) - .replace("", server.serverId) - .replace("", server.serverId) - .replace("", server.numericalId.toString()) - } + fun parseServerToPattern(server: Server): String = this.pattern + .replace("", server.serverBase.name) + .replace( + "", + server.properties["pretty-name"]?.toString() + ?: StringPrettifier.prettify(server.serverBase.name), + ) + .replace("", server.serverId) + .replace("", server.serverId) + .replace("", server.numericalId.toString()) suspend fun getGroup(name: String): Group? { val groupName = parse(name).first return try { this.cloudApi.group().getGroupByName(groupName).await() - } catch (e: Exception) { + } catch (_: Exception) { null } } - fun getNumericalId(name: String): Int { - return parse(name).second - } - + fun getNumericalId(name: String): Int = parse(name).second } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/permission/PermissionChecker.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/permission/PermissionChecker.kt index 216cb80..22a6787 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/permission/PermissionChecker.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/permission/PermissionChecker.kt @@ -1,16 +1,12 @@ package app.simplecloud.plugin.api.shared.permission -/** - * @author Niklas Nieberler - */ - fun interface PermissionChecker

{ /** * Checks the permission by a player + * * @param player to check the permission * @param name of the permission */ fun checkPermission(player: P, name: String): Boolean - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/PlaceholderProvider.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/PlaceholderProvider.kt index 24205dd..2099df4 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/PlaceholderProvider.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/PlaceholderProvider.kt @@ -4,10 +4,6 @@ import app.simplecloud.plugin.api.shared.placeholder.provider.GroupPlaceholderPr import app.simplecloud.plugin.api.shared.placeholder.provider.PersistentServerPlaceholderProvider import app.simplecloud.plugin.api.shared.placeholder.provider.ServerPlaceholderProvider -/** - * @author Niklas Nieberler - */ - object PlaceholderProvider { val serverPlaceholderProvider = ServerPlaceholderProvider() @@ -15,5 +11,4 @@ object PlaceholderProvider { val groupPlaceholderProvider = GroupPlaceholderProvider() val persistentServerPlaceholderProvider = PersistentServerPlaceholderProvider() - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/ArgumentsResolver.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/ArgumentsResolver.kt index 00957a4..5f785f6 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/ArgumentsResolver.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/ArgumentsResolver.kt @@ -3,21 +3,15 @@ package app.simplecloud.plugin.api.shared.placeholder.argument import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue -/** - * @author Niklas Nieberler - */ - interface ArgumentsResolver { - /** - * Gets the key for the placeholder - */ + /** Gets the key for the placeholder */ fun getKey(): String /** * Gets the resolved tag for the placeholder + * * @param arguments of the placeholder key */ suspend fun resolve(arguments: ArgumentQueue): Tag? - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/EnvironmentArgumentsResolver.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/EnvironmentArgumentsResolver.kt index 5487e5f..a686d5b 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/EnvironmentArgumentsResolver.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/EnvironmentArgumentsResolver.kt @@ -3,19 +3,14 @@ package app.simplecloud.plugin.api.shared.placeholder.argument import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue -/** - * @author Niklas Nieberler - */ - class EnvironmentArgumentsResolver : ArgumentsResolver { override fun getKey() = "env" override suspend fun resolve(arguments: ArgumentQueue): Tag? { val argumentName = arguments.popOr("environment expected").value() - val defaultArgument = arguments.peek()?.value() ?: "" + val defaultArgument = arguments.peek()?.value().orEmpty() val string = System.getenv(argumentName) ?: defaultArgument return Tag.preProcessParsed(string) } - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/PropertiesArgumentsResolver.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/PropertiesArgumentsResolver.kt index 44badb3..69e8609 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/PropertiesArgumentsResolver.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/PropertiesArgumentsResolver.kt @@ -3,21 +3,14 @@ package app.simplecloud.plugin.api.shared.placeholder.argument import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue -/** - * @author Niklas Nieberler - */ - -class PropertiesArgumentsResolver( - private val properties: Map -) : ArgumentsResolver { +class PropertiesArgumentsResolver(private val properties: Map) : ArgumentsResolver { override fun getKey() = "property" override suspend fun resolve(arguments: ArgumentQueue): Tag? { val argumentName = arguments.popOr("property expected").value() - val defaultArgument = arguments.peek()?.value() ?: "" + val defaultArgument = arguments.peek()?.value().orEmpty() val string = this.properties[argumentName] ?: defaultArgument return Tag.preProcessParsed(string.toString()) } - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/PlayerCountArgumentsResolver.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/PlayerCountArgumentsResolver.kt index c319290..555bfbf 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/PlayerCountArgumentsResolver.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/PlayerCountArgumentsResolver.kt @@ -8,10 +8,7 @@ import kotlinx.coroutines.future.await import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue -class PlayerCountArgumentsResolver( - private val cloudApi: CloudApi, - private val group: Group, -) : ArgumentsResolver { +class PlayerCountArgumentsResolver(private val cloudApi: CloudApi, private val group: Group) : ArgumentsResolver { override fun getKey() = "player_count" @@ -29,5 +26,4 @@ class PlayerCountArgumentsResolver( servers.sumOf { it.playerCount } } } - } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/ServerCountArgumentsResolver.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/ServerCountArgumentsResolver.kt index 2afedc6..8cb9286 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/ServerCountArgumentsResolver.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/argument/group/ServerCountArgumentsResolver.kt @@ -8,10 +8,7 @@ import kotlinx.coroutines.future.await import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue -class ServerCountArgumentsResolver( - private val cloudApi: CloudApi, - private val group: Group, -) : ArgumentsResolver { +class ServerCountArgumentsResolver(private val cloudApi: CloudApi, private val group: Group) : ArgumentsResolver { override fun getKey() = "server_count" @@ -24,10 +21,9 @@ class ServerCountArgumentsResolver( private suspend fun findServerCount(group: Group, state: ServerState?): Int { val servers = this.cloudApi.server().getServersByGroup(group.name).await() return if (state != null) { - servers.filter { it.state == state }.size + servers.count { it.state == state } } else { servers.size } } - } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholder.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholder.kt index 6f27fb2..6b98119 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholder.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholder.kt @@ -3,36 +3,29 @@ package app.simplecloud.plugin.api.shared.placeholder.async import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver -/** - * @author Niklas Nieberler - */ - /** * This creates a new placeholder that can also be used asynchronously + * * @param key placeholder name * @param handler value for this placeholder */ -data class AsyncPlaceholder( - val key: String, - private val handler: AsyncPlaceholderHandler -) { +data class AsyncPlaceholder(val key: String, private val handler: AsyncPlaceholderHandler) { /** * Executes the handler method to get the appropriate value for this placeholder + * * @return placeholder value */ - suspend fun invoke(value: T): Any? { - return this.handler.handle(value) - } + suspend fun invoke(value: T): Any? = this.handler.handle(value) /** * Gets a matching [TagResolver] with matching key and value + * * @param value for the placeholder * @param prefix first name for the placeholder key */ suspend fun invokeTagResolver(value: T, prefix: String? = null): TagResolver { - val resolvedKey = prefix?.let { "${it}_$key" } ?: this.key + val resolvedKey = if (prefix != null) "${prefix}_$key" else this.key return Placeholder.unparsed(resolvedKey, invoke(value).toString()) } - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholderHandler.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholderHandler.kt index c060039..99a9bb3 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholderHandler.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/async/AsyncPlaceholderHandler.kt @@ -1,15 +1,11 @@ package app.simplecloud.plugin.api.shared.placeholder.async -/** - * @author Niklas Nieberler - */ - fun interface AsyncPlaceholderHandler { /** * Gets the return value for a placeholder + * * @param value of the placeholder key method */ suspend fun handle(value: T): Any? - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/AbstractPlaceholderProvider.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/AbstractPlaceholderProvider.kt index a540a71..6acac30 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/AbstractPlaceholderProvider.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/AbstractPlaceholderProvider.kt @@ -9,18 +9,13 @@ import net.kyori.adventure.text.Component import net.kyori.adventure.text.minimessage.tag.Tag import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver -/** - * @author Niklas Nieberler - */ - -abstract class AbstractPlaceholderProvider( - private val executor: SinglePlaceholderExecutor, -) { +abstract class AbstractPlaceholderProvider(private val executor: SinglePlaceholderExecutor) { private val cloudApi = CloudApi.create() /** * Gets the list of all available [ArgumentsResolver] + * * @param cloudApi the instance of [CloudApi] * @param value for the placeholder */ @@ -31,6 +26,7 @@ abstract class AbstractPlaceholderProvider( /** * Gets the sum of all [TagResolver] + * * @param values for the placeholder * @param prefix of the placeholder key */ @@ -43,17 +39,17 @@ abstract class AbstractPlaceholderProvider( addAll(values.flatMap { getArgumentsResolvers(cloudApi, it) }) addAll(argumentsResolver) } - val singleTagResolver = values.map { this.executor.getTagResolver(this.cloudApi, it, prefix) } + val singleTagResolver = values.map { + this.executor.getTagResolver(this.cloudApi, it, prefix) + } return TagResolver.resolver( - *singleTagResolver.toTypedArray(), - *availableArgumentsResolver - .map { convertArgumentsResolverToTagResolver(it, prefix) } - .toTypedArray() + singleTagResolver + availableArgumentsResolver.map { convertArgumentsResolverToTagResolver(it, prefix) }, ) } /** * Serializes the string to a [Component] + * * @param value for the placeholder * @param string the message * @param prefix of the placeholder key @@ -63,15 +59,14 @@ abstract class AbstractPlaceholderProvider( string: String, prefix: String? = null, vararg argumentsResolver: ArgumentsResolver, - ): Component { - return text( - string, - getTagResolver(listOf(value), prefix, *argumentsResolver), - ) - } + ): Component = text( + string, + getTagResolver(listOf(value), prefix, *argumentsResolver), + ) /** * Serializes the string to a [Component] + * * @param values for the placeholder * @param string the message * @param prefix of the placeholder key @@ -81,19 +76,19 @@ abstract class AbstractPlaceholderProvider( string: String, prefix: String? = null, vararg argumentsResolver: ArgumentsResolver, - ): Component { - return text( - string, - getTagResolver(values, prefix, *argumentsResolver), - ) - } + ): Component = text( + string, + getTagResolver(values, prefix, *argumentsResolver), + ) - private fun convertArgumentsResolverToTagResolver(resolver: ArgumentsResolver, prefix: String?): TagResolver { + private fun convertArgumentsResolverToTagResolver( + resolver: ArgumentsResolver, + prefix: String?, + ): TagResolver { val key = resolver.getKey() - val resolvedKey = prefix?.let { "${it}_$key" } ?: key + val resolvedKey = if (prefix != null) "${prefix}_$key" else key return TagResolver.resolver(resolvedKey) { arguments, _ -> return@resolver runBlocking { resolver.resolve(arguments) as Tag } } } - -} \ No newline at end of file +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/GroupPlaceholderProvider.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/GroupPlaceholderProvider.kt index 16e9726..0f55ed5 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/GroupPlaceholderProvider.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/GroupPlaceholderProvider.kt @@ -7,14 +7,15 @@ import app.simplecloud.plugin.api.shared.placeholder.argument.group.PlayerCountA import app.simplecloud.plugin.api.shared.placeholder.argument.group.ServerCountArgumentsResolver import app.simplecloud.plugin.api.shared.placeholder.single.SingleGroupPlaceholderExecutor -class GroupPlaceholderProvider : AbstractPlaceholderProvider( - SingleGroupPlaceholderExecutor() -) { - - override suspend fun getArgumentsResolvers(cloudApi: CloudApi, value: Group) = listOf( - PropertiesArgumentsResolver(value.properties), - PlayerCountArgumentsResolver(cloudApi, value), - ServerCountArgumentsResolver(cloudApi, value) - ) +class GroupPlaceholderProvider : + AbstractPlaceholderProvider( + SingleGroupPlaceholderExecutor(), + ) { + override suspend fun getArgumentsResolvers(cloudApi: CloudApi, value: Group) = + listOf( + PropertiesArgumentsResolver(value.properties), + PlayerCountArgumentsResolver(cloudApi, value), + ServerCountArgumentsResolver(cloudApi, value), + ) } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/PersistentServerPlaceholderProvider.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/PersistentServerPlaceholderProvider.kt index 1ade4b9..9168b9c 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/PersistentServerPlaceholderProvider.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/PersistentServerPlaceholderProvider.kt @@ -2,19 +2,16 @@ package app.simplecloud.plugin.api.shared.placeholder.provider import app.simplecloud.api.CloudApi import app.simplecloud.api.persistentserver.PersistentServer -import app.simplecloud.plugin.api.shared.placeholder.argument.* +import app.simplecloud.plugin.api.shared.placeholder.argument.PropertiesArgumentsResolver import app.simplecloud.plugin.api.shared.placeholder.single.SinglePersistentServerPlaceholderExecutor -/** - * @author Niklas Nieberler - */ +class PersistentServerPlaceholderProvider : + AbstractPlaceholderProvider( + SinglePersistentServerPlaceholderExecutor(), + ) { -class PersistentServerPlaceholderProvider : AbstractPlaceholderProvider( - SinglePersistentServerPlaceholderExecutor() -) { - - override suspend fun getArgumentsResolvers(cloudApi: CloudApi, value: PersistentServer) = listOf( - PropertiesArgumentsResolver(value.properties) - ) - -} \ No newline at end of file + override suspend fun getArgumentsResolvers(cloudApi: CloudApi, value: PersistentServer) = + listOf( + PropertiesArgumentsResolver(value.properties), + ) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/ServerPlaceholderProvider.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/ServerPlaceholderProvider.kt index 8a78b99..e4f9d9f 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/ServerPlaceholderProvider.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/ServerPlaceholderProvider.kt @@ -2,19 +2,16 @@ package app.simplecloud.plugin.api.shared.placeholder.provider import app.simplecloud.api.CloudApi import app.simplecloud.api.server.Server -import app.simplecloud.plugin.api.shared.placeholder.argument.* +import app.simplecloud.plugin.api.shared.placeholder.argument.PropertiesArgumentsResolver import app.simplecloud.plugin.api.shared.placeholder.single.SingleServerPlaceholderExecutor -/** - * @author Niklas Nieberler - */ +class ServerPlaceholderProvider : + AbstractPlaceholderProvider( + SingleServerPlaceholderExecutor(), + ) { -class ServerPlaceholderProvider : AbstractPlaceholderProvider( - SingleServerPlaceholderExecutor() -) { - - override suspend fun getArgumentsResolvers(cloudApi: CloudApi, value: Server) = listOf( - PropertiesArgumentsResolver(value.properties) - ) - -} \ No newline at end of file + override suspend fun getArgumentsResolvers(cloudApi: CloudApi, value: Server) = + listOf( + PropertiesArgumentsResolver(value.properties), + ) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleGroupPlaceholderExecutor.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleGroupPlaceholderExecutor.kt index 0eb254d..5487f24 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleGroupPlaceholderExecutor.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleGroupPlaceholderExecutor.kt @@ -7,18 +7,16 @@ import kotlinx.coroutines.future.await class SingleGroupPlaceholderExecutor : SinglePlaceholderExecutor { - override fun getAsyncPlaceholders(cloudApi: CloudApi) = listOf>( - AsyncPlaceholder("name") { it.name }, - AsyncPlaceholder("type") { it.type }, - AsyncPlaceholder("max_players") { it.maxPlayers }, - AsyncPlaceholder("min_memory") { it.minMemory }, - AsyncPlaceholder("max_memory") { it.maxMemory }, - AsyncPlaceholder("online_players") { getOnlinePlayersByGroup(cloudApi, it) }, - ) - - private suspend fun getOnlinePlayersByGroup(cloudApi: CloudApi, group: Group): Int { - return cloudApi.server().getServersByGroup(group.name).await() - .sumOf { it.playerCount } - } + override fun getAsyncPlaceholders(cloudApi: CloudApi) = + listOf>( + AsyncPlaceholder("name") { it.name }, + AsyncPlaceholder("type") { it.type }, + AsyncPlaceholder("max_players") { it.maxPlayers }, + AsyncPlaceholder("min_memory") { it.minMemory }, + AsyncPlaceholder("max_memory") { it.maxMemory }, + AsyncPlaceholder("online_players") { getOnlinePlayersByGroup(cloudApi, it) }, + ) + private suspend fun getOnlinePlayersByGroup(cloudApi: CloudApi, group: Group): Int = + cloudApi.server().getServersByGroup(group.name).await().sumOf { it.playerCount } } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePersistentServerPlaceholderExecutor.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePersistentServerPlaceholderExecutor.kt index f0cb0ed..3bdb8a1 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePersistentServerPlaceholderExecutor.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePersistentServerPlaceholderExecutor.kt @@ -5,24 +5,20 @@ import app.simplecloud.api.persistentserver.PersistentServer import app.simplecloud.plugin.api.shared.placeholder.async.AsyncPlaceholder import app.simplecloud.plugin.api.shared.pretty.StringPrettifier -/** - * @author Niklas Nieberler - */ - class SinglePersistentServerPlaceholderExecutor : SinglePlaceholderExecutor { - override fun getAsyncPlaceholders(cloudApi: CloudApi) = listOf>( - AsyncPlaceholder("id") { it.persistentServerId }, - AsyncPlaceholder("name") { it.name }, - AsyncPlaceholder("pretty_name") { - it.properties["pretty-name"] ?: StringPrettifier.prettify(it.name) - }, - AsyncPlaceholder("type") { it.type }, - AsyncPlaceholder("online_players") { it.playerCount }, - AsyncPlaceholder("max_players") { it.maxPlayers }, - AsyncPlaceholder("min_memory") { it.minMemory }, - AsyncPlaceholder("max_memory") { it.maxMemory }, - AsyncPlaceholder("motd") { it.properties["motd"] ?: "A Minecraft server" } - ) - -} \ No newline at end of file + override fun getAsyncPlaceholders(cloudApi: CloudApi) = + listOf>( + AsyncPlaceholder("id") { it.persistentServerId }, + AsyncPlaceholder("name") { it.name }, + AsyncPlaceholder("pretty_name") { + it.properties["pretty-name"] ?: StringPrettifier.prettify(it.name) + }, + AsyncPlaceholder("type") { it.type }, + AsyncPlaceholder("online_players") { it.playerCount }, + AsyncPlaceholder("max_players") { it.maxPlayers }, + AsyncPlaceholder("min_memory") { it.minMemory }, + AsyncPlaceholder("max_memory") { it.maxMemory }, + AsyncPlaceholder("motd") { it.properties["motd"] ?: "A Minecraft server" }, + ) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePlaceholderExecutor.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePlaceholderExecutor.kt index bd80632..9a157ce 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePlaceholderExecutor.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePlaceholderExecutor.kt @@ -4,20 +4,18 @@ import app.simplecloud.api.CloudApi import app.simplecloud.plugin.api.shared.placeholder.async.AsyncPlaceholder import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver -/** - * @author Niklas Nieberler - */ - interface SinglePlaceholderExecutor { /** * Gets a list with all available [AsyncPlaceholder] + * * @param cloudApi the instance of [app.simplecloud.api.CloudApi] */ fun getAsyncPlaceholders(cloudApi: CloudApi): List> /** * Gets a [TagResolver] with all available tag resolvers from the [getAsyncPlaceholders] method + * * @param cloudApi the instance of [CloudApi] * @param value for the placeholder * @param prefix first name for the placeholder key @@ -26,9 +24,7 @@ interface SinglePlaceholderExecutor { cloudApi: CloudApi, value: T, prefix: String? = null, - ): TagResolver { - return TagResolver.resolver(getAsyncPlaceholders(cloudApi) - .map { it.invokeTagResolver(value, prefix) }) - } - -} \ No newline at end of file + ): TagResolver = TagResolver.resolver( + getAsyncPlaceholders(cloudApi).map { it.invokeTagResolver(value, prefix) }, + ) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleServerPlaceholderExecutor.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleServerPlaceholderExecutor.kt index d66bdc4..984e889 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleServerPlaceholderExecutor.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SingleServerPlaceholderExecutor.kt @@ -5,28 +5,24 @@ import app.simplecloud.api.server.Server import app.simplecloud.plugin.api.shared.placeholder.async.AsyncPlaceholder import app.simplecloud.plugin.api.shared.pretty.StringPrettifier -/** - * @author Niklas Nieberler - */ - class SingleServerPlaceholderExecutor : SinglePlaceholderExecutor { - override fun getAsyncPlaceholders(cloudApi: CloudApi) = listOf>( - AsyncPlaceholder("id") { it.serverId }, - AsyncPlaceholder("numerical_id") { it.numericalId }, - AsyncPlaceholder("group_name") { it.serverBase.name }, - AsyncPlaceholder("group_pretty_name") { - it.properties["pretty-name"] ?: StringPrettifier.prettify(it.serverBase.name) - }, - AsyncPlaceholder("type") { it.serverBase.type }, - AsyncPlaceholder("state") { it.state }, - AsyncPlaceholder("ip") { it.ip }, - AsyncPlaceholder("port") { it.port }, - AsyncPlaceholder("online_players") { it.playerCount }, - AsyncPlaceholder("max_players") { it.maxPlayers }, - AsyncPlaceholder("min_memory") { it.minMemory }, - AsyncPlaceholder("max_memory") { it.maxMemory }, - AsyncPlaceholder("motd") { it.properties["motd"] ?: "A Minecraft server" } - ) - -} \ No newline at end of file + override fun getAsyncPlaceholders(cloudApi: CloudApi) = + listOf>( + AsyncPlaceholder("id") { it.serverId }, + AsyncPlaceholder("numerical_id") { it.numericalId }, + AsyncPlaceholder("group_name") { it.serverBase.name }, + AsyncPlaceholder("group_pretty_name") { + it.properties["pretty-name"] ?: StringPrettifier.prettify(it.serverBase.name) + }, + AsyncPlaceholder("type") { it.serverBase.type }, + AsyncPlaceholder("state") { it.state }, + AsyncPlaceholder("ip") { it.ip }, + AsyncPlaceholder("port") { it.port }, + AsyncPlaceholder("online_players") { it.playerCount }, + AsyncPlaceholder("max_players") { it.maxPlayers }, + AsyncPlaceholder("min_memory") { it.minMemory }, + AsyncPlaceholder("max_memory") { it.maxMemory }, + AsyncPlaceholder("motd") { it.properties["motd"] ?: "A Minecraft server" }, + ) +} diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/PrettifyCase.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/PrettifyCase.kt index 4ae7f66..8b47420 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/PrettifyCase.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/PrettifyCase.kt @@ -6,5 +6,5 @@ enum class PrettifyCase { PASCAL, SENTENCE, KEBAB, - SNAKE + SNAKE, } diff --git a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifier.kt b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifier.kt index e188366..dc5a2f6 100644 --- a/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifier.kt +++ b/plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifier.kt @@ -2,63 +2,55 @@ package app.simplecloud.plugin.api.shared.pretty object StringPrettifier { - /** - * Converts various string formats to different cases - */ - fun prettify(input: String, case: PrettifyCase = PrettifyCase.TITLE): String { - return when (case) { - PrettifyCase.TITLE -> toTitleCase(input) - PrettifyCase.CAMEL -> toCamelCase(input) - PrettifyCase.PASCAL -> toPascalCase(input) - PrettifyCase.SENTENCE -> toSentenceCase(input) - PrettifyCase.KEBAB -> toKebabCase(input) - PrettifyCase.SNAKE -> toSnakeCase(input) - } - } - - private fun toTitleCase(input: String): String { - return input.split(Regex("[\\s_-]")) - .filter { it.isNotEmpty() } - .joinToString(" ") { word -> - word.lowercase().replaceFirstChar { it.uppercase() } - } + /** Converts various string formats to different cases */ + fun prettify(input: String, case: PrettifyCase = PrettifyCase.TITLE): String = when (case) { + PrettifyCase.TITLE -> toTitleCase(input) + PrettifyCase.CAMEL -> toCamelCase(input) + PrettifyCase.PASCAL -> toPascalCase(input) + PrettifyCase.SENTENCE -> toSentenceCase(input) + PrettifyCase.KEBAB -> toKebabCase(input) + PrettifyCase.SNAKE -> toSnakeCase(input) } - private fun toCamelCase(input: String): String { - return input.split(Regex("[\\s_-]")) - .filter { it.isNotEmpty() } - .mapIndexed { index, word -> - if (index == 0) word.lowercase() - else word.lowercase().replaceFirstChar { it.uppercase() } - } - .joinToString("") - } + private fun toTitleCase(input: String): String = input + .split(Regex("[\\s_-]")) + .filter { it.isNotEmpty() } + .joinToString(" ") { word -> + word.lowercase().replaceFirstChar { it.uppercase() } + } - private fun toPascalCase(input: String): String { - return input.split(Regex("[\\s_-]")) - .filter { it.isNotEmpty() } - .joinToString("") { word -> + private fun toCamelCase(input: String): String = input + .split(Regex("[\\s_-]")) + .filter { it.isNotEmpty() } + .mapIndexed { index, word -> + if (index == 0) { + word.lowercase() + } else { word.lowercase().replaceFirstChar { it.uppercase() } } - } - - private fun toSentenceCase(input: String): String { - return input.split(Regex("[\\s_-]")) - .filter { it.isNotEmpty() } - .joinToString(" ") { it.lowercase() } - .replaceFirstChar { it.uppercase() } - } - - private fun toKebabCase(input: String): String { - return input.split(Regex("[\\s_]")) - .filter { it.isNotEmpty() } - .joinToString("-") { it.lowercase() } - } + } + .joinToString("") - private fun toSnakeCase(input: String): String { - return input.split(Regex("[\\s-]")) - .filter { it.isNotEmpty() } - .joinToString("_") { it.lowercase() } - } + private fun toPascalCase(input: String): String = input + .split(Regex("[\\s_-]")) + .filter { it.isNotEmpty() } + .joinToString("") { word -> + word.lowercase().replaceFirstChar { it.uppercase() } + } -} \ No newline at end of file + private fun toSentenceCase(input: String): String = input + .split(Regex("[\\s_-]")) + .filter { it.isNotEmpty() } + .joinToString(" ") { it.lowercase() } + .replaceFirstChar { it.uppercase() } + + private fun toKebabCase(input: String): String = input + .split(Regex("[\\s_]")) + .filter { it.isNotEmpty() } + .joinToString("-") { it.lowercase() } + + private fun toSnakeCase(input: String): String = input + .split(Regex("[\\s-]")) + .filter { it.isNotEmpty() } + .joinToString("_") { it.lowercase() } +} diff --git a/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationMigrationTest.kt b/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationMigrationTest.kt index 1afbab7..1961d74 100644 --- a/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationMigrationTest.kt +++ b/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/config/ConfigurationMigrationTest.kt @@ -1,12 +1,12 @@ package app.simplecloud.plugin.api.shared.config +import org.spongepowered.configurate.objectmapping.ConfigSerializable import java.nio.file.Files import java.nio.file.Path import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue -import org.spongepowered.configurate.objectmapping.ConfigSerializable class ConfigurationMigrationTest { @@ -17,14 +17,16 @@ class ConfigurationMigrationTest { file.writeText( """ name: legacy-value - """.trimIndent() + """ + .trimIndent(), ) - val configurationFactory = ConfigurationFactory( - file = file, - javaClass = TestVersionedConfig::class.java, - configMigrator = testMigrator(), - ) + val configurationFactory = + ConfigurationFactory( + file = file, + javaClass = TestVersionedConfig::class.java, + configMigrator = testMigrator(), + ) val config = configurationFactory.loadOrCreate(TestVersionedConfig()) @@ -47,13 +49,15 @@ class ConfigurationMigrationTest { """ version: 1 message: repository-value - """.trimIndent() + """ + .trimIndent(), ) - val repository = TestYamlDirectoryRepository( - directory = tempDirectory, - configMigrator = testMigrator(), - ) + val repository = + TestYamlDirectoryRepository( + directory = tempDirectory, + configMigrator = testMigrator(), + ) val loadedEntries = repository.load() @@ -88,21 +92,17 @@ class ConfigurationMigrationTest { var enabled: Boolean = true } - private class TestYamlDirectoryRepository( - directory: Path, - configMigrator: ConfigMigrator, - ) : YamlDirectoryRepository( - directory = directory, - javaClass = TestVersionedConfig::class.java, - configMigrator = configMigrator, - ) { + private class TestYamlDirectoryRepository(directory: Path, configMigrator: ConfigMigrator) : + YamlDirectoryRepository( + directory = directory, + javaClass = TestVersionedConfig::class.java, + configMigrator = configMigrator, + ) { override fun save(entity: TestVersionedConfig) { save("${entity.message}.yml", entity) } - override fun find(identifier: String): TestVersionedConfig? { - return findAll().firstOrNull { it.message == identifier } - } + override fun find(identifier: String): TestVersionedConfig? = findAll().firstOrNull { it.message == identifier } } } diff --git a/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifierTest.kt b/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifierTest.kt index 28cca93..c6b1b98 100644 --- a/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifierTest.kt +++ b/plugin-shared/src/test/kotlin/app/simplecloud/plugin/api/shared/pretty/StringPrettifierTest.kt @@ -16,37 +16,67 @@ class StringPrettifierTest { fun testCamelCaseConversion() { assertEquals("helloWorld", StringPrettifier.prettify("hello-world", PrettifyCase.CAMEL)) assertEquals("helloWorld", StringPrettifier.prettify("hello_world", PrettifyCase.CAMEL)) - assertEquals("helloBeautifulWorld", StringPrettifier.prettify("hello beautiful world", PrettifyCase.CAMEL)) - assertEquals("myVariableName", StringPrettifier.prettify("my-variable-name", PrettifyCase.CAMEL)) + assertEquals( + "helloBeautifulWorld", + StringPrettifier.prettify("hello beautiful world", PrettifyCase.CAMEL), + ) + assertEquals( + "myVariableName", + StringPrettifier.prettify("my-variable-name", PrettifyCase.CAMEL), + ) } @Test fun testPascalCaseConversion() { assertEquals("HelloWorld", StringPrettifier.prettify("hello-world", PrettifyCase.PASCAL)) assertEquals("HelloWorld", StringPrettifier.prettify("hello_world", PrettifyCase.PASCAL)) - assertEquals("HelloBeautifulWorld", StringPrettifier.prettify("hello beautiful world", PrettifyCase.PASCAL)) - assertEquals("MyVariableName", StringPrettifier.prettify("my-variable-name", PrettifyCase.PASCAL)) + assertEquals( + "HelloBeautifulWorld", + StringPrettifier.prettify("hello beautiful world", PrettifyCase.PASCAL), + ) + assertEquals( + "MyVariableName", + StringPrettifier.prettify("my-variable-name", PrettifyCase.PASCAL), + ) } @Test fun testSentenceCaseConversion() { assertEquals("Hello world", StringPrettifier.prettify("hello-world", PrettifyCase.SENTENCE)) - assertEquals("Hello beautiful world", StringPrettifier.prettify("hello_beautiful_world", PrettifyCase.SENTENCE)) - assertEquals("My variable name", StringPrettifier.prettify("my-variable-name", PrettifyCase.SENTENCE)) + assertEquals( + "Hello beautiful world", + StringPrettifier.prettify("hello_beautiful_world", PrettifyCase.SENTENCE), + ) + assertEquals( + "My variable name", + StringPrettifier.prettify("my-variable-name", PrettifyCase.SENTENCE), + ) } @Test fun testKebabCaseConversion() { assertEquals("hello-world", StringPrettifier.prettify("hello world", PrettifyCase.KEBAB)) - assertEquals("hello-beautiful-world", StringPrettifier.prettify("hello_beautiful_world", PrettifyCase.KEBAB)) - assertEquals("my-variable-name", StringPrettifier.prettify("my variable name", PrettifyCase.KEBAB)) + assertEquals( + "hello-beautiful-world", + StringPrettifier.prettify("hello_beautiful_world", PrettifyCase.KEBAB), + ) + assertEquals( + "my-variable-name", + StringPrettifier.prettify("my variable name", PrettifyCase.KEBAB), + ) } @Test fun testSnakeCaseConversion() { assertEquals("hello_world", StringPrettifier.prettify("hello-world", PrettifyCase.SNAKE)) - assertEquals("hello_beautiful_world", StringPrettifier.prettify("hello beautiful world", PrettifyCase.SNAKE)) - assertEquals("my_variable_name", StringPrettifier.prettify("my-variable-name", PrettifyCase.SNAKE)) + assertEquals( + "hello_beautiful_world", + StringPrettifier.prettify("hello beautiful world", PrettifyCase.SNAKE), + ) + assertEquals( + "my_variable_name", + StringPrettifier.prettify("my-variable-name", PrettifyCase.SNAKE), + ) } @Test @@ -59,7 +89,13 @@ class StringPrettifierTest { @Test fun testMultipleDelimiterHandling() { assertEquals("Hello Beautiful World", StringPrettifier.prettify("hello-beautiful_world")) - assertEquals("helloBeautifulWorld", StringPrettifier.prettify("hello-beautiful_world", PrettifyCase.CAMEL)) - assertEquals("HelloBeautifulWorld", StringPrettifier.prettify("hello-beautiful_world", PrettifyCase.PASCAL)) + assertEquals( + "helloBeautifulWorld", + StringPrettifier.prettify("hello-beautiful_world", PrettifyCase.CAMEL), + ) + assertEquals( + "HelloBeautifulWorld", + StringPrettifier.prettify("hello-beautiful_world", PrettifyCase.PASCAL), + ) } } diff --git a/plugin-velocity/build.gradle.kts b/plugin-velocity/build.gradle.kts index 12b0664..e432564 100644 --- a/plugin-velocity/build.gradle.kts +++ b/plugin-velocity/build.gradle.kts @@ -7,4 +7,4 @@ dependencies { compileOnly(libs.cloud.velocity) compileOnly(libs.velocity.api) kapt(libs.velocity.api) -} \ No newline at end of file +} diff --git a/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSender.kt b/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSender.kt index 9527ac2..5f8369c 100644 --- a/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSender.kt +++ b/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSender.kt @@ -8,20 +8,13 @@ import java.util.UUID class VelocityCloudSender(private val commandSource: CommandSource) : CloudSender { - fun getCommandSource(): CommandSource { - return commandSource - } + fun getCommandSource(): CommandSource = commandSource - override fun getUniqueId(): UUID? { - return (commandSource as? Player)?.uniqueId - } + override fun getUniqueId(): UUID? = (commandSource as? Player)?.uniqueId - override fun hasPermission(permission: String): Boolean { - return commandSource.hasPermission(permission) - } + override fun hasPermission(permission: String): Boolean = commandSource.hasPermission(permission) override fun sendMessage(message: Component) { commandSource.sendMessage(message) } - } diff --git a/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSenderMapper.kt b/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSenderMapper.kt index e8ef1e8..062f4f1 100644 --- a/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSenderMapper.kt +++ b/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/command/VelocityCloudSenderMapper.kt @@ -5,12 +5,7 @@ import org.incendo.cloud.SenderMapper object VelocityCloudSenderMapper : SenderMapper { - override fun map(base: CommandSource): VelocityCloudSender { - return VelocityCloudSender(base) - } - - override fun reverse(mapped: VelocityCloudSender): CommandSource { - return mapped.getCommandSource() - } + override fun map(base: CommandSource): VelocityCloudSender = VelocityCloudSender(base) + override fun reverse(mapped: VelocityCloudSender): CommandSource = mapped.getCommandSource() } diff --git a/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/permission/VelocityPermissionChecker.kt b/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/permission/VelocityPermissionChecker.kt index a2bb7e7..8ff9048 100644 --- a/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/permission/VelocityPermissionChecker.kt +++ b/plugin-velocity/src/main/kotlin/app/simplecloud/plugin/api/velocity/permission/VelocityPermissionChecker.kt @@ -3,14 +3,7 @@ package app.simplecloud.plugin.api.velocity.permission import app.simplecloud.plugin.api.shared.permission.PermissionChecker import com.velocitypowered.api.proxy.Player -/** - * @author Niklas Nieberler - */ - class VelocityPermissionChecker : PermissionChecker { - override fun checkPermission(player: Player, name: String): Boolean { - return player.hasPermission(name) - } - -} \ No newline at end of file + override fun checkPermission(player: Player, name: String): Boolean = player.hasPermission(name) +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 7cabdca..ddaae11 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,7 @@ +pluginManagement { + includeBuild("build-logic") +} + plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } @@ -7,7 +11,7 @@ include( "plugin-minestom", "plugin-paper", "plugin-shared", - "plugin-velocity" + "plugin-velocity", ) rootProject.name = "plugin-api" \ No newline at end of file