Merge branch 'dev' into 2022.2

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/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"

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/platform/architectury/creator/ArchitecturyProjectCreator.kt

@@ -24,6 +24,7 @@ import com.demonwav.mcdev.creator.buildsystem.gradle.SimpleGradleSetupStep
 import com.demonwav.mcdev.platform.fabric.EntryPoint
 import com.demonwav.mcdev.platform.fabric.util.FabricConstants
 import com.demonwav.mcdev.platform.forge.util.ForgeConstants
+import com.demonwav.mcdev.platform.forge.util.ForgePackAdditionalData
 import com.demonwav.mcdev.platform.forge.util.ForgePackDescriptor
 import com.demonwav.mcdev.util.runGradleTaskAndWait
 import com.demonwav.mcdev.util.runWriteAction
@@ -253,7 +254,9 @@ class ArchitecturyForgeProjectCreator(
         override fun runStep(indicator: ProgressIndicator) {
             val modsTomlText = ArchitecturyTemplate.applyModsToml(project, buildSystem, config)
             val packDescriptor = ForgePackDescriptor.forMcVersion(config.mcVersion) ?: ForgePackDescriptor.FORMAT_3
-            val packMcmetaText = ArchitecturyTemplate.applyPackMcmeta(project, buildSystem.artifactId, packDescriptor)
+            val additionalData = ForgePackAdditionalData.forMcVersion(config.mcVersion)
+            val packMcmetaText =
+                ArchitecturyTemplate.applyPackMcmeta(project, buildSystem.artifactId, packDescriptor, additionalData)
             val dir = buildSystem.dirsOrError.resourceDirectory
             runWriteTask {
                 CreatorStep.writeTextToFile(project, dir, ForgeConstants.PACK_MCMETA, packMcmetaText)

src/main/kotlin/platform/architectury/creator/ArchitecturyTemplate.kt

@@ -12,6 +12,7 @@ package com.demonwav.mcdev.platform.architectury.creator
 
 import com.demonwav.mcdev.creator.buildsystem.BuildSystem
 import com.demonwav.mcdev.platform.BaseTemplate
+import com.demonwav.mcdev.platform.forge.util.ForgePackAdditionalData
 import com.demonwav.mcdev.platform.forge.util.ForgePackDescriptor
 import com.demonwav.mcdev.util.License
 import com.demonwav.mcdev.util.MinecraftTemplates
@@ -207,11 +208,17 @@ object ArchitecturyTemplate : BaseTemplate() {
         return project.applyTemplate(MinecraftTemplates.ARCHITECTURY_FORGE_MODS_TOML_TEMPLATE, props)
     }
 
-    fun applyPackMcmeta(project: Project, artifactId: String, pack: ForgePackDescriptor): String {
+    fun applyPackMcmeta(
+        project: Project,
+        artifactId: String,
+        pack: ForgePackDescriptor,
+        additionalData: ForgePackAdditionalData?
+    ): String {
         val props = mapOf(
             "ARTIFACT_ID" to artifactId,
             "PACK_FORMAT" to pack.format.toString(),
-            "PACK_COMMENT" to pack.comment
+            "PACK_COMMENT" to pack.comment,
+            "FORGE_DATA" to additionalData,
         )
 
         return project.applyTemplate(MinecraftTemplates.ARCHITECTURY_FORGE_PACK_MCMETA_TEMPLATE, props)

src/main/kotlin/platform/bukkit/creator/BukkitProjectCreator.kt

@@ -115,7 +115,7 @@ open class BukkitDependenciesStep(
                 buildSystem.repositories.add(
                     BuildRepository(
                         "papermc-repo",
-                        "https://papermc.io/repo/repository/maven-public/"
+                        "https://repo.papermc.io/repository/maven-public/"
                     )
                 )
                 val paperGroupId = when {