diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 12639098..38e6ccbe 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.main.iml b/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.main.iml
index 7cee5615..a545be7b 100644
--- a/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.main.iml
+++ b/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.main.iml
@@ -14,11 +14,11 @@
+
-
diff --git a/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml b/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml
index 6635d934..b07df0cf 100644
--- a/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml
+++ b/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml
@@ -9,10 +9,10 @@
+
-
diff --git a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
index 39cdac79..a2604d53 100644
--- a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
@@ -163,6 +163,7 @@
+
@@ -172,7 +173,6 @@
-
diff --git a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml
index f4ec7cf8..e298059e 100644
--- a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml
@@ -134,6 +134,7 @@
+
@@ -141,7 +142,6 @@
-
diff --git a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml
index d81c6405..879ee8ad 100644
--- a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml
@@ -157,6 +157,7 @@
+
@@ -164,7 +165,6 @@
-
diff --git a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml
index b30612e8..ceaa37fb 100644
--- a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml
+++ b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml
@@ -65,6 +65,7 @@
+
@@ -75,7 +76,6 @@
-
diff --git a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml
index 770c0f65..05e037de 100644
--- a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml
+++ b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml
@@ -103,6 +103,7 @@
+
@@ -113,7 +114,6 @@
-
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt
index 7d035fae..9136dc3c 100644
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt
+++ b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt
@@ -1,7 +1,7 @@
package io.shulkermc.proxyagent
-import dev.agones.AgonesSDK
-import dev.agones.AgonesSDKImpl
+import com.agones.dev.sdk.AgonesSDK
+import com.agones.dev.sdk.AgonesSDKImpl
import io.shulkermc.proxyagent.adapters.cache.CacheAdapter
import io.shulkermc.proxyagent.adapters.cache.RedisCacheAdapter
import io.shulkermc.proxyagent.adapters.filesystem.FileSystemAdapter
diff --git a/packages/shulker-server-agent/build.gradle.kts b/packages/shulker-server-agent/build.gradle.kts
index ca6ea973..76c65ed1 100644
--- a/packages/shulker-server-agent/build.gradle.kts
+++ b/packages/shulker-server-agent/build.gradle.kts
@@ -18,3 +18,7 @@ tasks.named("processPaperResources", ProcessResources::class.java) {
inputs.property("version", project.version)
expand("version" to project.version)
}
+
+tasks.withType(ShadowJar::class.java) {
+ relocate("com.google.protobuf", "shulker.protobuf")
+}
diff --git a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/ShulkerServerAgentCommon.kt b/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/ShulkerServerAgentCommon.kt
index 576e82cf..4ee7e948 100644
--- a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/ShulkerServerAgentCommon.kt
+++ b/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/ShulkerServerAgentCommon.kt
@@ -1,7 +1,7 @@
package io.shulkermc.serveragent
-import dev.agones.AgonesSDK
-import dev.agones.AgonesSDKImpl
+import com.agones.dev.sdk.AgonesSDK
+import com.agones.dev.sdk.AgonesSDKImpl
import io.shulkermc.serveragent.api.ShulkerServerAPI
import io.shulkermc.serveragent.api.ShulkerServerAPIImpl
import io.shulkermc.serveragent.tasks.HealthcheckTask
@@ -14,8 +14,6 @@ class ShulkerServerAgentCommon(val serverInterface: ServerInterface, private val
companion object {
private const val SUMMON_LABEL_NAME = "shulkermc.io/summoned"
private const val SUMMON_TIMEOUT_MINUTES = 5L
-
- private const val HEALTHCHECK_DELAY_SECONDS = 10L
}
lateinit var agonesGateway: AgonesSDK