Merge branch '2021.3' into 2022.1

Author: RedNesto

build.gradle.kts

@@ -56,6 +56,11 @@ val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtensionSource
 
 repositories {
     maven("https://repo.denwav.dev/repository/maven-public/")
+    maven("https://maven.fabricmc.net/") {
+        content {
+            includeModule("net.fabricmc", "mapping-io")
+        }
+    }
     mavenCentral()
 }
 
@@ -71,6 +76,7 @@ dependencies {
     implementation(files(gradleToolingExtensionJar))
 
     implementation(libs.templateMakerFabric)
+    implementation(libs.mappingIo)
     implementation(libs.bundles.asm)
 
     jflex(libs.jflex.lib)

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2022.1
 ideaVersionName = 2022.1
 
-coreVersion = 1.5.19
+coreVersion = 1.5.20
 downloadIdeaSources = true
 
 pluginTomlVersion = 221.5080.126

gradle/libs.versions.toml

@@ -7,7 +7,8 @@ asm = "9.2"
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 
-templateMakerFabric = "com.extracraftx.minecraft:TemplateMakerFabric:0.4.0"
+templateMakerFabric = "com.extracraftx.minecraft:TemplateMakerFabric:0.4.1"
+mappingIo = "net.fabricmc:mapping-io:0.2.1"
 
 # GrammarKit
 jflex-lib = "org.jetbrains.idea:jflex:1.7.0-b7f882a"

readme.md

@@ -24,6 +24,10 @@ Minecraft Development for IntelliJ
         <td align="left">2022.1</td>
         <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20221"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20221)/statusIcon.svg" alt="2022.1 Nightly Status" /></a></td>
     </tr>
+    <tr>
+        <td align="left">2022.2</td>
+        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20222"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20222)/statusIcon.svg" alt="2022.2 Nightly Status" /></a></td>
+    </tr>
     <tr>
         <td align="right"><b>OS Tests</b></td>
         <td align="left" colspan="2">

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy

@@ -0,0 +1,50 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mcp.gradle.tooling.fabricloom
+
+
+import org.gradle.api.Project
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+
+class FabricLoomModelBuilderImpl implements ModelBuilderService {
+
+    @Override
+    boolean canBuild(String modelName) {
+        return FabricLoomModel.name == modelName
+    }
+
+    @Override
+    Object buildAll(String modelName, Project project) {
+        if (!project.plugins.hasPlugin('fabric-loom')) {
+            return null
+        }
+
+        def loomExtension = project.extensions.getByName('loom')
+        def tinyMappings = loomExtension.mappingsProvider.tinyMappings.toFile().getAbsoluteFile()
+        def decompilers = loomExtension.decompilerOptions.collectEntries {
+            def task = project.tasks.getByName('genSourcesWith' + it.name.capitalize())
+            def sourcesPath = task.runtimeJar.get().getAsFile().getAbsolutePath().dropRight(4) + "-sources.jar"
+            [it.name, sourcesPath]
+        }
+
+        //noinspection GroovyAssignabilityCheck
+        return new FabricLoomModelImpl(tinyMappings, decompilers)
+    }
+
+    @Override
+    ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
+        return ErrorMessageBuilder.create(
+                project, e, "MinecraftDev import errors"
+        ).withDescription("Unable to build MinecraftDev FabricLoom project configuration")
+    }
+}

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy

@@ -0,0 +1,32 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mcp.gradle.tooling.fabricloom
+
+class FabricLoomModelImpl implements FabricLoomModel, Serializable {
+
+    private final File tinyMappings
+    private final Map<String, String> decompilers
+
+    FabricLoomModelImpl(File tinyMappings, Map<String, String> decompilers) {
+        this.tinyMappings = tinyMappings
+        this.decompilers = decompilers
+    }
+
+    @Override
+    File getTinyMappings() {
+        return tinyMappings
+    }
+
+    @Override
+    Map<String, String> getDecompilers() {
+        return decompilers
+    }
+}

src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java

@@ -0,0 +1,21 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2021 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.mcp.gradle.tooling.fabricloom;
+
+import java.io.File;
+import java.util.Map;
+
+public interface FabricLoomModel {
+
+    File getTinyMappings();
+
+    Map<String, String> getDecompilers();
+}

src/gradle-tooling-extension/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService

@@ -1,4 +1,5 @@
 com.demonwav.mcdev.platform.mcp.gradle.tooling.archloom.ArchitecturyModelBuilderImpl
+com.demonwav.mcdev.platform.mcp.gradle.tooling.fabricloom.FabricLoomModelBuilderImpl
 com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle.VanillaGradleModelBuilderImpl
 com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelFG2BuilderImpl
 com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelFG3BuilderImpl

src/main/grammars/AwLexer.flex

@@ -46,7 +46,7 @@ CLASS_ELEMENT=class
 METHOD_ELEMENT=method
 FIELD_ELEMENT=field
 NAME_ELEMENT=\w+|<init>
-CLASS_NAME_ELEMENT=(\w+\/)*\w+(\$\w+)?
+CLASS_NAME_ELEMENT=(\w+\/)*\w+(\$\w+)*
 COMMENT=#.*
 CRLF=\n|\r|\r\n
 WHITE_SPACE=\s

src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt

@@ -91,10 +91,11 @@ class MinecraftClassCreateAction :
     override fun isAvailable(dataContext: DataContext): Boolean {
         val psi = dataContext.getData(CommonDataKeys.PSI_ELEMENT)
         val module = psi?.findModule() ?: return false
-        val isModModule = MinecraftFacet.getInstance(module, FabricModuleType, ForgeModuleType) != null
+        val isFabricMod = MinecraftFacet.getInstance(module, FabricModuleType) != null
+        val isForgeMod = MinecraftFacet.getInstance(module, ForgeModuleType) != null
         val hasMcVersion = MinecraftFacet.getInstance(module, McpModuleType)?.getSettings()?.minecraftVersion != null
 
-        return isModModule && hasMcVersion && super.isAvailable(dataContext)
+        return (isFabricMod || isForgeMod && hasMcVersion) && super.isAvailable(dataContext)
     }
 
     override fun checkPackageExists(directory: PsiDirectory): Boolean {