Skip to content

Commit 978ca47

Browse files
committed
0.2.0 Release
Fixes default message on join Removes dependency for MiniMessage - Provided by Sponge Adds dependency to Kruntime, and stop providing runtime.
1 parent 2879360 commit 978ca47

File tree

4 files changed

+53
-24
lines changed

4 files changed

+53
-24
lines changed

build.gradle.kts

+42-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
1+
import org.spongepowered.gradle.plugin.config.PluginLoaders
12
import org.spongepowered.plugin.metadata.model.PluginDependency
23

34
plugins {
4-
id("zoddlib.project-conventions")
5-
id("com.google.devtools.ksp") version "1.7.10-1.0.6"
5+
kotlin("jvm") version "1.8.0"
6+
id("com.github.johnrengelman.shadow") version "7.1.2"
7+
id("org.spongepowered.gradle.plugin") version "2.1.1"
8+
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
69
}
710

811
dependencies {
9-
implementation("net.kyori:adventure-text-minimessage:4.11.0")
10-
11-
implementation("com.github.ben-manes.caffeine:caffeine:3.1.1")
12+
implementation("com.github.ben-manes.caffeine:caffeine:3.1.5")
1213

1314
ksp("dev.zacsweers.autoservice:auto-service-ksp:1.0.0")
1415
implementation("com.google.auto.service:auto-service-annotations:1.0.1")
1516

1617
testImplementation(kotlin("test"))
1718
}
19+
repositories {
20+
mavenCentral()
21+
}
1822

