PC-1070 Tempfix for server initialization issues

GameModsBR · Dec 21, 2023 · a50f10b · a50f10b
1 parent d9c86d2
commit a50f10b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -8,5 +8,5 @@ val inlineLoggerVersion: String by rootProject
 
 dependencies {
     api(project(":api"))
-    compileOnly("com.michael-bull.kotlin-inline-logger:kotlin-inline-logger:$inlineLoggerVersion")
+    implementation("com.michael-bull.kotlin-inline-logger:kotlin-inline-logger:$inlineLoggerVersion")
 }
diff --git a/...ce/sql/src/main/kotlin/br/com/gamemods/minecity/persistence/sql/MineCitySqlPersistence.kt b/...ce/sql/src/main/kotlin/br/com/gamemods/minecity/persistence/sql/MineCitySqlPersistence.kt
@@ -59,6 +59,6 @@ class MineCitySqlPersistence(
                 }
             }
         }
-        if (result.success)
+        TODO()
     }
 }
diff --git a/platform/fabric/build.gradle.kts b/platform/fabric/build.gradle.kts
@@ -42,11 +42,12 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricVersion")
     modImplementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
-    modImplementation(include("net.kyori:adventure-platform-fabric:5.9.0")!!)
+    //modImplementation(include("net.kyori:adventure-platform-fabric:5.9.0")!!)
     // Uncomment the following line to enable the deprecated Fabric API modules.
     // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
 
     // modImplementation("net.fabricmc.fabric-api:fabric-api-deprecated:${project.findProperty("fabric_version")}")
+    implementation(include(project(":api"))!!)
     implementation(include(project(":core"))!!)
     persistenceProject.subprojects.forEach { persistenceImpl ->
         implementation(include(project(persistenceImpl.path))!!)

diff --git a/platform/fabric/src/main/kotlin/br/com/gamemods/minecity/fabric/MineCityFabric.kt b/platform/fabric/src/main/kotlin/br/com/gamemods/minecity/fabric/MineCityFabric.kt
@@ -1,6 +1,5 @@
 package br.com.gamemods.minecity.fabric
 
-import br.com.gamemods.minecity.api.MineCity
 import br.com.gamemods.minecity.api.MineCityPlatform
 import br.com.gamemods.minecity.api.annotation.internal.InternalMineCityApi
 import br.com.gamemods.minecity.api.annotation.side.ServerSideOnly
@@ -25,8 +24,6 @@ import com.github.michaelbull.logging.InlineLogger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asCoroutineDispatcher
 import net.fabricmc.api.ModInitializer
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.world.chunk.WorldChunk
@@ -61,14 +58,15 @@ object MineCityFabric : ModInitializer, MineCityPlatform {
 			worlds = FabricWorldService(this),
 			players = FabricNamedPlayerService(this),
 		)
-		MineCity.instance = core
+		//FIXME
+		/*MineCity.instance = core
 		core.onInitialize()
 		ServerLifecycleEvents.SERVER_STARTING.register(this::handleServerStarting)
 		ServerLifecycleEvents.SERVER_STARTED.register(this::handleServerStarted)
 		ServerLifecycleEvents.SERVER_STOPPING.register(this::handleServerStopping)
 		ServerLifecycleEvents.SERVER_STOPPED.register(this::handleServerStopped)
 		ServerChunkEvents.CHUNK_LOAD.register(this::handleChunkLoad)
-		ServerChunkEvents.CHUNK_UNLOAD.register(this::handleChunkUnload)
+		ServerChunkEvents.CHUNK_UNLOAD.register(this::handleChunkUnload)*/
 	}
 
 	@ServerSideOnly

diff --git a/platform/fabric/src/main/resources/fabric.mod.json b/platform/fabric/src/main/resources/fabric.mod.json
@@ -17,7 +17,7 @@
 	"entrypoints": {
 		"main": [
 			{
-				"value": "br.com.gamemods.minecity.fabric.common.MineCityFabric",
+				"value": "br.com.gamemods.minecity.fabric.MineCityFabric",
 				"adapter": "kotlin"
 			}
 		],
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,6 +59,6 @@ class MineCitySqlPersistence( @@
                     }
                 }
             }
-            if (result.success)
+            TODO()
         }
     }