Merge remote-tracking branch 'origin/master'

MystoriaStudios · Nov 2, 2023 · 163253c · 163253c
2 parents 934e50f + 927ff7e
commit 163253c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/independent/api/src/main/kotlin/net/revive/framework/flavor/Flavor.kt b/independent/api/src/main/kotlin/net/revive/framework/flavor/Flavor.kt
@@ -1,5 +1,6 @@
 package net.revive.framework.flavor
 
+import net.revive.framework.Framework
 import net.revive.framework.flavor.annotation.Inject
 import net.revive.framework.flavor.binder.FlavorBinderContainer
 import net.revive.framework.flavor.mappings.AnnotationMappings
@@ -271,6 +272,10 @@ class Flavor(
             }
         }
 
+        Framework.use {
+            it.log("Flavor Binder", type.simpleName)
+        }
+
         return bindersOfType.firstOrNull()?.instance
             ?: type.kotlin.objectInstance ?: type.newInstance() ?: println(
                 "Did not find any binder for type ${type.simpleName} that satisfies $annotations"

diff --git a/mc-commons/src/main/kotlin/net/revive/framework/grpc/FrameworkGRPCClient.kt b/mc-commons/src/main/kotlin/net/revive/framework/grpc/FrameworkGRPCClient.kt
@@ -13,7 +13,6 @@ object FrameworkGRPCClient {
     @Inject
     lateinit var minecraftPlatform: IMinecraftPlatform
 
-    @Configure
     fun configure()
     {
         val client = ManagedChannelBuilder

diff --git a/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt b/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt
@@ -21,6 +21,7 @@ import net.revive.framework.controller.FrameworkObjectControllerCache
 import net.revive.framework.disguise.FrameworkDisguiseHandler
 import net.revive.framework.disguise.IDisguiseHandler
 import net.revive.framework.flavor.FlavorBinder
+import net.revive.framework.grpc.FrameworkGRPCClient
 import net.revive.framework.grpc.health.PodHeartbeatThread
 import net.revive.framework.item.FrameworkItemStack
 import net.revive.framework.item.IItemStackProvider
@@ -111,6 +112,7 @@ class PaperFrameworkPlugin : ExtendedKotlinPlugin() {
             framework.flavor.bind<IVisibilityHandler>() to FrameworkVisiblityHandler()
         }
 
+        FrameworkGRPCClient.configure()
 
         Tasks.asyncTimer(2L, 2L) {
             PaperMinecraftPlatform.getOnlinePlayers().forEach {