User: rednesto
Date: 07 Jul 24 15:52
Revision: fbbb2a2162bdf2a56241a81d8b2b317c11063232
Summary:
Provide Minecraft version in Loom-based projects


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9364&personal=false

Index: src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy
===================================================================
--- src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy	(revision 336924bed50a7b31ab01929da3477c5742cf9b02)
+++ src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy	(revision fbbb2a2162bdf2a56241a81d8b2b317c11063232)
@@ -50,6 +50,7 @@
     }
 
     FabricLoomModel build(Project project, Object loomExtension) {
+        def minecraftVersion = loomExtension.minecraftProvider.minecraftVersion()
         def tinyMappings = loomExtension.mappingsFile
         def splitMinecraftJar = loomExtension.areEnvironmentSourceSetsSplit()
 
@@ -70,7 +71,7 @@
         }
 
         //noinspection GroovyAssignabilityCheck
-        return new FabricLoomModelImpl(tinyMappings, decompilers, splitMinecraftJar, modSourceSets)
+        return new FabricLoomModelImpl(minecraftVersion, tinyMappings, decompilers, splitMinecraftJar, modSourceSets)
     }
 
     List<FabricLoomModelImpl.DecompilerModelImpl> getDecompilers(Object loomExtension, boolean client) {
Index: src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy
===================================================================
--- src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy	(revision 336924bed50a7b31ab01929da3477c5742cf9b02)
+++ src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy	(revision fbbb2a2162bdf2a56241a81d8b2b317c11063232)
@@ -24,6 +24,7 @@
 
 @Immutable(knownImmutableClasses = [File])
 class FabricLoomModelImpl implements FabricLoomModel, Serializable {
+    String minecraftVersion
     File tinyMappings
     Map<String, List<DecompilerModel>> decompilers
     boolean splitMinecraftJar
Index: src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java
===================================================================
--- src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java	(revision 336924bed50a7b31ab01929da3477c5742cf9b02)
+++ src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java	(revision fbbb2a2162bdf2a56241a81d8b2b317c11063232)
@@ -26,6 +26,8 @@
 
 public interface FabricLoomModel {
 
+    String getMinecraftVersion();
+
     File getTinyMappings();
 
     Map<String, List<DecompilerModel>> getDecompilers();
Index: src/main/kotlin/platform/mcp/fabricloom/FabricLoomProjectResolverExtension.kt
===================================================================
--- src/main/kotlin/platform/mcp/fabricloom/FabricLoomProjectResolverExtension.kt	(revision 336924bed50a7b31ab01929da3477c5742cf9b02)
+++ src/main/kotlin/platform/mcp/fabricloom/FabricLoomProjectResolverExtension.kt	(revision fbbb2a2162bdf2a56241a81d8b2b317c11063232)
@@ -20,10 +20,13 @@
 
 package com.demonwav.mcdev.platform.mcp.fabricloom
 
+import com.demonwav.mcdev.platform.mcp.McpModuleSettings
+import com.demonwav.mcdev.platform.mcp.gradle.McpModelData
 import com.demonwav.mcdev.platform.mcp.gradle.tooling.fabricloom.FabricLoomModel
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.project.ModuleData
 import org.gradle.tooling.model.idea.IdeaModule
+import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
 import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
 
 class FabricLoomProjectResolverExtension : AbstractProjectResolverExtension() {
@@ -50,7 +53,24 @@
                 loomData.modSourceSets
             )
             ideModule.createChild(FabricLoomData.KEY, data)
+
+            val mcpData = McpModelData(
+                ideModule.data,
+                McpModuleSettings.State(
+                    minecraftVersion = loomData.minecraftVersion,
+                ),
+                null,
+                null
+            )
+            ideModule.createChild(McpModelData.KEY, mcpData)
+
+            for (child in ideModule.children) {
+                val childData = child.data
+                if (childData is GradleSourceSetData) {
+                    child.createChild(McpModelData.KEY, mcpData.copy(module = childData))
-        }
+                }
+            }
+        }
 
         super.populateModuleExtraModels(gradleModule, ideModule)
     }