Skip to content

Commit d1acf44

Browse files
TheBjoRedCraftTheBjoRedCraft
committed
fix: update imports and refactor hooks to use new API structure
1 parent 6be834b commit d1acf44

37 files changed

Lines changed: 347 additions & 453 deletions

‎.github/workflows/publish.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ env:
1717
jobs:
1818
build:
1919
runs-on: ubuntu-latest
20-
environment: production
2120
steps:
2221
- name: Collect Workflow Telemetry
2322
uses: catchpoint/workflow-telemetry-action@v2

‎build.gradle.kts‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
import dev.slne.surf.surfapi.gradle.util.registerRequired
2-
import dev.slne.surf.surfapi.gradle.util.registerSoft
1+
import dev.slne.surf.api.gradle.util.registerRequired
2+
import dev.slne.surf.api.gradle.util.registerSoft
33

44
plugins {
5-
id("dev.slne.surf.surfapi.gradle.paper-plugin") version "1.21.11+"
5+
id("dev.slne.surf.api.gradle.paper-plugin") version "+"
66
}
77

88
repositories {
99
maven("https://repo.nexomc.com/releases")
1010
}
1111

1212
dependencies {
13-
compileOnly("surf-hologram:surf-hologram-api:1.21.11-1.0.2-SNAPSHOT")
14-
compileOnly("dev.slne.surf.npc:surf-npc-api:1.21.11-1.6.0-SNAPSHOT")
13+
compileOnly("dev.slne.surf.npc:surf-npc-api:+")
1514
compileOnly("com.nexomc:nexo:1.16.1")
16-
implementation("dev.slne.surf.event:surf-event-base-api-common:1.21.11-1.0.0-SNAPSHOT")
17-
implementation("dev.slne.surf.tab:surf-tab-api:1.21.11-1.0.2-SNAPSHOT")
18-
compileOnly("dev.slne.surf.parkour:surf-parkour-api:1.21.11-3.4.0-SNAPSHOT")
19-
compileOnly("dev.slne.surf.trophy:surf-trophy-api:1.21.11-1.1.0-SNAPSHOT")
20-
compileOnly("dev.slne.surf.profile:surf-profile-api:1.21.11-1.0.0-SNAPSHOT")
21-
compileOnly("dev.slne.surf.settings:surf-settings-api:1.21.11-2.0.0-SNAPSHOT")
22-
compileOnly("dev.slne.surf:surf-queue-api:1.0.0-SNAPSHOT")
15+
implementation("dev.slne.surf.event:surf-event-base-api-common:+")
16+
implementation("dev.slne.surf.tab:surf-tab-api:+")
17+
compileOnly("dev.slne.surf.parkour:surf-parkour-api:+")
18+
compileOnly("dev.slne.surf.trophy:surf-trophy-api:+")
19+
compileOnly("dev.slne.surf.profile:surf-profile-api:+")
20+
compileOnly("dev.slne.surf.settings:surf-settings-api:+")
21+
compileOnly("dev.slne.surf.queue:surf-queue-api:+")
2322
}
2423

2524
version = findProperty("version") as String

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
22
kotlin.stdlib.default.dependency=false
33
org.gradle.parallel=true
4-
version=1.21.11-3.0.13-SNAPSHOT
4+
version=3.1.0-SNAPSHOT

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ rootProject.name = "surf-lobby"
33
pluginManagement {
44
repositories {
55
gradlePluginPortal()
6-
maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
6+
maven("https://reposilite.slne.dev/releases")
77
}
88
}

‎src/main/kotlin/dev/slne/surf/lobby/PaperMain.kt‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package dev.slne.surf.lobby
22

33
import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
4+
import dev.slne.surf.api.paper.event.register
5+
import dev.slne.surf.api.paper.extensions.pluginManager
46
import dev.slne.surf.lobby.command.lobbyCommand
57
import dev.slne.surf.lobby.command.spawnCommand
68
import dev.slne.surf.lobby.config.LobbyConfigHolder
79
import dev.slne.surf.lobby.event.eventServerBridge
8-
import dev.slne.surf.lobby.hook.hologram.SurfHologramHook
910
import dev.slne.surf.lobby.hook.nexo.NexoHook
1011
import dev.slne.surf.lobby.hook.npc.SurfNpcHook
1112
import dev.slne.surf.lobby.listener.*
1213
import dev.slne.surf.lobby.manager.PushbackManager
1314
import dev.slne.surf.redis.RedisApi
14-
import dev.slne.surf.surfapi.bukkit.api.event.register
15-
import org.bukkit.Bukkit
1615
import org.bukkit.inventory.ItemType
1716
import org.bukkit.plugin.java.JavaPlugin
1817

