Merge branch 'main' of https://git.nostalgica.net/Lasting-Legacy/Content-Monorepo

.forgejo/workflows/auto-update.yml

@@ -3,7 +3,10 @@ name: Auto Update
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 0 * * 0"
+    - cron: "0 5 * * *"
+    - cron: "0 11 * * *"
+    - cron: "0 17 * * *"
+    - cron: "0 23 * * *"
 
 jobs:
   auto-update:
@@ -32,5 +35,5 @@ jobs:
         uses: https://github.com/EndBug/add-and-commit@v9.1.4
         with:
           author_name: forgejo-actions[bot]
-          author_email: omo50@noreply.codeberg.org
-          message: 'Commit from Forgejo Actions (${{forgejo.workflow}})'
+          author_email: omo50@noreply.nostalgica.net
+          message: 'Forgejo Actions (${{forgejo.workflow}})'

.forgejo/workflows/rc-builds.yml

@@ -0,0 +1,89 @@
+name: Re-Console+ Builds
+
+on:
+  push:
+    branches: [ "main" ]
+    paths: 
+      - 'modpacks/re-console-plus/cf/**'
+      - 'modpacks/re-console-plus/mr/**'
+  pull_request:
+    branches: [ "main" ]
+    paths: 
+      - 'modpacks/re-console+/cf/**'
+      - 'modpacks/re-console+/mr/**'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: technocality
+    strategy:
+      matrix:
+        include:
+          - { version: "1.21.10-fabric", platform: "mr", packwiz_platform: "modrinth", file_ext: "mrpack" }
+          - { version: "1.21.10-fabric", platform: "cf", packwiz_platform: "curseforge", file_ext: "zip" }
+    outputs:
+      commit_sha: ${{ steps.vars.outputs.commit_sha }}
+    env:  
+      GITHUB_TOKEN: ${{ secrets.FORGEJO_TOKEN }} 
+      PACK_NAME: "Re-Console+"
+      OUTPUT: artifacts
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 1
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+          cache: false  
+
+      - name: Install Packwiz
+        run: go install github.com/packwiz/packwiz@latest
+
+      - name: Add Packwiz to PATH
+        run: echo "$HOME/go/bin" >> $GITHUB_PATH
+
+      - name: Create short commit SHA
+        id: vars
+        run: |
+          shortSha=$(git rev-parse --short ${{ github.sha }})
+          echo "COMMIT_SHORT_SHA=$shortSha" >> $GITHUB_ENV
+          echo "commit_sha=$shortSha" >> $GITHUB_OUTPUT
+
+      - name: Build RC+
+        run: |
+          SOURCE_DIR="./modpacks/re-console-plus/${{ matrix.platform }}/yarn/${{ matrix.version }}"
+          TEMP_DIR="build-temp-${{ matrix.platform }}-${{ matrix.version }}"
+          mkdir -p "$TEMP_DIR"
+          cp -a "$SOURCE_DIR/." "./$TEMP_DIR/"
+          cd "./$TEMP_DIR"
+          packwiz refresh
+          mkdir -p "../$OUTPUT"
+          packwiz ${{ matrix.packwiz_platform }} export --output "../${OUTPUT}/${{ env.PACK_NAME }}-${{ matrix.version }}-${{ matrix.platform }}-${{ env.COMMIT_SHORT_SHA }}.${{ matrix.file_ext }}"
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "RC-Plus-${{ matrix.version }}-${{ matrix.platform }}-${{ env.COMMIT_SHORT_SHA }}"
+          path: artifacts
+
+  combine:
+    needs: build
+    runs-on: technocality
+    steps:
+      - name: Download all artifacts
+        uses: https://code.forgejo.org/actions/download-artifact@v3
+        with:
+          path: downloaded-artifacts
+          
+      - name: Combine and Upload
+        run: |
+          mkdir combined
+          find downloaded-artifacts -type f \( -name "*.mrpack" -o -name "*.zip" \) -exec cp {} combined/ \;
+          
+      - name: Final Upload
+        uses: https://code.forgejo.org/actions/upload-artifact@v3
+        with:
+          name: "RC-Plus-${{ needs.build.outputs.commit_sha }}"
+          path: combined

.forgejo/workflows/simply-builds.yml

