Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
fabianmakila committed Oct 2, 2024
1 parent 65c509b commit 9810cea
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 75 deletions.
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`kotlin-dsl`
}

dependencies() {
dependencies {
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA2")
implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.2")
}
36 changes: 18 additions & 18 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
plugins {
id("webhooklogger.java-conventions")
id("webhooklogger.java-conventions")
}

dependencies {
// Webhook clients
implementation(libs.client.discord)
// Webhook clients
implementation(libs.client.discord)

// External libraries
implementation(libs.dazzleconf) {
exclude("org.yaml")
}
implementation(libs.mcdiscordserializer) {
exclude("net.kyori")
}
// External libraries
implementation(libs.dazzleconf) {
exclude("org.yaml")
}
implementation(libs.mcdiscordserializer) {
exclude("net.kyori")
}

implementation(libs.cloud.minecraftExtras)
implementation(libs.cloud.minecraftExtras)

// These are provided by the platforms
compileOnly(libs.adventure)
compileOnly(libs.adventure.text.minimessage)
compileOnly(libs.adventure.text.serializer.plain)
compileOnly(libs.slf4j)
compileOnly(libs.snakeyaml)
// These are provided by the platforms
compileOnly(libs.adventure)
compileOnly(libs.adventure.text.minimessage)
compileOnly(libs.adventure.text.serializer.plain)
compileOnly(libs.slf4j)
compileOnly(libs.snakeyaml)

compileOnly(libs.miniplaceholders)
compileOnly(libs.miniplaceholders)
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
public final class ContextKeys {
public static final CloudKey<WebhookLogger> WEBHOOK_LOGGER_KEY = CloudKey.of("WebhookLogger", WebhookLogger.class);

private ContextKeys() {}
private ContextKeys() {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

public interface Platform {
Logger logger();

Path configPath();

CommandManager<Audience> commandManager();

ListenerManager listenerManager();
}
1 change: 0 additions & 1 deletion common/src/main/resources/messages_en.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
cloud.exception.invalid_argument=Invalid argument: {0}
cloud.exception.invalid_syntax=Invalid syntax: {0}

webhooklogger.command.reload.success=Reload complete.
webhooklogger.command.reload.failure=Reload failed. Check the console for more details.
1 change: 0 additions & 1 deletion common/src/main/resources/messages_fi.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
cloud.exception.invalid_argument=Epäkelvollinen argumentti: {0}
cloud.exception.invalid_syntax=Epäkelvollinen syntaksi: {0}

webhooklogger.command.reload.success=Uudelleenlataus onnistui.
webhooklogger.command.reload.failure=Uudelleenlataus epäonnistui. Tarkista konsoli saadaksesi lisätietoja.
18 changes: 9 additions & 9 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
rootProject.name = "WebhookLogger"

sequenceOf(
"common",
"paper",
"sponge"
"common",
"paper",
"sponge"
).forEach { include(it) }

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://repo.spongepowered.org/repository/maven-public/")
}
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://repo.spongepowered.org/repository/maven-public/")
}
}
88 changes: 44 additions & 44 deletions sponge/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,59 @@ import org.spongepowered.gradle.plugin.config.PluginLoaders
import org.spongepowered.plugin.metadata.model.PluginDependency

plugins {
id("webhooklogger.platform-conventions")
alias(libs.plugins.sponge)
id("webhooklogger.platform-conventions")
alias(libs.plugins.sponge)
}

dependencies {
implementation(project(":common"))
compileOnly(libs.platform.sponge)
implementation(project(":common"))
compileOnly(libs.platform.sponge)

implementation(libs.bstats.sponge)
implementation(libs.cloud.sponge)
implementation(libs.slf4j)
implementation(libs.bstats.sponge)
implementation(libs.cloud.sponge)
implementation(libs.slf4j)
}

tasks {
shadowJar {
sequenceOf(
"org.slf4j",
).forEach { pkg ->
relocate(pkg, "fi.fabianadrian.webhooklogger.dependency.$pkg")
}
}
shadowJar {
sequenceOf(
"org.slf4j",
).forEach { pkg ->
relocate(pkg, "fi.fabianadrian.webhooklogger.dependency.$pkg")
}
}
}

sponge {
injectRepositories(false)
injectRepositories(false)

apiVersion("10.0.0")
loader {
name(PluginLoaders.JAVA_PLAIN)
version("1.0")
}
license("GPLv3")
plugin(rootProject.name.lowercase()) {
description(rootProject.description)
displayName(rootProject.name)
entrypoint("fi.fabianadrian.webhooklogger.sponge.WebhookLoggerSponge")
version(rootProject.version.toString())
links {
homepage("https://modrinth.com/plugin/webhooklogger")
source("https://github.com/fabianmakila/webhooklogger")
issues("https://github.com/fabianmakila/webhooklogger/issues")
}
contributor("FabianAdrian") {
description("Developer")
}
dependency("spongeapi") {
loadOrder(PluginDependency.LoadOrder.AFTER)
optional(false)
}
dependency("miniplaceholders") {
loadOrder(PluginDependency.LoadOrder.AFTER)
optional(true)
version("2.2.4")
}
}
apiVersion("10.0.0")
loader {
name(PluginLoaders.JAVA_PLAIN)
version("1.0")
}
license("GPLv3")
plugin(rootProject.name.lowercase()) {
description(rootProject.description)
displayName(rootProject.name)
entrypoint("fi.fabianadrian.webhooklogger.sponge.WebhookLoggerSponge")
version(rootProject.version.toString())
links {
homepage("https://modrinth.com/plugin/webhooklogger")
source("https://github.com/fabianmakila/webhooklogger")
issues("https://github.com/fabianmakila/webhooklogger/issues")
}
contributor("FabianAdrian") {
description("Developer")
}
dependency("spongeapi") {
loadOrder(PluginDependency.LoadOrder.AFTER)
optional(false)
}
dependency("miniplaceholders") {
loadOrder(PluginDependency.LoadOrder.AFTER)
optional(true)
version("2.2.4")
}
}
}

0 comments on commit 9810cea

Please sign in to comment.