Skip to content

Commit d1252e5

Browse files
DenWavDenWav
committed
Cleanup some logging
1 parent 0f9a759 commit d1252e5

File tree

12 files changed

+64
-43
lines changed

12 files changed

+64
-43
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ tasks.test {
249249
}
250250
}
251251
systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true")
252+
jvmArgs("--illegal-access=deny")
252253
}
253254

254255
idea {

‎src/main/kotlin/creator/PlatformVersion.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.github.kittinunf.fuel.core.requests.suspendable
1818
import com.github.kittinunf.fuel.coroutines.awaitString
1919
import com.google.gson.Gson
2020
import com.intellij.openapi.diagnostic.Attachment
21-
import com.intellij.openapi.diagnostic.Logger
21+
import com.intellij.openapi.diagnostic.logger
2222
import com.intellij.util.proxy.CommonProxy
2323
import java.io.IOException
2424
import java.net.Proxy
@@ -29,7 +29,7 @@ import kotlin.reflect.KClass
2929
private const val CLOUDFLARE_BASE_URL = "https://minecraftdev.org/versions/"
3030
private const val GITHUB_BASE_URL = "https://raw.githubusercontent.com/minecraft-dev/minecraftdev.org/master/versions/"
3131

32-
val PLATFORM_VERSION_LOGGER = Logger.getInstance("MDev.PlatformVersion")
32+
val PLATFORM_VERSION_LOGGER = logger<PlatformVersion>()
3333

3434
suspend fun getVersionSelector(type: PlatformType): PlatformVersion {
3535
val versionJson = type.versionJson ?: throw UnsupportedOperationException("Incorrect platform type: $type")

‎src/main/kotlin/platform/architectury/creator/ArchitecturyProjectSettingsWizard.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.demonwav.mcdev.util.License
2424
import com.demonwav.mcdev.util.SemanticVersion
2525
import com.demonwav.mcdev.util.asyncIO
2626
import com.demonwav.mcdev.util.modUpdateStep
27-
import com.intellij.openapi.diagnostic.Logger
27+
import com.intellij.openapi.diagnostic.logger
2828
import com.intellij.ui.CollectionComboBoxModel
2929
import com.intellij.ui.EnumComboBoxModel
3030
import java.awt.event.ActionListener
@@ -260,7 +260,7 @@ class ArchitecturyProjectSettingsWizard(private val creator: MinecraftProjectCre
260260
versions = ArchitecturyVersions(
261261
fabricVersionJob.await() ?: return@coroutineScope,
262262
forgeVersionJob.await() ?: return@coroutineScope,
263-
architecturyApiVersionJob.await() ?: return@coroutineScope
263+
architecturyApiVersionJob.await() ?: return@coroutineScope,
264264
)
265265
}
266266

@@ -336,6 +336,6 @@ class ArchitecturyProjectSettingsWizard(private val creator: MinecraftProjectCre
336336
)
337337

338338
companion object {
339-
val LOGGER = Logger.getInstance(ArchitecturyProjectSettingsWizard::class.java)
339+
private val LOGGER = logger<ArchitecturyProjectSettingsWizard>()
340340
}
341341
}

‎src/main/kotlin/platform/architectury/version/ArchitecturyVersion.kt‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import com.github.kittinunf.fuel.core.requests.suspendable
1919
import com.github.kittinunf.fuel.coroutines.awaitString
2020
import com.google.gson.Gson
2121
import com.google.gson.annotations.SerializedName
22+
import com.intellij.openapi.diagnostic.logger
2223
import java.io.IOException
2324

2425
class ArchitecturyVersion private constructor(
@@ -44,37 +45,43 @@ class ArchitecturyVersion private constructor(
4445
)
4546

4647
companion object {
48+
private val LOGGER = logger<ArchitecturyVersion>()
4749

48-
suspend fun downloadData(): ArchitecturyVersion {
49-
val url = "https://api.modrinth.com/v2/project/architectury-api/version"
50-
val manager = FuelManager()
51-
manager.proxy = selectProxy(url)
50+
suspend fun downloadData(): ArchitecturyVersion? {
51+
try {
52+
val url = "https://api.modrinth.com/v2/project/architectury-api/version"
53+
val manager = FuelManager()
54+
manager.proxy = selectProxy(url)
5255

53-
val response = manager.get(url)
54-
.header("User-Agent", PluginUtil.useragent)
55-
.suspendable()
56-
.awaitString()
56+
val response = manager.get(url)
57+
.header("User-Agent", PluginUtil.useragent)
58+
.suspendable()
59+
.awaitString()
5760

58-
val data = Gson().fromJson<List<ModrinthVersionApi>>(response)
61+
val data = Gson().fromJson<List<ModrinthVersionApi>>(response)
5962

60-
val apiVersionMap = HashMap<SemanticVersion, HashSet<SemanticVersion>>()
63+
val apiVersionMap = HashMap<SemanticVersion, HashSet<SemanticVersion>>()
6164

62-
for (version in data) {
63-
val apiVersion = SemanticVersion.parse(version.versionNumber.substringBeforeLast('+'))
65+
for (version in data) {
66+
val apiVersion = SemanticVersion.parse(version.versionNumber.substringBeforeLast('+'))
6467

65-
for (gameVersion in version.gameVersions) {
66-
val parsed = SemanticVersion.parse(gameVersion)
67-
val set = apiVersionMap.computeIfAbsent(parsed) { HashSet() }
68-
set += apiVersion
68+
for (gameVersion in version.gameVersions) {
69+
val parsed = SemanticVersion.parse(gameVersion)
70+
val set = apiVersionMap.computeIfAbsent(parsed) { HashSet() }
71+
set += apiVersion
72+
}
6973
}
70-
}
7174

72-
val apiVersionMapList = HashMap<SemanticVersion, List<SemanticVersion>>()
73-
for ((mcVersion, archList) in apiVersionMap.entries) {
74-
apiVersionMapList[mcVersion] = archList.sortedDescending()
75-
}
75+
val apiVersionMapList = HashMap<SemanticVersion, List<SemanticVersion>>()
76+
for ((mcVersion, archList) in apiVersionMap.entries) {
77+
apiVersionMapList[mcVersion] = archList.sortedDescending()
78+
}
7679

77-
return ArchitecturyVersion(apiVersionMapList)
80+
return ArchitecturyVersion(apiVersionMapList)
81+
} catch (e: IOException) {
82+
LOGGER.error("Failed to retrieve Architectury version data", e)
83+
}
84+
return null
7885
}
7986
}
8087
}

‎src/main/kotlin/platform/architectury/version/FabricVersion.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ package com.demonwav.mcdev.platform.architectury.version
1313
import com.demonwav.mcdev.util.SemanticVersion
1414
import com.extracraftx.minecraft.templatemakerfabric.data.DataProvider
1515
import com.extracraftx.minecraft.templatemakerfabric.data.holders.LoaderVersion
16+
import com.intellij.openapi.diagnostic.logger
1617
import java.io.IOException
1718

1819
class FabricVersion private constructor(val versions: DataProvider) {
@@ -45,6 +46,7 @@ class FabricVersion private constructor(val versions: DataProvider) {
4546
}
4647

4748
companion object {
49+
private val LOGGER = logger<FabricVersion>()
4850
private val dataProvider: DataProvider = DataProvider()
4951

5052
fun downloadData(): FabricVersion? {
@@ -55,7 +57,7 @@ class FabricVersion private constructor(val versions: DataProvider) {
5557
dataProvider.fabricApiVersions
5658
return FabricVersion(dataProvider)
5759
} catch (e: IOException) {
58-
e.printStackTrace()
60+
LOGGER.error("Failed to retrieve Fabric version data", e)
5961
}
6062
return null
6163
}

‎src/main/kotlin/platform/forge/version/ForgeVersion.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import com.demonwav.mcdev.util.SemanticVersion
1616
import com.demonwav.mcdev.util.sortVersions
1717
import com.github.kittinunf.fuel.core.FuelManager
1818
import com.github.kittinunf.fuel.core.requests.suspendable
19+
import com.intellij.openapi.diagnostic.logger
1920
import java.io.IOException
2021
import javax.xml.stream.XMLInputFactory
2122
import javax.xml.stream.events.XMLEvent
@@ -54,6 +55,8 @@ class ForgeVersion private constructor(val versions: List<String>) {
5455
}
5556

5657
companion object {
58+
private val LOGGER = logger<ForgeVersion>()
59+
5760
suspend fun downloadData(): ForgeVersion? {
5861
try {
5962
val url = "https://files.minecraftforge.net/maven/net/minecraftforge/forge/maven-metadata.xml"
@@ -97,7 +100,7 @@ class ForgeVersion private constructor(val versions: List<String>) {
97100

98101
return ForgeVersion(result)
99102
} catch (e: IOException) {
100-
e.printStackTrace()
103+
LOGGER.error("Failed to retrieve Forge version data", e)
101104
}
102105
return null
103106
}

‎src/main/kotlin/platform/liteloader/version/LiteLoaderVersion.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.github.kittinunf.fuel.core.FuelManager
1919
import com.github.kittinunf.fuel.core.requests.suspendable
2020
import com.github.kittinunf.fuel.coroutines.awaitString
2121
import com.google.gson.Gson
22-
import com.intellij.openapi.diagnostic.Logger
22+
import com.intellij.openapi.diagnostic.logger
2323
import java.io.IOException
2424

2525
class LiteLoaderVersion private constructor(private var map: Map<*, *>) {
@@ -33,7 +33,7 @@ class LiteLoaderVersion private constructor(private var map: Map<*, *>) {
3333
}
3434

3535
companion object {
36-
private val LOGGER = Logger.getInstance(LiteLoaderVersion::class.java)
36+
private val LOGGER = logger<LiteLoaderVersion>()
3737

3838
suspend fun downloadData(): LiteLoaderVersion? {
3939
try {

‎src/main/kotlin/platform/mixin/action/GenerateAccessorHandler.kt‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import com.intellij.ide.util.MemberChooser
4040
import com.intellij.openapi.application.ApplicationManager
4141
import com.intellij.openapi.command.CommandProcessor
4242
import com.intellij.openapi.command.WriteCommandAction
43-
import com.intellij.openapi.diagnostic.Logger
43+
import com.intellij.openapi.diagnostic.logger
4444
import com.intellij.openapi.editor.Editor
4545
import com.intellij.openapi.editor.EditorModificationUtil
4646
import com.intellij.openapi.fileEditor.FileDocumentManager
@@ -68,8 +68,9 @@ import org.jetbrains.java.generate.exception.GenerateCodeException
6868

6969
class GenerateAccessorHandler : GenerateMembersHandlerBase("Generate Accessor/Invoker") {
7070

71-
private val log =
72-
Logger.getInstance("#com.demonwav.mcdev.platform.mixin.action.GenerateAccessorHandler")
71+
companion object {
72+
private val log = logger<GenerateAccessorHandler>()
73+
}
7374

7475
private var generateGetters = false
7576
private var generateSetters = false
@@ -149,11 +150,7 @@ class GenerateAccessorHandler : GenerateMembersHandlerBase("Generate Accessor/In
149150
if (aClass.fields.any { canHaveAccessor(it) }) {
150151
return true
151152
}
152-
if (aClass.methods.any { canHaveInvoker(it) }) {
153-
return true
154-
}
155-
156-
return false
153+
return aClass.methods.any { canHaveInvoker(it) }
157154
}
158155

159156
override fun getAllOriginalMembers(aClass: PsiClass?): Array<ClassMember> {

‎src/main/kotlin/platform/mixin/util/AsmDfaUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
package com.demonwav.mcdev.platform.mixin.util
1212

1313
import com.demonwav.mcdev.util.internalName
14-
import com.intellij.openapi.diagnostic.Logger
14+
import com.intellij.openapi.diagnostic.thisLogger
1515
import com.intellij.openapi.project.Project
1616
import com.intellij.psi.JavaPsiFacade
1717
import com.intellij.psi.PsiClassType
@@ -28,7 +28,7 @@ import org.objectweb.asm.tree.analysis.Frame
2828
import org.objectweb.asm.tree.analysis.SimpleVerifier
2929

3030
object AsmDfaUtil {
31-
private val LOGGER = Logger.getInstance(AsmDfaUtil::class.java)
31+
private val LOGGER = thisLogger()
3232

3333
fun analyzeMethod(project: Project, clazz: ClassNode, method: MethodNode): Array<Frame<BasicValue>?>? {
3434
return method.cached(clazz, project) {

‎src/main/kotlin/platform/mixin/util/AsmUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import com.demonwav.mcdev.util.findQualifiedClass
2222
import com.demonwav.mcdev.util.fullQualifiedName
2323
import com.demonwav.mcdev.util.hasSyntheticMethod
2424
import com.demonwav.mcdev.util.isErasureEquivalentTo
25+
import com.demonwav.mcdev.util.loggerForTopLevel
2526
import com.demonwav.mcdev.util.mapToArray
2627
import com.demonwav.mcdev.util.realName
2728
import com.demonwav.mcdev.util.toJavaIdentifier
2829
import com.intellij.codeEditor.JavaEditorFileSwapper
2930
import com.intellij.ide.highlighter.JavaFileType
30-
import com.intellij.openapi.diagnostic.Logger
3131
import com.intellij.openapi.module.Module
3232
import com.intellij.openapi.progress.ProcessCanceledException
3333
import com.intellij.openapi.project.Project
@@ -79,7 +79,7 @@ import org.objectweb.asm.tree.MethodInsnNode
7979
import org.objectweb.asm.tree.MethodNode
8080
import org.objectweb.asm.tree.VarInsnNode
8181

82-
private val LOGGER = Logger.getInstance("AsmUtil")
82+
private val LOGGER = loggerForTopLevel()
8383

8484
private val MODIFIER_TO_ACCESS_FLAG = mapOf(
8585
entry(PsiModifier.PUBLIC, Opcodes.ACC_PUBLIC),

0 commit comments

Comments
 (0)