User: rednesto
Date: 01 Jan 24 18:16
Revision: 90b6ad34cc0511a26580b913e47fe6d77b12263c
Summary:
Fix #2160 broken and outdated Architectury templates


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8937&personal=false

Index: src/main/kotlin/platform/architectury/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/asset-steps.kt	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/kotlin/platform/architectury/creator/asset-steps.kt	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -118,6 +118,7 @@
             "JAVA_VERSION" to javaVersion,
             "MOD_ID" to modId,
             "MOD_NAME" to modName,
+            "FABRIC_CLASS_NAME_FQN" to packageName + ".fabric." + modName.toJavaClassName() + "Fabric",
             "DISPLAY_TEST" to hasDisplayTestInManifest,
             "FORGE_SPEC_VERSION" to forgeVersion.parts[0].versionString,
             "MC_VERSION" to mcVersion,
Index: src/main/kotlin/platform/architectury/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/gradle-steps.kt	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/kotlin/platform/architectury/creator/gradle-steps.kt	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -36,6 +36,7 @@
 import com.demonwav.mcdev.creator.step.AbstractModIdStep
 import com.demonwav.mcdev.creator.step.AbstractModNameStep
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
+import com.demonwav.mcdev.creator.step.UseMixinsStep
 import com.demonwav.mcdev.util.MinecraftTemplates
 import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.ide.wizard.NewProjectWizardStep
@@ -65,7 +66,7 @@
     override val description = "Creating Gradle files"
 
     override fun setupAssets(project: Project) {
-        data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(7, 6, 1))
+        data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(8, 4))
 
         val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
         val modId = data.getUserData(AbstractModIdStep.KEY) ?: return
@@ -76,6 +77,7 @@
         val fabricApiVersion = data.getUserData(ArchitecturyVersionChainStep.FABRIC_API_VERSION_KEY)
         val archApiVersion = data.getUserData(ArchitecturyVersionChainStep.ARCHITECTURY_API_VERSION_KEY)
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
+        val useMixins = data.getUserData(UseMixinsStep.KEY) ?: false
 
         assets.addTemplateProperties(
             "GROUP_ID" to buildSystemProps.groupId,
@@ -88,6 +90,7 @@
             "FABRIC_LOADER_VERSION" to fabricLoaderVersion,
             "ARCHITECTURY_GROUP" to architecturyGroup,
             "JAVA_VERSION" to javaVersion,
+            "MIXINS" to useMixins,
         )
 
         if (fabricApiVersion != null) {
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_build.gradle.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_build.gradle.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_build.gradle.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
 }
 
 architectury {
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_common_build.gradle.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_common_build.gradle.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_common_build.gradle.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -1,3 +1,7 @@
+architectury {
+    common(rootProject.enabled_platforms.split(","))
+}
+
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
@@ -8,10 +12,6 @@
 #end
 }
 
-architectury {
-    common("fabric", "forge")
-}
-
 publishing {
     publications {
         mavenCommon(MavenPublication) {
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_common_mixins.json.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_common_mixins.json.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_common_mixins.json.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "${PACKAGE_NAME}.mixin.forge",
+  "package": "${PACKAGE_NAME}.mixin",
   "compatibilityLevel": "JAVA_${JAVA_VERSION}",
   "mixins": [
   ],
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_build.gradle.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_build.gradle.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_build.gradle.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -9,7 +9,7 @@
 
 configurations {
     common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
@@ -39,13 +39,14 @@
 
 shadowJar {
     configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set("dev-shadow")
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
-    inputFile.set shadowJar.archiveFile
+    injectAccessWidener = true
+    inputFile.set(shadowJar.archiveFile)
     dependsOn shadowJar
-    archiveClassifier.set(null)
+    archiveClassifier = null
 }
 
 jar {
@@ -76,4 +77,4 @@
     repositories {
         // Add repositories to publish to here.
     }
-}
\ No newline at end of file
+}
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_mixins.json.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_mixins.json.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_mixins.json.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "${PACKAGE_NAME}.mixin.fabric",
+  "package": "${PACKAGE_NAME}.fabric.mixin",
   "compatibilityLevel": "JAVA_${JAVA_VERSION}",
   "mixins": [
   ],
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_mod.json.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_mod.json.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_fabric_mod.json.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -13,7 +13,11 @@
   "icon": "icon.png",
 
   "environment": "${MOD_ENVIRONMENT}",
-  "entrypoints": {},
+  "entrypoints": {
+    "main": [
+      "${FABRIC_CLASS_NAME_FQN}"
+    ]
+  },
 #if (${MIXINS})
   "mixins": [
     "${MOD_ID}.mixins.json",
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_build.gradle.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_build.gradle.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_build.gradle.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -16,7 +16,7 @@
 
 configurations {
     common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
@@ -45,11 +45,11 @@
     exclude "fabric.mod.json"
 
     configurations = [project.configurations.shadowCommon]
-    archiveClassifier.set("dev-shadow")
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
-    inputFile.set shadowJar.archiveFile
+    inputFile.set(shadowJar.archiveFile)
     dependsOn shadowJar
     archiveClassifier.set(null)
 }
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_mixins.json.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_mixins.json.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_mixins.json.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "${PACKAGE_NAME}.mixin.forge",
+  "package": "${PACKAGE_NAME}.forge.mixin",
   "compatibilityLevel": "JAVA_${JAVA_VERSION}",
   "mixins": [
   ],
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_gradle.properties.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_gradle.properties.ft	(revision 0f6dd78b6eacbdc9293b360f138d4e833ff72408)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_gradle.properties.ft	(revision 90b6ad34cc0511a26580b913e47fe6d77b12263c)
@@ -1,6 +1,7 @@
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2048M
 
 minecraft_version=${MC_VERSION}
+enabled_platforms=fabric,forge
 
 archives_base_name=${ARTIFACT_ID}
 mod_version=${VERSION}