Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
javaVersion=25
mcVersion=26.2
group=dev.slne.surf.api
version=3.33.0
version=3.33.1
relocationPrefix=dev.slne.surf.api.libs
snapshot=false
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
package dev.slne.surf.api.paper.server

import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
import dev.slne.surf.api.paper.api.metrics.Metrics
import dev.slne.surf.api.paper.server.impl.scoreboard.SurfScoreboardApiImpl
import dev.slne.surf.api.paper.server.libs.LibLoader
import org.bukkit.plugin.java.JavaPlugin

class PaperMain : SuspendingJavaPlugin() {

lateinit var bstats: Metrics

override suspend fun onLoadAsync() {
LibLoader(classLoader).loadLibs()
bstats = Metrics(this, 29465)
PaperInstance.onLoad()
}

Expand All @@ -17,6 +22,10 @@ class PaperMain : SuspendingJavaPlugin() {
}

override suspend fun onDisableAsync() {
if (::bstats.isInitialized) {
bstats.shutdown()
}

SurfScoreboardApiImpl.INSTANCE.onDisable()
PaperInstance.onDisable()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.velocitypowered.api.plugin.PluginContainer
import com.velocitypowered.api.plugin.annotation.DataDirectory
import com.velocitypowered.api.proxy.ProxyServer
import dev.slne.surf.api.core.server.CoreInstance
import dev.slne.surf.api.velocity.api.metrics.Metrics
import dev.slne.surf.api.velocity.server.generated.BuildConfig
import kotlinx.coroutines.runBlocking
import org.slf4j.Logger
Expand All @@ -30,8 +31,11 @@ class VelocityMain @Inject constructor(
val pluginContainer: PluginContainer,
@param:DataDirectory val dataDirectory: Path,
val executorService: ExecutorService,
private val metricsFactory: Metrics.Factory
) : CoreInstance() {

lateinit var bstats: Metrics

init {
instance = this

Expand All @@ -45,11 +49,16 @@ class VelocityMain @Inject constructor(

@Subscribe
suspend fun onProxyInitialization(unused: ProxyInitializeEvent) {
bstats = metricsFactory.make(this, 29466)
onEnable()
}

@Subscribe
suspend fun onProxyShutdown(unused: ProxyShutdownEvent) {
if (::bstats.isInitialized) {
bstats.shutdown()
}

onDisable()
}

Expand Down
Loading