better file resolving

Author: DeDiamondPro

src/main/kotlin/dev/dediamondpro/resourcify/config/Config.kt

@@ -18,11 +18,10 @@
 package dev.dediamondpro.resourcify.config
 
 import dev.dediamondpro.resourcify.Constants
+import dev.dediamondpro.resourcify.platform.Platform
 import dev.dediamondpro.resourcify.services.modrinth.ModrinthService
 import dev.dediamondpro.resourcify.util.fromJson
 import dev.dediamondpro.resourcify.util.toJson
-import net.minecraft.client.Minecraft
-import java.io.File
 
 class Config {
     var defaultService: String = ModrinthService.getName()
@@ -36,7 +35,7 @@ class Config {
     var worldsEnabled: Boolean = true
 
     companion object {
-        private val configFile = File("config/resourcify.json", Minecraft.getInstance().gameDirectory.path)
+        private val configFile = Platform.getFileInGameDir("config/resourcify.json")
         val instance: Config
 
         init {

src/main/kotlin/dev/dediamondpro/resourcify/gui/world/DownloadWorldTab.kt

@@ -1,13 +1,13 @@
 package dev.dediamondpro.resourcify.gui.world
 
 import dev.dediamondpro.resourcify.gui.browsepage.BrowseScreen
+import dev.dediamondpro.resourcify.platform.Platform
 import dev.dediamondpro.resourcify.services.ProjectType
 import gg.essential.universal.UScreen
 import net.minecraft.client.gui.components.AbstractWidget
 import net.minecraft.client.gui.components.tabs.Tab
 import net.minecraft.client.gui.navigation.ScreenRectangle
 import net.minecraft.network.chat.Component
-import java.io.File
 import java.util.function.Consumer
 
 class DownloadWorldTab : Tab {
@@ -22,6 +22,6 @@ class DownloadWorldTab : Tab {
     }
 
     fun onClick() {
-        UScreen.displayScreen(BrowseScreen(ProjectType.WORLD, File("./saves")))
+        UScreen.displayScreen(BrowseScreen(ProjectType.WORLD, Platform.getFileInGameDir("saves")))
     }
 }

src/main/kotlin/dev/dediamondpro/resourcify/platform/Platform.kt

@@ -18,6 +18,7 @@
 package dev.dediamondpro.resourcify.platform
 
 import net.minecraft.SharedConstants
+import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.resources.language.I18n
 import net.minecraft.network.chat.contents.TranslatableContents
@@ -67,4 +68,8 @@ object Platform {
         return resources.content
         //?}
     }
+
+    fun getFileInGameDir(name: String): File {
+        return File(Minecraft.getInstance().gameDirectory, name)
+    }
 }

src/main/kotlin/dev/dediamondpro/resourcify/services/ProjectType.kt

@@ -19,6 +19,7 @@ package dev.dediamondpro.resourcify.services
 
 import dev.dediamondpro.resourcify.config.Config
 import dev.dediamondpro.resourcify.mixins.PackScreenAccessor
+import dev.dediamondpro.resourcify.platform.Platform
 import net.minecraft.client.gui.screens.Screen
 import java.io.File
 
@@ -64,9 +65,9 @@ enum class ProjectType(
         return when(this) {
             RESOURCE_PACK -> (screen as PackScreenAccessor).directory.toFile()
             DATA_PACK -> (screen as PackScreenAccessor).directory.toFile()
-            IRIS_SHADER -> File("./shaderpacks")
-            OPTIFINE_SHADER -> File("./shaderpacks")
-            WORLD -> File("./saves")
+            IRIS_SHADER -> Platform.getFileInGameDir("shaderpacks")
+            OPTIFINE_SHADER -> Platform.getFileInGameDir("shaderpacks")
+            WORLD -> Platform.getFileInGameDir("saves")
             else -> error("Unknown project type: $this")
         }
     }
@@ -80,10 +81,10 @@ enum class ProjectType(
         return when (this) {
             currentType -> currentFolder
             // Get folder on best-effort basis
-            RESOURCE_PACK -> File("./resourcepacks")
-            IRIS_SHADER -> File("./shaderpacks")
-            OPTIFINE_SHADER -> File("./shaderpacks")
-            WORLD -> File("./saves")
+            RESOURCE_PACK -> Platform.getFileInGameDir("resourcepacks")
+            IRIS_SHADER -> Platform.getFileInGameDir("shaderpacks")
+            OPTIFINE_SHADER -> Platform.getFileInGameDir("shaderpacks")
+            WORLD -> Platform.getFileInGameDir("saves")
             else -> null
         }
     }

src/main/kotlin/dev/dediamondpro/resourcify/util/DownloadManager.kt

@@ -18,6 +18,7 @@
 package dev.dediamondpro.resourcify.util
 
 import dev.dediamondpro.resourcify.Constants
+import dev.dediamondpro.resourcify.platform.Platform
 import java.io.File
 import java.net.URI
 import java.nio.file.Files
@@ -27,7 +28,7 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 
 object DownloadManager {
-    private val tempFolder = File("./resourcify-temp")
+    private val tempFolder = Platform.getFileInGameDir("resourcify-temp")
 
     @get:Synchronized
     private val queuedDownloads = mutableMapOf<URI, QueuedDownload>()