@@ -0,0 +1,89 @@
+name: Simply Legacy Builds
+
+on:
+  push:
+    branches: [ "main" ]
+    paths: 
+      - 'modpacks/simply-legacy/cf/**'
+      - 'modpacks/simply-legacy/mr/**'
+  pull_request:
+    branches: [ "main" ]
+    paths: 
+      - 'modpacks/simply-legacy/cf/**'
+      - 'modpacks/simply-legacy/mr/**'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: technocality
+    strategy:
+      matrix:
+        include:
+          - { version: "1.21.10-fabric", platform: "mr", packwiz_platform: "modrinth", file_ext: "mrpack" }
+          - { version: "1.21.10-fabric", platform: "cf", packwiz_platform: "curseforge", file_ext: "zip" }
+    outputs:
+      commit_sha: ${{ steps.vars.outputs.commit_sha }}
+    env:  
+      GITHUB_TOKEN: ${{ secrets.FORGEJO_TOKEN }} 
+      PACK_NAME: "Simply Legacy"
+      OUTPUT: artifacts
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 'stable'
+          cache: false  
+
+      - name: Install Packwiz
+        run: go install github.com/packwiz/packwiz@latest
+
+      - name: Add Packwiz to PATH
+        run: echo "$HOME/go/bin" >> $GITHUB_PATH
+
+      - name: Create short commit SHA
+        id: vars
+        run: |
+          shortSha=$(git rev-parse --short ${{ github.sha }})
+          echo "COMMIT_SHORT_SHA=$shortSha" >> $GITHUB_ENV
+          echo "commit_sha=$shortSha" >> $GITHUB_OUTPUT
+
+      - name: Build RC+
+        run: |
+          SOURCE_DIR="./modpacks/simply-legacy/${{ matrix.platform }}/yarn/${{ matrix.version }}"
+          TEMP_DIR="build-temp-${{ matrix.platform }}-${{ matrix.version }}"
+          mkdir -p "$TEMP_DIR"
+          cp -a "$SOURCE_DIR/." "./$TEMP_DIR/"
+          cd "./$TEMP_DIR"
+          packwiz refresh
+          mkdir -p "../$OUTPUT"
+          packwiz ${{ matrix.packwiz_platform }} export --output "../${OUTPUT}/${{ env.PACK_NAME }}-${{ matrix.version }}-${{ matrix.platform }}-${{ env.COMMIT_SHORT_SHA }}.${{ matrix.file_ext }}"
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "Simply-Legacy-${{ matrix.version }}-${{ matrix.platform }}-${{ env.COMMIT_SHORT_SHA }}"
+          path: artifacts
+
+  combine:
+    needs: build
+    runs-on: technocality
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: downloaded-artifacts
+          
+      - name: Combine and Upload
+        run: |
+          mkdir combined
+          find downloaded-artifacts -type f \( -name "*.mrpack" -o -name "*.zip" \) -exec cp {} combined/ \;
+          
+      - name: Final Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: "simply-legacy-${{ needs.build.outputs.commit_sha }}"
+          path: combined

.gitignore

@@ -11,3 +11,19 @@ modpacks/*/Logs
 /modpacks/re-console/mr/yarn/1.21.10-fabric/Logs
 /modpacks/simply-legacy/cf/yarn/1.21.10-fabric/Logs
 /modpacks/gold-not-old/mr/yarn/1.21.11-fabric/Logs
+# IntelliJ
+.idea/
+*.iml
+*.ipr
+*.iws
+# Visual Studio Code
+.settings/
+.vscode/
+bin/
+.classpath
+.project
+# Logs and errors
+hs_err_*.log
+replay_*.log
+*.hprof
+*.jfr

modpacks/re-console+/mr/yarn/1.21.10-fabric/mods/zfastnoise.pw.toml

@@ -1,13 +0,0 @@
-name = "Fast Noise"
-filename = "zfastnoise-1.0.19+1.21.9.jar"
-side = "server"
-
-[download]
-url = "https://cdn.modrinth.com/data/OnlVIpq5/versions/gFkoaoo8/zfastnoise-1.0.19%2B1.21.9.jar"
-hash-format = "sha512"
-hash = "9f2b59094617a33900cc128385b14e9ce64f349a15c360dc8567aaf923a763f98db3671584975ce472184e491e2e1252cd1da5070b2f3dd33d93ea079a964949"
-
-[update]
-[update.modrinth]
-mod-id = "OnlVIpq5"
-version = "gFkoaoo8"