Pathing

Polyfrost · Mar 15, 2022 · 7c27802 · 7c27802
1 parent 4c049a5
commit 7c27802
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/main/kotlin/cc/woverflow/crashpatch/CrashPatch.kt b/src/main/kotlin/cc/woverflow/crashpatch/CrashPatch.kt
@@ -9,6 +9,7 @@ import com.google.gson.stream.MalformedJsonException
 import gg.essential.api.EssentialAPI
 import gg.essential.api.utils.Multithreading
 import gg.essential.universal.ChatColor
+import gg.essential.universal.UDesktop
 import net.minecraft.launchwrapper.Launch
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
@@ -53,6 +54,14 @@ object CrashPatch {
         }
         return@let false
     } ?: false }
+    val gameDir: File by lazy(LazyThreadSafetyMode.PUBLICATION) {
+        try {
+            if (Launch.minecraftHome.parentFile?.name == (if (UDesktop.isMac) "minecraft" else ".minecraft")) Launch.minecraftHome.parentFile else Launch.minecraftHome
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Launch.minecraftHome
+        }
+    }
 
     @Mod.EventHandler
     fun onPreInit(e: FMLPreInitializationEvent) {

diff --git a/src/main/kotlin/cc/woverflow/crashpatch/gui/GuiCrashMenu.kt b/src/main/kotlin/cc/woverflow/crashpatch/gui/GuiCrashMenu.kt
@@ -25,7 +25,9 @@ import gg.essential.universal.UDesktop
 import gg.essential.vigilance.gui.VigilancePalette
 import gg.essential.vigilance.utils.onLeftClick
 import net.minecraft.crash.CrashReport
+import net.minecraft.launchwrapper.Launch
 import java.awt.Color
+import java.io.File
 import java.io.IOException
 
 class GuiCrashMenu @JvmOverloads constructor(val report: CrashReport, private val init: Boolean = false) : WindowScreen(version = ElementaVersion.V1) {
@@ -129,7 +131,7 @@ class GuiCrashMenu @JvmOverloads constructor(val report: CrashReport, private va
                     textScale = 3.pixels()
                 } childOf scrollableSolutions
                 for (solution in list.value) {
-                    UIWrappedText(solution, centered = true) constrain {
+                    UIWrappedText(solution.replace("%gameroot%", CrashPatch.gameDir.absolutePath.removeSuffix(File.separator)).replace("%profileroot%", Launch.minecraftHome.absolutePath.removeSuffix(File.separator)), centered = true) constrain {
                         x = 0.pixels()
                         y = SiblingConstraint(4f)
                         width = 100.percent()

diff --git a/src/main/kotlin/cc/woverflow/crashpatch/gui/GuiServerDisconnectMenu.kt b/src/main/kotlin/cc/woverflow/crashpatch/gui/GuiServerDisconnectMenu.kt
@@ -20,8 +20,10 @@ import gg.essential.universal.ChatColor
 import gg.essential.universal.UDesktop
 import gg.essential.vigilance.gui.VigilancePalette
 import gg.essential.vigilance.utils.onLeftClick
+import net.minecraft.launchwrapper.Launch
 import net.minecraft.util.IChatComponent
 import java.awt.Color
+import java.io.File
 import java.io.IOException
 
 class GuiServerDisconnectMenu(private val component: IChatComponent, reason: String) : WindowScreen(version = ElementaVersion.V1) {
@@ -115,7 +117,7 @@ class GuiServerDisconnectMenu(private val component: IChatComponent, reason: Str
                     textScale = 3.pixels()
                 } childOf scrollableSolutions
                 for (solution in list.value) {
-                    UIWrappedText(solution, centered = true) constrain {
+                    UIWrappedText(solution.replace("%gameroot%", CrashPatch.gameDir.absolutePath.removeSuffix(File.separator)).replace("%profileroot%", Launch.minecraftHome.absolutePath.removeSuffix(File.separator)), centered = true) constrain {
                         x = 0.pixels()
                         y = SiblingConstraint(4f)
                         width = 100.percent()