fix(shulker-server-agent): use new agones package

BridgeSplash · Nov 13, 2023 · 1adac9b · 1adac9b
1 parent e700916
commit 1adac9b
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 13 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/...google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.main.iml b/...google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.main.iml
diff --git a/...google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml b/...google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml
diff --git a/.../modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml b/.../modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
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
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
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
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
diff --git a/.../shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt b/.../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
@@ -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/...ulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/ShulkerServerAgentCommon.kt b/...ulker-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