fix forgix

tyap-lyap · Jul 8, 2024 · 0e899f6 · 0e899f6
1 parent c248414
commit 0e899f6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           name: Artifacts
           path: |
-            Merged/${{ steps.props.outputs.mod_id }}-${{ steps.props.outputs.mod_version }}.jar
+            build/libs/merged/${{ steps.props.outputs.mod_id }}-${{ steps.props.outputs.mod_version }}.jar
             ${{ steps.props.outputs.mod_id }}-fabric/build/libs/${{ steps.props.outputs.mod_id }}-fabric-${{ steps.props.outputs.mod_version }}.jar
             ${{ steps.props.outputs.mod_id }}-fabric/build/libs/${{ steps.props.outputs.mod_id }}-fabric-${{ steps.props.outputs.mod_version }}-sources.jar
             ${{ steps.props.outputs.mod_id }}-neoforge/build/libs/${{ steps.props.outputs.mod_id }}-neoforge-${{ steps.props.outputs.mod_version }}.jar

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -42,8 +42,8 @@ jobs:
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
           files: |
-            Merged/${{ steps.props.outputs.mod_id }}-${{ github.event.release.tag_name }}.jar
-            
+            build/libs/merged/${{ steps.props.outputs.mod_id }}-${{ github.event.release.tag_name }}.jar
+
           name: ${{ github.event.release.tag_name }}
           version: ${{ github.event.release.tag_name }}
 
@@ -54,7 +54,7 @@ jobs:
 
           game-versions: ${{ steps.props.outputs.minecraft_version_range_fabric }}
           game-version-filter: releases
-          
+
           dependencies: |
             cloth-config
 
@@ -63,9 +63,9 @@ jobs:
 
           retry-attempts: 0
           fail-mode: skip
-          
+
       - name: Upload assets to GitHub
         uses: AButler/[email protected]
         with:
-          files: "Merged/${{ steps.props.outputs.mod_id }}-${{ github.event.release.tag_name }}.jar;${{ steps.props.outputs.mod_id }}-fabric/build/libs/${{ steps.props.outputs.mod_id }}-fabric-${{ github.event.release.tag_name }}.jar;${{ steps.props.outputs.mod_id }}-fabric/build/libs/${{ steps.props.outputs.mod_id }}-fabric-${{ github.event.release.tag_name }}-sources.jar;${{ steps.props.outputs.mod_id }}-neoforge/build/libs/${{ steps.props.outputs.mod_id }}-neoforge-${{ github.event.release.tag_name }}.jar;${{ steps.props.outputs.mod_id }}-neoforge/build/libs/${{ steps.props.outputs.mod_id }}-neoforge-${{ github.event.release.tag_name }}-sources.jar"
+          files: "build/libs/merged/${{ steps.props.outputs.mod_id }}-${{ github.event.release.tag_name }}.jar;${{ steps.props.outputs.mod_id }}-fabric/build/libs/${{ steps.props.outputs.mod_id }}-fabric-${{ github.event.release.tag_name }}.jar;${{ steps.props.outputs.mod_id }}-fabric/build/libs/${{ steps.props.outputs.mod_id }}-fabric-${{ github.event.release.tag_name }}-sources.jar;${{ steps.props.outputs.mod_id }}-neoforge/build/libs/${{ steps.props.outputs.mod_id }}-neoforge-${{ github.event.release.tag_name }}.jar;${{ steps.props.outputs.mod_id }}-neoforge/build/libs/${{ steps.props.outputs.mod_id }}-neoforge-${{ github.event.release.tag_name }}-sources.jar"
           repo-token: ${{ secrets.GH_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import groovy.lang.Closure
+import io.github.pacifistmc.forgix.plugin.ForgixMergeExtension
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 
 plugins {
@@ -11,9 +13,22 @@ architectury {
     minecraft = rootProject.property("minecraft_version").toString()
 }
 
+@Suppress("UNCHECKED_CAST")
 forgix {
     group = "ru.pinkgoosik.winterly"
     mergedJarName = "winterly-${rootProject.property("mod_version").toString()}.jar"
+    outputDir = "build/libs/merged"
+
+    fabric(
+            closureOf<ForgixMergeExtension.FabricContainer> {
+                projectName = "winterly-fabric"
+            } as Closure<ForgixMergeExtension.FabricContainer>
+    )
+    neoforge(
+            closureOf<ForgixMergeExtension.NeoForgeContainer> {
+                projectName = "winterly-neoforge"
+            } as Closure<ForgixMergeExtension.NeoForgeContainer>
+    )
 }
 
 subprojects {