Merge branch '1.20.1' into 1.20.2

# Conflicts: # .github/workflows/1.20.2.yml
rfresh2 · Mar 5, 2024 · 012244a · 012244a
2 parents 45d5fb5 + 5c0480b
commit 012244a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/1.20.2.yml b/.github/workflows/1.20.2.yml
@@ -60,19 +60,22 @@ jobs:
         echo "XP_NEO=XaeroPlus-${{ env.XP_VERSION}}+neoforge-${{ env.MINECRAFT_VERSION }}-WM1.38.0-MM24.0.0" >> $GITHUB_ENV
 
     - name: Upload Fabric Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.XP_FABRIC }}
         path: fabric/build/libs/${{ env.XP_FABRIC }}.jar
+        if-no-files-found: error
 
     - name: Upload Forge Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.XP_FORGE }}
         path: forge/build/libs/${{ env.XP_FORGE }}.jar
+        if-no-files-found: error
 
     - name: Upload NeoForge Artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.XP_NEO }}
         path: neo/build/libs/${{ env.XP_NEO }}.jar
+        if-no-files-found: error
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -82,20 +82,23 @@ jobs:
         with:
           name: ${{ env.XP_FABRIC }}
           path: fabric/build/libs/${{ env.XP_FABRIC }}.jar
+          if-no-files-found: error
 
       - name: Upload Forge Artifact
         if: ${{ inputs.forge }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.XP_FORGE }}
           path: forge/build/libs/${{ env.XP_FORGE }}.jar
+          if-no-files-found: error
 
       - name: Upload Neo Artifact
         if: ${{ inputs.neo }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.XP_NEO }}
           path: neo/build/libs/${{ env.XP_NEO }}.jar
+          if-no-files-found: error
 
       - name: Generate changelog
         id: changelog

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -57,7 +57,7 @@ tasks {
             // format is: 'fabricClassName::forgeClassName'
             val remap = hashMapOf<String, String>()
             remapFile.forEachLine { line ->
-                if (!line.contains("::")) return@forEachLine
+                if (line.startsWith("#") || !line.contains("::")) return@forEachLine
                 val parts = line.split("::")
                 remap[parts[0]] = parts[1]
                 println("Loaded Forge Remap: '${parts[0]}' to '${parts[1]}'")

diff --git a/common/remap/remap.txt b/common/remap/remap.txt
@@ -1,7 +1,5 @@
 AXaeroMinimap::IXaeroMinimap
 # forge needs certain mixins not remapped
 remap = true) // $REMAP::remap=false)
-# renamed field
-XaeroMinimap.INSTANCE // $REMAP::XaeroMinimap.instance
 # fabric minimap compatibility mixin plugin
 "plugin": "xaeroplus.fabric.util.compat.XaeroPlusCompatibleMinimapMixinPlugin",::