@@ -21,15 +20,11 @@ val plugin get() = JavaPlugin.getPlugin(PaperMain::class.java)
2120
class PaperMain : SuspendingJavaPlugin() {
2221
lateinit var redisApi: RedisApi
2322
override fun onEnable() {
24-
if (surfNpcHook) {
23+
if (checkNpcHook()) {
2524
SurfNpcHook.initialize()
2625
SurfNpcHook.startSyncTask()
2726
}
2827

29-
if (surfHologramHook) {
30-
SurfHologramHook.initialize()
31-
}
32-
3328
DoubleJumpListener.register()
3429
SpawnLocationListener.register()
3530
PlayerConnectionListener.register()
@@ -52,20 +47,23 @@ class PaperMain : SuspendingJavaPlugin() {
5247
}
5348

5449
override fun onDisable() {
55-
if (surfNpcHook) {
50+
if (checkNpcHook()) {
5651
SurfNpcHook.stopSyncTask()
5752
}
5853

5954
redisApi.disconnect()
6055
}
6156

6257
fun getInvisibleItem() =
63-
if (nexoHook) NexoHook.getInvisibleItem() else ItemType.PAPER.createItemStack()
58+
if (checkNexoHook()) NexoHook.getInvisibleItem() else ItemType.PAPER.createItemStack()
59+
60+
fun checkTrophyHook() = pluginManager.isPluginEnabled("surf-trophy-paper")
61+
fun checkProfileHook() = pluginManager.isPluginEnabled("surf-profile-paper")
62+
fun checkParkourHook() = pluginManager.isPluginEnabled("surf-parkour-paper")
63+
fun checkSettingsHook() = pluginManager.isPluginEnabled("surf-settings-paper")
64+
fun checkNpcHook() = pluginManager.isPluginEnabled("surf-npc-paper")
65+
fun checkNexoHook() = pluginManager.isPluginEnabled("Nexo")
6466
}
6567

6668
val lobbyConfigHolder = LobbyConfigHolder()
67-
val lobbyConfig get() = lobbyConfigHolder.lobbyConfig
68-
val surfNpcHook get() = Bukkit.getPluginManager().isPluginEnabled("surf-npc-paper")
69-
val surfHologramHook get() = Bukkit.getPluginManager().isPluginEnabled("surf-hologram-paper")
70-
val nexoHook get() = Bukkit.getPluginManager().isPluginEnabled("Nexo")
71-
val parkourHook get() = Bukkit.getPluginManager().isPluginEnabled("surf-parkour-paper")
69+
val lobbyConfig get() = lobbyConfigHolder.lobbyConfig

‎src/main/kotlin/dev/slne/surf/lobby/command/LobbyCommand.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package dev.slne.surf.lobby.command
33
import dev.jorel.commandapi.kotlindsl.anyExecutor
44
import dev.jorel.commandapi.kotlindsl.commandTree
55
import dev.jorel.commandapi.kotlindsl.literalArgument
6+
import dev.slne.surf.api.core.messages.adventure.sendText
67
import dev.slne.surf.lobby.lobbyConfigHolder
78
import dev.slne.surf.lobby.utils.PermissionRegistry
8-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
99

1010
fun lobbyCommand() = commandTree("surflobby") {
1111
withPermission(PermissionRegistry.COMMAND_LOBBY)
@@ -15,10 +15,6 @@ fun lobbyCommand() = commandTree("surflobby") {
1515
anyExecutor { executor, _ ->
1616
lobbyConfigHolder.reload()
1717

18-
// if (surfNpcHook) {
19-
// SurfNpcHook.reload()
20-
// }
21-
2218
executor.sendText {
2319
appendSuccessPrefix()
2420
success("Lobby configuration reloaded successfully.")

‎src/main/kotlin/dev/slne/surf/lobby/command/SpawnCommand.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package dev.slne.surf.lobby.command
22

33
import dev.jorel.commandapi.kotlindsl.commandTree
44
import dev.jorel.commandapi.kotlindsl.playerExecutor
5+
import dev.slne.surf.api.core.messages.adventure.sendText
56
import dev.slne.surf.lobby.lobbyConfig
67
import dev.slne.surf.lobby.utils.PermissionRegistry
7-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
88

99
fun spawnCommand() = commandTree("spawn") {
1010
withPermission(PermissionRegistry.COMMAND_SPAWN)

‎src/main/kotlin/dev/slne/surf/lobby/config/LobbyConfigHolder.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.slne.surf.lobby.config
22

3+
import dev.slne.surf.api.core.config.manager.SpongeConfigManager
4+
import dev.slne.surf.api.core.config.surfConfigApi
35
import dev.slne.surf.lobby.plugin
4-
import dev.slne.surf.surfapi.core.api.config.manager.SpongeConfigManager
5-
import dev.slne.surf.surfapi.core.api.config.surfConfigApi
66

77
class LobbyConfigHolder {
88
private val configManager: SpongeConfigManager<LobbyConfig>

‎src/main/kotlin/dev/slne/surf/lobby/hook/hologram/SurfHologramHook.kt‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎src/main/kotlin/dev/slne/surf/lobby/hook/npc/SurfNpcHook.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package dev.slne.surf.lobby.hook.npc
22

33
import com.github.shynixn.mccoroutine.folia.launch
4-
import dev.slne.surf.core.api.common.surfCoreApi
4+
import dev.slne.surf.api.core.font.toSmallCaps
5+
import dev.slne.surf.api.core.messages.adventure.clickOpensUrl
6+
import dev.slne.surf.api.core.messages.adventure.playSound
7+
import dev.slne.surf.api.core.messages.adventure.sendText
8+
import dev.slne.surf.core.api.common.SurfCoreApi
59
import dev.slne.surf.core.api.paper.util.surfPlayer
610
import dev.slne.surf.event.base.api.common.state.EventServerState
711
import dev.slne.surf.lobby.event.eventServerBridge
@@ -16,10 +20,6 @@ import dev.slne.surf.npc.api.event.NpcInteractEvent
1620
import dev.slne.surf.npc.api.npc.Npc
1721
import dev.slne.surf.npc.api.npc.rotation.NpcRotationType
1822
import dev.slne.surf.queue.api.queue
19-
import dev.slne.surf.surfapi.core.api.font.toSmallCaps
20-
import dev.slne.surf.surfapi.core.api.messages.adventure.clickOpensUrl
21-
import dev.slne.surf.surfapi.core.api.messages.adventure.playSound
22-
import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
2323
import io.papermc.paper.threadedregions.scheduler.ScheduledTask
2424
import net.kyori.adventure.text.format.TextDecoration
2525
import org.bukkit.Bukkit
@@ -209,15 +209,15 @@ object SurfNpcHook {
209209
}
210210

211211
private fun queueToEventServer(player: Player) {
212-
surfCoreApi.getServerByName(lobbyConfig.eventServerName)
212+
SurfCoreApi.getServerByName(lobbyConfig.eventServerName)
213213
?.let { server ->
214214
plugin.launch {
215215
if (player.hasPermission(PermissionRegistry.QUEUE_BYPASS)) {
216216
player.sendText {
217217
appendInfoPrefix()
218218
info("Du hast die Warteschlange umgangen und wirst nun mit dem Event Server verbunden...")
219219
}
220-
val status = surfCoreApi.sendPlayerAwaiting(player.surfPlayer, server)
220+
val status = SurfCoreApi.sendPlayerAwaiting(player.surfPlayer, server)
221221

222222
if (status.isSuccessful()) {
223223
player.sendText {
@@ -264,15 +264,15 @@ object SurfNpcHook {
264264
}
265265

266266

267-
surfCoreApi.getServerByName(lobbyConfig.survivalServerName)
267+
SurfCoreApi.getServerByName(lobbyConfig.survivalServerName)
268268
?.let { server ->
269269
plugin.launch {
270270
if (player.hasPermission(PermissionRegistry.QUEUE_BYPASS)) {
271271
player.sendText {
272272
appendInfoPrefix()
273273
info("Du hast die Warteschlange umgangen und wirst nun mit dem Survival Server verbunden...")
274274
}
275-
val status = surfCoreApi.sendPlayerAwaiting(player.surfPlayer, server)
275+
val status = SurfCoreApi.sendPlayerAwaiting(player.surfPlayer, server)
276276

277277
if (status.isSuccessful()) {
278278
player.sendText {
@@ -315,7 +315,7 @@ object SurfNpcHook {
315315
fun startSyncTask() {
316316
syncTask = Bukkit.getAsyncScheduler().runAtFixedRate(plugin, {
317317
val server =
318-
surfCoreApi.getServerByName(lobbyConfig.eventServerName) ?: return@runAtFixedRate
318+
SurfCoreApi.getServerByName(lobbyConfig.eventServerName) ?: return@runAtFixedRate
319319

320320
if (eventServerDisplayName != server.displayName) {
321321
eventServerDisplayName = server.displayName

0 commit comments

Comments
 (0)