User: rednesto
Date: 25 Apr 23 12:24
Revision: ed77f0f87030af8b9842a19e682da608b9346c78
Summary:
Update pack.mcmeta generation for 1.19.4

Also reformat mcmeta files on project creation


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

Index: src/main/kotlin/platform/architectury/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/asset-steps.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/platform/architectury/creator/asset-steps.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -20,6 +20,7 @@
 import com.demonwav.mcdev.creator.findStep
 import com.demonwav.mcdev.creator.step.AbstractLongRunningAssetsStep
 import com.demonwav.mcdev.creator.step.AbstractModNameStep
+import com.demonwav.mcdev.creator.step.AbstractReformatFilesStep
 import com.demonwav.mcdev.creator.step.AuthorsStep
 import com.demonwav.mcdev.creator.step.DescriptionStep
 import com.demonwav.mcdev.creator.step.IssueTrackerStep
@@ -226,6 +227,13 @@
     override fun getClassName(packageName: String, className: String) = "$packageName.fabric.${className}Fabric"
 }
 
+class ArchitecturyReformatPackDescriptorStep(parent: NewProjectWizardStep) : AbstractReformatFilesStep(parent) {
+
+    override fun addFilesToReformat() {
+        addFileToReformat("forge/src/main/resources/pack.mcmeta")
+    }
+}
+
 class ArchitecturyBuildSystemStep(parent: NewProjectWizardStep) : AbstractBuildSystemStep(parent) {
     override val platformName = "Architectury"
 }
Index: src/main/kotlin/platform/architectury/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/platform/architectury/creator/ui-steps.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -74,6 +74,7 @@
             .nextStep(::ArchitecturyForgeMainClassStep)
             .nextStep(::ArchitecturyFabricMainClassStep)
             .nextStep(::ArchitecturyPostBuildSystemStep)
+            .nextStep(::ArchitecturyReformatPackDescriptorStep)
     }
 
     class Factory : ModPlatformStep.Factory {
Index: src/main/kotlin/platform/forge/creator/asset-steps.kt
===================================================================
--- src/main/kotlin/platform/forge/creator/asset-steps.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/platform/forge/creator/asset-steps.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -20,6 +20,7 @@
 import com.demonwav.mcdev.creator.splitPackage
 import com.demonwav.mcdev.creator.step.AbstractLongRunningAssetsStep
 import com.demonwav.mcdev.creator.step.AbstractModNameStep
+import com.demonwav.mcdev.creator.step.AbstractReformatFilesStep
 import com.demonwav.mcdev.creator.step.AuthorsStep
 import com.demonwav.mcdev.creator.step.DescriptionStep
 import com.demonwav.mcdev.creator.step.LicenseStep
@@ -128,6 +129,13 @@
     }
 }
 
+class ForgeReformatPackDescriptorStep(parent: NewProjectWizardStep) : AbstractReformatFilesStep(parent) {
+
+    override fun addFilesToReformat() {
+        addFileToReformat("src/main/resources/pack.mcmeta")
+    }
+}
+
 class ForgeBuildSystemStep(parent: NewProjectWizardStep) : AbstractBuildSystemStep(parent) {
     override val platformName = "Forge"
 }
Index: src/main/kotlin/platform/forge/creator/ui-steps.kt
===================================================================
--- src/main/kotlin/platform/forge/creator/ui-steps.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/platform/forge/creator/ui-steps.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -52,6 +52,7 @@
         .nextStep(::ForgeProjectFilesStep)
         .nextStep(::ForgeMixinsJsonStep)
         .nextStep(::ForgePostBuildSystemStep)
