User: kyle wood Date: 29 Jan 23 02:10 Revision: 4e860a8ec2abd02230c5a2fb57eb824910e1ecad Summary: Fix build and address deprecation warnings TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8264&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 1a7c78f399122fa0e969fffa8cf4449f200e61d1) +++ build.gradle.kts (revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad) @@ -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 @@ 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 @@ 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.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") - } +} -} Index: src/main/kotlin/creator/PlatformVersion.kt =================================================================== --- src/main/kotlin/creator/PlatformVersion.kt (revision 1a7c78f399122fa0e969fffa8cf4449f200e61d1) +++ src/main/kotlin/creator/PlatformVersion.kt (revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad) @@ -29,7 +29,7 @@ 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") Index: src/main/kotlin/platform/architectury/version/ArchitecturyVersion.kt =================================================================== --- src/main/kotlin/platform/architectury/version/ArchitecturyVersion.kt (revision 1a7c78f399122fa0e969fffa8cf4449f200e61d1) +++ src/main/kotlin/platform/architectury/version/ArchitecturyVersion.kt (revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad) @@ -45,36 +45,41 @@ companion object { - suspend fun downloadData(): ArchitecturyVersion { + suspend fun downloadData(): ArchitecturyVersion? { + try { - val url = "https://api.modrinth.com/v2/project/architectury-api/version" - val manager = FuelManager() - manager.proxy = selectProxy(url) + 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>(response) + val data = Gson().fromJson>(response) - val apiVersionMap = HashMap>() + val apiVersionMap = HashMap>() - 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>() - for ((mcVersion, archList) in apiVersionMap.entries) { - apiVersionMapList[mcVersion] = archList.sortedDescending() - } + val apiVersionMapList = HashMap>() + for ((mcVersion, archList) in apiVersionMap.entries) { + apiVersionMapList[mcVersion] = archList.sortedDescending() + } - return ArchitecturyVersion(apiVersionMapList) + return ArchitecturyVersion(apiVersionMapList) + } catch (e: IOException) { + e.printStackTrace() - } + } + return null - } -} + } + } +} Index: src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt =================================================================== --- src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt (revision 1a7c78f399122fa0e969fffa8cf4449f200e61d1) +++ src/main/kotlin/platform/mixin/handlers/injectionPoint/LoadInjectionPoint.kt (revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad) @@ -180,8 +180,10 @@ 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) } Index: src/main/kotlin/platform/mixin/util/LocalVariables.kt =================================================================== --- src/main/kotlin/platform/mixin/util/LocalVariables.kt (revision 1a7c78f399122fa0e969fffa8cf4449f200e61d1) +++ src/main/kotlin/platform/mixin/util/LocalVariables.kt (revision 4e860a8ec2abd02230c5a2fb57eb824910e1ecad) @@ -55,6 +55,7 @@ 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 @@ // 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 } }