tmp (modmenu still doesn't work)

ChatTriggers · Dec 14, 2023 · 4684537 · 4684537
1 parent ca40e45
commit 4684537
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 29 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -57,22 +57,16 @@ dependencies {
     configurations.modApi { exclude("gg.essential", "universalcraft-1.18.1-fabric") }
 
     include(modImplementation("gg.essential:vigilance-1.18.1-fabric:295")!!)
-    if (mcVersion == "1.20.4-fabric") {
-        include(modImplementation("gg.essential:universalcraft-1.20.3-fabric:319+feature-1.20.3-fabric")!!)
-    } else {
-        include(modImplementation("gg.essential:universalcraft-$platform:316")!!)
-    }
+    val ucArtifact = if (mcVersion == "1.19.4-fabric") mcVersion else "1.20.3-fabric"
+    include(modImplementation("gg.essential:universalcraft-$ucArtifact:320")!!)
     include(modImplementation("gg.essential:elementa-1.18.1-fabric:610")!!)
 
-    let {
-        val modMenuVersion = when (mcVersion) {
-            // TODO: ModMenu for 1.20.4
-            "1.20.4-fabric" -> return@let
-            "1.19.4-fabric" -> "6.3.1"
-            else -> throw Exception("Minecraft version $mcVersion is not supported")
-        }
-        modApi("com.terraformersmc:modmenu:$modMenuVersion")
+    val modMenuVersion = when (mcVersion) {
+        "1.20.4-fabric" -> "9.0.0-pre.1"
+        "1.19.4-fabric" -> "6.3.1"
+        else -> throw Exception("Minecraft version $mcVersion is not supported")
     }
+    modApi("com.terraformersmc:modmenu:$modMenuVersion")
 
 
     modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.1.2")

diff --git a/src/main/kotlin/com/chattriggers/ctjs/internal/compat/ModMenuEntry.kt b/src/main/kotlin/com/chattriggers/ctjs/internal/compat/ModMenuEntry.kt
@@ -1,15 +1,13 @@
 package com.chattriggers.ctjs.internal.compat
 
-//#if MC<12004
-//$$ import com.chattriggers.ctjs.api.Config
-//$$ import com.terraformersmc.modmenu.api.ConfigScreenFactory
-//$$ import com.terraformersmc.modmenu.api.ModMenuApi
-//$$
-//$$ internal class ModMenuEntry : ModMenuApi {
-//$$     override fun getModConfigScreenFactory(): ConfigScreenFactory<*> {
-//$$         return ConfigScreenFactory {
-//$$             Config.gui()
-//$$         }
-//$$     }
-//$$ }
-//#endif
+import com.chattriggers.ctjs.api.Config
+import com.terraformersmc.modmenu.api.ConfigScreenFactory
+import com.terraformersmc.modmenu.api.ModMenuApi
+
+internal class ModMenuEntry : ModMenuApi {
+    override fun getModConfigScreenFactory(): ConfigScreenFactory<*> {
+        return ConfigScreenFactory {
+            Config.gui()
+        }
+    }
+}
diff --git a/src/main/kotlin/com/chattriggers/ctjs/internal/listeners/ClientListener.kt b/src/main/kotlin/com/chattriggers/ctjs/internal/listeners/ClientListener.kt
@@ -67,15 +67,15 @@ object ClientListener : Initializer {
             }
 
             //#if MC>=12004
-            if (World.toMC()?.tickManager?.shouldTick() == true) {
+            if (World.isLoaded() && World.toMC()?.tickManager?.shouldTick() == true) {
+            //#else
+            //$$ if (World.isLoaded()) {
             //#endif
                 TriggerType.TICK.triggerAll(ticksPassed)
                 ticksPassed++
 
                 Scoreboard.resetCache()
-            //#if MC>=12004
             }
-            //#endif
         }
 
         ClientSendMessageEvents.ALLOW_CHAT.register { message ->