Fix build and address deprecation warnings

DenWav · DenWav · commit 4e860a8ec2ab · 2023-01-28T20:10:47.000-06:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,6 @@
 
 import org.cadixdev.gradle.licenser.header.HeaderStyle
 import org.gradle.internal.jvm.Jvm
-import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.gradle.ext.settings
 import org.jetbrains.gradle.ext.taskTriggers
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -22,7 +21,7 @@ plugins {
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.12.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
@@ -247,22 +246,6 @@ tasks.test {
     jvmArgs(
         "-Dsun.io.useCanonCaches=false",
         "-Dsun.io.useCanonPrefixCache=false",
-        "--add-opens", "java.base/java.io=ALL-UNNAMED",
-        "--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED",
-        "--add-opens", "java.base/java.lang.ref=ALL-UNNAMED",
-        "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
-        "--add-opens", "java.base/java.lang=ALL-UNNAMED",
-        "--add-opens", "java.base/java.util.concurrent.atomic=ALL-UNNAMED",
-        "--add-opens", "java.base/java.util.concurrent.locks=ALL-UNNAMED",
-        "--add-opens", "java.base/java.util.concurrent=ALL-UNNAMED",
-        "--add-opens", "java.base/sun.nio.fs=ALL-UNNAMED",
-        "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
-        "--add-opens", "java.desktop/java.awt=ALL-UNNAMED",
-        "--add-opens", "java.desktop/javax.swing.plaf.basic=ALL-UNNAMED",
-        "--add-opens", "java.desktop/javax.swing=ALL-UNNAMED",
-        "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED",
-        "--add-opens", "java.desktop/sun.font=ALL-UNNAMED",
-        "--add-opens", "java.desktop/sun.swing=ALL-UNNAMED",
     )
 }
 
@@ -379,22 +362,4 @@ tasks.runIde {
 tasks.buildSearchableOptions {
     // not working atm
     enabled = false
-    // https://youtrack.jetbrains.com/issue/IDEA-210683
-    jvmArgs(
-        "--illegal-access=deny",
-        "--add-exports=java.base/jdk.internal.vm=ALL-UNNAMED",
-        "--add-opens=java.base/java.lang=ALL-UNNAMED",
-        "--add-opens=java.base/java.util=ALL-UNNAMED",
-        "--add-opens=java.desktop/java.awt.event=ALL-UNNAMED",
-        "--add-opens=java.desktop/java.awt=ALL-UNNAMED",
-        "--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED",
-        "--add-opens=java.desktop/javax.swing=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.font=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.swing=ALL-UNNAMED"
-    )
-
-    if (OperatingSystem.current().isMacOsX) {
-        jvmArgs("--add-opens=java.desktop/com.apple.eawt.event=ALL-UNNAMED")
-    }
 }
diff --git a/src/main/kotlin/creator/PlatformVersion.kt b/src/main/kotlin/creator/PlatformVersion.kt
@@ -29,7 +29,7 @@ import kotlin.reflect.KClass
 private const val CLOUDFLARE_BASE_URL = "https://minecraftdev.org/versions/"
 private const val GITHUB_BASE_URL = "https://raw.githubusercontent.com/minecraft-dev/minecraftdev.org/master/versions/"
 
-val PLATFORM_VERSION_LOGGER = Logger.getInstance("MDev.PlatformVersion")
+val PLATFORM_VERSION_LOGGER = Logger.getInstance("com.demonwav.mcdev.creator.PlatformVersion")
 
 suspend fun getVersionSelector(type: PlatformType): PlatformVersion {
     val versionJson = type.versionJson ?: throw UnsupportedOperationException("Incorrect platform type: $type")
diff --git a/src/main/kotlin/platform/architectury/version/ArchitecturyVersion.kt b/src/main/kotlin/platform/architectury/version/ArchitecturyVersion.kt
@@ -45,36 +45,41 @@ class ArchitecturyVersion private constructor(
 
     companion object {
 
-        suspend fun downloadData(): ArchitecturyVersion {
-            val url = "https://api.modrinth.com/v2/project/architectury-api/version"
-            val manager = FuelManager()
-            manager.proxy = selectProxy(url)
+        suspend fun downloadData(): ArchitecturyVersion? {
+            try {
+                val url = "https://api.modrinth.com/v2/project/architectury-api/version"
+                val manager = FuelManager()
+                manager.proxy = selectProxy(url)
 
-            val response = manager.get(url)
-                .header("User-Agent", PluginUtil.useragent)
-                .suspendable()
-                .awaitString()
+                val response = manager.get(url)
+                    .header("User-Agent", PluginUtil.useragent)
+                    .suspendable()
+                    .awaitString()
 
-            val data = Gson().fromJson<List<ModrinthVersionApi>>(response)
+                val data = Gson().fromJson<List<ModrinthVersionApi>>(response)
 
-            val apiVersionMap = HashMap<SemanticVersion, HashSet<SemanticVersion>>()
+                val apiVersionMap = HashMap<SemanticVersion, HashSet<SemanticVersion>>()
 
-            for (version in data) {
-                val apiVersion = SemanticVersion.parse(version.versionNumber.substringBeforeLast('+'))
+                for (version in data) {
+                    val apiVersion = SemanticVersion.parse(version.versionNumber.substringBeforeLast('+'))
 
-                for (gameVersion in version.gameVersions) {
-                    val parsed = SemanticVersion.parse(gameVersion)
-                    val set = apiVersionMap.computeIfAbsent(parsed) { HashSet() }
-                    set += apiVersion
+                    for (gameVersion in version.gameVersions) {
+                        val parsed = SemanticVersion.parse(gameVersion)
+                        val set = apiVersionMap.computeIfAbsent(parsed) { HashSet() }
+                        set += apiVersion
+                    }
                 }
-            }
 
-            val apiVersionMapList = HashMap<SemanticVersion, List<SemanticVersion>>()
-            for ((mcVersion, archList) in apiVersionMap.entries) {
-                apiVersionMapList[mcVersion] = archList.sortedDescending()
-            }
+                val apiVersionMapList = HashMap<SemanticVersion, List<SemanticVersion>>()
+                for ((mcVersion, archList) in apiVersionMap.entries) {
+                    apiVersionMapList[mcVersion] = archList.sortedDescending()
+                }
 
-            return ArchitecturyVersion(apiVersionMapList)
+                return ArchitecturyVersion(apiVersionMapList)
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+            return null
         }
     }
 }
diff --git a/src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt b/src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt
@@ -180,7 +180,9 @@ abstract class AbstractLoadInjectionPoint(private val store: Boolean) : Injectio
         override fun visitForeachStatement(statement: PsiForeachStatement) {
             checkImplicitLocalsPre(statement)
             if (store) {
-                addLocalUsage(statement.iterationParameter, statement.iterationParameter.name)
+                (statement.iterationDeclaration as? PsiParameter)?.let { param ->
+                    addLocalUsage(param, param.name)
+                }
             }
             super.visitForeachStatement(statement)
             checkImplicitLocalsPost(statement)
diff --git a/src/main/kotlin/platform/mixin/util/LocalVariables.kt b/src/main/kotlin/platform/mixin/util/LocalVariables.kt
@@ -55,6 +55,7 @@ import com.intellij.psi.PsiForeachStatement
 import com.intellij.psi.PsiLambdaExpression
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
+import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiStatement
 import com.intellij.psi.PsiType
 import com.intellij.psi.PsiVariable
@@ -299,7 +300,10 @@ object LocalVariables {
             // longs and doubles take two slots
             is PsiVariable -> if (element.isDoubleSlot) 2 else 1
             // arrays have copy of array, length and index variables, iterables have the iterator variable
-            is PsiForeachStatement -> if (element.iterationParameter.type is PsiArrayType) 3 else 1
+            is PsiForeachStatement -> {
+                val param = element.iterationDeclaration as? PsiParameter
+                if (param?.type is PsiArrayType) 3 else 1
+            }
             else -> 0
         }
     }
