refactor: rename all variable names that override to end with overrid…

…e for consistency
FreshKernel · Jun 23, 2024 · e124556 · e124556
1 parent d78fe75
commit e124556
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/admin/src/main/kotlin/gui/tabs/ModsConverterTab.kt b/admin/src/main/kotlin/gui/tabs/ModsConverterTab.kt
@@ -188,7 +188,7 @@ private class ConversionInputDialog(
             ),
             JButton("Continue").onClick {
                 convertMods(
-                    overrideCurseForgeApiKey = null,
+                    curseForgeApiKeyOverride = null,
                     isCurseForgeForStudiosTermsOfServiceAccepted = false,
                 )
             },
@@ -198,7 +198,7 @@ private class ConversionInputDialog(
     }
 
     private fun convertMods(
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
         isCurseForgeForStudiosTermsOfServiceAccepted: Boolean,
     ) {
         coroutineScope.launch {
@@ -208,7 +208,7 @@ private class ConversionInputDialog(
                     launcherInstanceDirectoryPath = launcherInstanceDirectoryTextField.text,
                     convertMode = modsConvertModeComboBox.getSelectedItemOrThrow(),
                     prettyFormat = prettyFormatCheckBox.isSelected,
-                    overrideCurseForgeApiKey = overrideCurseForgeApiKey,
+                    curseForgeApiKeyOverride = curseForgeApiKeyOverride,
                     isCurseForgeForStudiosTermsOfServiceAccepted = isCurseForgeForStudiosTermsOfServiceAccepted,
                 )
             when (result) {
@@ -330,7 +330,7 @@ private class ConversionInputDialog(
                         return@launch
                     }
                     convertMods(
-                        overrideCurseForgeApiKey = userCurseForgeApiKey,
+                        curseForgeApiKeyOverride = userCurseForgeApiKey,
                         isCurseForgeForStudiosTermsOfServiceAccepted = true,
                     )
                 }

diff --git a/admin/src/main/kotlin/launchers/LauncherDataSource.kt b/admin/src/main/kotlin/launchers/LauncherDataSource.kt
@@ -34,6 +34,6 @@ interface LauncherDataSource {
      * */
     suspend fun getMods(
         launcherInstanceDirectory: File,
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
     ): Result<List<Mod>>
 }
diff --git a/admin/src/main/kotlin/launchers/atLauncher/ATLauncherDataSource.kt b/admin/src/main/kotlin/launchers/atLauncher/ATLauncherDataSource.kt
@@ -65,7 +65,7 @@ class ATLauncherDataSource : LauncherDataSource {
 
     override suspend fun getMods(
         launcherInstanceDirectory: File,
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
     ): Result<List<Mod>> =
         try {
             val instance = getInstance(launcherInstanceDirectory = launcherInstanceDirectory).getOrThrow()
@@ -92,7 +92,7 @@ class ATLauncherDataSource : LauncherDataSource {
                                     .getModFile(
                                         modId = atLauncherMod.curseForgeProjectId.toString(),
                                         fileId = atLauncherMod.curseForgeFileId.toString(),
-                                        overrideApiKey = overrideCurseForgeApiKey,
+                                        overrideApiKey = curseForgeApiKeyOverride,
                                     ).getOrThrow()
                             downloadUrl = curseForgeModFile.data.downloadUrl
                             fileIntegrityInfo = curseForgeModFile.data.getFileIntegrityInfo()

diff --git a/admin/src/main/kotlin/launchers/modrinth/ModrinthLauncherDataSource.kt b/admin/src/main/kotlin/launchers/modrinth/ModrinthLauncherDataSource.kt
@@ -35,7 +35,7 @@ class ModrinthLauncherDataSource : LauncherDataSource {
 
     override suspend fun getMods(
         launcherInstanceDirectory: File,
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
     ): Result<List<Mod>> =
         try {
             val instance = getInstance(launcherInstanceDirectory = launcherInstanceDirectory).getOrThrow()

diff --git a/admin/src/main/kotlin/launchers/prismLauncher/PrismLauncherDataSource.kt b/admin/src/main/kotlin/launchers/prismLauncher/PrismLauncherDataSource.kt
@@ -79,7 +79,7 @@ class PrismLauncherDataSource : LauncherDataSource {
 
     override suspend fun getMods(
         launcherInstanceDirectory: File,
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
     ): Result<List<Mod>> =
         try {
             // TODO: use File.exist(), check of File.exist() might need to be shared to avoid duplications
@@ -108,7 +108,7 @@ class PrismLauncherDataSource : LauncherDataSource {
                                     modId =
                                         prismLauncherModMetadata.update.curseForge.projectId
                                             .toString(),
-                                    overrideApiKey = overrideCurseForgeApiKey,
+                                    overrideApiKey = curseForgeApiKeyOverride,
                                 ).getOrThrow()
                                 .data
                     }

diff --git a/admin/src/main/kotlin/services/modsConverter/ModsConverter.kt b/admin/src/main/kotlin/services/modsConverter/ModsConverter.kt
@@ -13,7 +13,7 @@ interface ModsConverter {
         launcherInstanceDirectoryPath: String,
         convertMode: ModsConvertMode,
         prettyFormat: Boolean,
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
         isCurseForgeForStudiosTermsOfServiceAccepted: Boolean,
     ): ModsConvertResult
 }
diff --git a/admin/src/main/kotlin/services/modsConverter/ModsConverterImpl.kt b/admin/src/main/kotlin/services/modsConverter/ModsConverterImpl.kt
@@ -16,7 +16,7 @@ class ModsConverterImpl : ModsConverter {
         launcherInstanceDirectoryPath: String,
         convertMode: ModsConvertMode,
         prettyFormat: Boolean,
-        overrideCurseForgeApiKey: String?,
+        curseForgeApiKeyOverride: String?,
         isCurseForgeForStudiosTermsOfServiceAccepted: Boolean,
     ): ModsConvertResult {
         return try {
@@ -64,7 +64,7 @@ class ModsConverterImpl : ModsConverter {
                 launcherDataSource
                     .getMods(
                         launcherInstanceDirectory = launcherInstanceDirectory,
-                        overrideCurseForgeApiKey = overrideCurseForgeApiKey?.ifBlank { null },
+                        curseForgeApiKeyOverride = curseForgeApiKeyOverride?.ifBlank { null },
                     ).getOrElse {
                         return ModsConvertResult.Failure(
                             error =