Skip to content

Commit c92e185

Browse files
chore: add UNKNOWN server state, improve state change command, and clean up build files
1 parent 00a4eee commit c92e185

File tree

6 files changed

+32
-27
lines changed

6 files changed

+32
-27
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
77
}
88
dependencies {
9-
classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.11+")
9+
classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.10+")
1010
}
1111
}
1212

@@ -24,9 +24,5 @@ subprojects {
2424
}
2525
}
2626
}
27-
28-
tasks.withType<GenerateModuleMetadata> {
29-
suppressedValidationErrors.add("enforced-platform")
30-
}
3127
}
3228
}

settings.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
plugins {
2-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
3-
}
4-
51
rootProject.name = "surf-event"
62

73
include("surf-event-mythic-mobs")
84

5+
include("surf-event-base")
96
include("surf-event-base:surf-event-base-api")
107
include("surf-event-base:surf-event-base-api:surf-event-base-api-redis")
118
include("surf-event-base:surf-event-base-api:surf-event-base-api-common")

surf-event-base/surf-event-base-api/surf-event-base-api-common/src/main/kotlin/dev/slne/surf/event/base/api/common/state/EventServerState.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import kotlinx.serialization.Serializable
55
@Serializable
66
enum class EventServerState(val playerJoin: Boolean, val displayName: String) {
77
OPEN(true, "Offen"),
8-
CLOSED(false, "Geschlossen");
8+
CLOSED(false, "Geschlossen"),
9+
UNKNOWN(false, "Unbekannt");
910

1011
fun next(): EventServerState = when (this) {
1112
OPEN -> CLOSED
1213
CLOSED -> OPEN
14+
UNKNOWN -> UNKNOWN
1315
}
1416
}

surf-event-base/surf-event-base-paper/src/main/kotlin/dev/slne/surf/event/base/paper/PaperMain.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package dev.slne.surf.event.base.paper
22

33
import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
4+
import dev.slne.surf.event.base.api.common.state.EventServerState
5+
import dev.slne.surf.event.base.api.redis.event.EventServerStateChangeRedisEvent
46
import dev.slne.surf.event.base.paper.command.eventServerStateChangeCommand
57
import dev.slne.surf.event.base.paper.config.EventServerConfigHolder
68
import dev.slne.surf.event.base.paper.manager.eventServerManager
@@ -16,6 +18,13 @@ class PaperMain : SuspendingJavaPlugin() {
1618
}
1719

1820
override fun onDisable() {
21+
redisApi.publishEvent(
22+
EventServerStateChangeRedisEvent(
23+
eventServerManager.state,
24+
EventServerState.UNKNOWN
25+
)
26+
)
27+
1928
redisLoader.disconnect()
2029

2130
eventServerConfigHolder.edit {

surf-event-base/surf-event-base-paper/src/main/kotlin/dev/slne/surf/event/base/paper/command/EventServerStateChangeCommand.kt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,27 @@ import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
1313

1414
fun eventServerStateChangeCommand() = commandTree("changeeventserverstate") {
1515
withPermission(PermissionRegistry.COMMAND_EVENT_SERVER_CHANGE_STATE)
16-
eventServerStateArgument("state")
17-
anyExecutor { executor, args ->
18-
val current = eventServerManager.state
19-
val state: EventServerState by args
16+
eventServerStateArgument("state") {
17+
anyExecutor { executor, args ->
18+
val current = eventServerManager.state
19+
val state: EventServerState by args
2020

21-
if (current == state) {
22-
executor.sendText {
23-
appendPrefix()
24-
error("Der Event Server ist bereits ${current.displayName}.")
21+
if (current == state) {
22+
executor.sendText {
23+
appendPrefix()
24+
error("Der Event Server ist bereits ${current.displayName}.")
25+
}
26+
return@anyExecutor
2527
}
26-
return@anyExecutor
27-
}
2828

29-
redisApi.publishEvent(EventServerStateChangeRedisEvent(current, state))
29+
redisApi.publishEvent(EventServerStateChangeRedisEvent(current, state))
3030

31-
executor.sendText {
32-
appendPrefix()
33-
success("Der Event Server ist nun ")
34-
variableValue(state.displayName)
35-
success(".")
31+
executor.sendText {
32+
appendPrefix()
33+
success("Der Event Server ist nun ")
34+
variableValue(state.displayName)
35+
success(".")
36+
}
3637
}
3738
}
3839
}

0 commit comments

Comments
 (0)