+        .nextStep(::ForgeReformatPackDescriptorStep)
 
     class Factory : ModPlatformStep.Factory {
         override val name = "Forge"
Index: src/main/kotlin/platform/forge/util/ForgePackAdditionalData.kt
===================================================================
--- src/main/kotlin/platform/forge/util/ForgePackAdditionalData.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/platform/forge/util/ForgePackAdditionalData.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -13,17 +13,23 @@
 import com.demonwav.mcdev.util.MinecraftVersions
 import com.demonwav.mcdev.util.SemanticVersion
 
-data class ForgePackAdditionalData(val resourcePackFormat: Int, val dataPackFormat: Int) {
+data class ForgePackAdditionalData(
+    val resourcePackFormat: Int? = null,
+    val dataPackFormat: Int? = null,
+    val serverDataPackFormat: Int? = null
+) {
     companion object {
         val FORMAT_1_18 = ForgePackAdditionalData(8, 9)
         val FORMAT_1_19 = ForgePackAdditionalData(9, 10)
         val FORMAT_1_19_3 = ForgePackAdditionalData(12, 10)
+        val FORMAT_1_19_4 = ForgePackAdditionalData(serverDataPackFormat = 12)
 
         fun forMcVersion(version: SemanticVersion): ForgePackAdditionalData? = when {
             version < MinecraftVersions.MC1_18 -> null
             version < MinecraftVersions.MC1_19 -> FORMAT_1_18
             version < MinecraftVersions.MC1_19_3 -> FORMAT_1_19
-            else -> FORMAT_1_19_3
+            version < MinecraftVersions.MC1_19_4 -> FORMAT_1_19_3
+            else -> FORMAT_1_19_4
         }
     }
 }
Index: src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt
===================================================================
--- src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -41,6 +41,7 @@
         val FORMAT_8 = ForgePackDescriptor(8, "")
         val FORMAT_9 = ForgePackDescriptor(9, "")
         val FORMAT_12 = ForgePackDescriptor(12, "")
+        val FORMAT_13 = ForgePackDescriptor(13, "")
 
         // See https://minecraft.gamepedia.com/Tutorials/Creating_a_resource_pack#.22pack_format.22
         fun forMcVersion(version: SemanticVersion): ForgePackDescriptor? = when {
@@ -51,7 +52,8 @@
             version < MinecraftVersions.MC1_18 -> FORMAT_7
             version < MinecraftVersions.MC1_19 -> FORMAT_8
             version < MinecraftVersions.MC1_19_3 -> FORMAT_9
-            version >= MinecraftVersions.MC1_19_3 -> FORMAT_12
+            version < MinecraftVersions.MC1_19_4 -> FORMAT_12
+            version >= MinecraftVersions.MC1_19_4 -> FORMAT_13
             else -> null
         }
     }
Index: src/main/kotlin/util/MinecraftVersions.kt
===================================================================
--- src/main/kotlin/util/MinecraftVersions.kt	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/kotlin/util/MinecraftVersions.kt	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -22,6 +22,7 @@
     val MC1_18 = SemanticVersion.release(1, 18)
     val MC1_19 = SemanticVersion.release(1, 19)
     val MC1_19_3 = SemanticVersion.release(1, 19, 3)
+    val MC1_19_4 = SemanticVersion.release(1, 19, 4)
 
     fun requiredJavaVersion(minecraftVersion: SemanticVersion) = when {
         minecraftVersion <= MC1_16_5 -> JavaSdkVersion.JDK_1_8
Index: src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_pack.mcmeta.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_pack.mcmeta.ft	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/resources/fileTemplates/j2ee/architectury/architectury_forge_pack.mcmeta.ft	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -8,8 +8,15 @@
         "pack_format": ${PACK_FORMAT}
         #end
         #if (${FORGE_DATA})
-        ,"forge:resource_pack_format": ${FORGE_DATA.resourcePackFormat},
-        "forge:data_pack_format": ${FORGE_DATA.dataPackFormat}
+        #if (${FORGE_DATA.resourcePackFormat})
+        ,"forge:resource_pack_format": ${FORGE_DATA.resourcePackFormat}
         #end
+        #if (${FORGE_DATA.dataPackFormat})
+        ,"forge:data_pack_format": ${FORGE_DATA.dataPackFormat}
+        #end
+        #if (${FORGE_DATA.serverDataPackFormat})
+        ,"forge:server_data_pack_format": ${FORGE_DATA.serverDataPackFormat}
+        #end
+        #end
     }
 }
Index: src/main/resources/fileTemplates/j2ee/forge/pack.mcmeta.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/forge/pack.mcmeta.ft	(revision dc934dbc10f83800d537e8445529eed4fad9faea)
+++ src/main/resources/fileTemplates/j2ee/forge/pack.mcmeta.ft	(revision ed77f0f87030af8b9842a19e682da608b9346c78)
@@ -8,8 +8,15 @@
         "pack_format": ${PACK_FORMAT}
         #end
         #if (${FORGE_DATA})
-        ,"forge:resource_pack_format": ${FORGE_DATA.resourcePackFormat},
-        "forge:data_pack_format": ${FORGE_DATA.dataPackFormat}
+        #if (${FORGE_DATA.resourcePackFormat})
+        ,"forge:resource_pack_format": ${FORGE_DATA.resourcePackFormat}
         #end
+        #if (${FORGE_DATA.dataPackFormat})
+        ,"forge:data_pack_format": ${FORGE_DATA.dataPackFormat}
+        #end
+        #if (${FORGE_DATA.serverDataPackFormat})
+        ,"forge:server_data_pack_format": ${FORGE_DATA.serverDataPackFormat}
+        #end
+        #end
     }
 }