1923
sponge {
24+
apiVersion("8.2.0-SNAPSHOT")
25+
license("CHANGEME")
26+
loader {
27+
name(PluginLoaders.JAVA_PLAIN)
28+
version("1.0")
29+
}
2030
plugin("zoddjoin") {
2131
displayName("ZoddJoin")
2232
entrypoint("me.zodd.zoddJoin.ZoddJoin")
2333
description("A simple Join Message Plugin")
24-
version("0.1.2")
34+
version("0.2.0")
2535
links {
2636
homepage("https://ore.spongepowered.org/DrZoddiak/ZoddJoin")
2737
source("https://github.com/DrZoddiak/ZoddJoin")
@@ -34,14 +44,39 @@ sponge {
3444
loadOrder(PluginDependency.LoadOrder.AFTER)
3545
optional(false)
3646
}
47+
dependency("kruntime") {
48+
version("0.4.0")
49+
loadOrder(PluginDependency.LoadOrder.AFTER)
50+
optional(false)
51+
}
3752
}
3853
}
3954

55+
tasks.shadowJar {
56+
exclude("kotlin/**")
57+
}
58+
4059
kotlin {
4160
sourceSets.main {
4261
kotlin.srcDir("build/generated/ksp/main/kotlin")
4362
}
44-
this.sourceSets.test {
63+
sourceSets.test {
4564
kotlin.srcDir("build/generated/ksp/test/kotlin")
4665
}
66+
}
67+
68+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
69+
kotlinOptions.jvmTarget = "1.8"
70+
}
71+
72+
73+
tasks.withType(JavaCompile::class).configureEach {
74+
options.apply {
75+
encoding = "utf-8" // Consistent source file encoding
76+
}
77+
}
78+
79+
tasks.withType(AbstractArchiveTask::class).configureEach {
80+
isReproducibleFileOrder = true
81+
isPreserveFileTimestamps = false
4782
}

src/main/kotlin/me/zodd/zoddJoin/ZoddJoin.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package me.zodd.zoddJoin
22

33
import com.google.inject.Inject
4-
import me.zodd.core.logger
54
import me.zodd.zoddJoin.config.MessageConfig
65
import me.zodd.zoddJoin.cache.CacheProcessor
76
import me.zodd.zoddJoin.listeners.JoinListener
87
import me.zodd.zoddJoin.listeners.QuitListener
98
import net.kyori.adventure.text.Component
109
import net.kyori.adventure.text.TextComponent
10+
import org.apache.logging.log4j.Logger
1111
import org.spongepowered.api.Sponge
1212
import org.spongepowered.api.config.DefaultConfig
1313
import org.spongepowered.api.event.Listener
@@ -23,9 +23,9 @@ import org.spongepowered.plugin.builtin.jvm.Plugin
2323
class ZoddJoin @Inject internal constructor(
2424
private val container: PluginContainer,
2525
@DefaultConfig(sharedRoot = false) val reference: ConfigurationReference<CommentedConfigurationNode>,
26+
private val logger: Logger
2627
) {
2728

28-
private val logger = logger<ZoddJoin>()
2929
private lateinit var config: MessageConfig
3030

3131
@Listener

src/main/kotlin/me/zodd/zoddJoin/actions/player/TeleportAction.kt

-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
package me.zodd.zoddJoin.actions.player
22

33
import com.google.auto.service.AutoService
4-
import me.zodd.core.logger
54
import me.zodd.zoddJoin.actions.AbstractAction
65
import me.zodd.zoddJoin.actions.Action
76
import org.spongepowered.api.ResourceKey
8-
import org.spongepowered.api.Sponge
97
import org.spongepowered.api.entity.living.player.server.ServerPlayer
10-
import org.spongepowered.api.world.Location
11-
import org.spongepowered.api.world.LocationCreator
12-
import org.spongepowered.api.world.World
138
import org.spongepowered.api.world.WorldType
149
import org.spongepowered.api.world.WorldTypes
1510
import org.spongepowered.math.vector.Vector3d
16-
import java.util.stream.Collectors
1711

1812
@AutoService(Action::class)
1913
class TeleportAction : AbstractAction() {
@@ -24,8 +18,6 @@ class TeleportAction : AbstractAction() {
2418

2519
val args = data.split(";")
2620

27-
logger<TeleportAction>().info(WorldTypes.registry().streamEntries().map { it.key() }.collect(Collectors.toSet()).joinToString())
28-
2921
val worldKey = ResourceKey.resolve(args[0])
3022
val locX = args[1].toDouble()
3123
val locY = args[2].toDouble()

src/main/kotlin/me/zodd/zoddJoin/listeners/AbstractListener.kt

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package me.zodd.zoddJoin.listeners
22

3-
import me.zodd.core.commands.taskBuilder
43
import me.zodd.zoddJoin.cache.ConfigCache
54
import me.zodd.zoddJoin.cache.FormatHolder
65
import me.zodd.zoddJoin.cache.Holder
@@ -9,23 +8,24 @@ import me.zodd.zoddJoin.actions.ActionHolder
98
import org.spongepowered.api.Sponge
109
import org.spongepowered.api.effect.VanishState
1110
import org.spongepowered.api.entity.living.player.server.ServerPlayer
11+
import org.spongepowered.api.scheduler.Task
1212
import org.spongepowered.plugin.PluginContainer
1313
import java.time.Duration
1414

1515
abstract class AbstractListener(private val plugin: PluginContainer) {
1616
private fun scheduleTask(delay: Long, e: () -> Unit) {
17-
val task = taskBuilder {
18-
plugin(plugin)
19-
delay(Duration.ofSeconds(delay))
20-
execute(Runnable { e.invoke() })
21-
}
17+
val task = Task.builder()
18+
.plugin(plugin)
19+
.delay(Duration.ofSeconds(delay))
20+
.execute(e)
21+
.build()
2222
Sponge.server().scheduler().submit(task)
2323
}
2424

2525
private fun <T : Holder> filter(holders: MutableCollection<out T>, player: ServerPlayer): T {
2626
return holders
2727
.filter { player.hasPermission(it.settings.permission) || it.settings.permission.isBlank() }
28-
.maxBy{ it.settings.priority }
28+
.maxBy { it.settings.priority }
2929
}
3030

3131
private fun handleActionHolder(holder: ActionHolder, delay: Long = 0L, run: () -> Unit) {
@@ -50,12 +50,14 @@ abstract class AbstractListener(private val plugin: PluginContainer) {
5050
}
5151
}
5252
}
53+
5354
"RANDOM" -> {
5455
val act = formatHolder.actions.random()
5556
handleActionHolder(act) {
5657
act.pair.action.random().run(player, act.content, act.isRunnable)
5758
}
5859
}
60+
5961
"VANISH" -> {
6062
if (player.vanishState().get() == VanishState.vanished()) {
6163

0 commit comments

Comments
 (0)