Merge pull request #142 from LandOfRails/develop

Release 1.3.0
LandOfRails · Dec 20, 2023 · 467e7b6 · 467e7b6
2 parents 084c6ff + 7ae0f3e
commit 467e7b6
Show file tree

Hide file tree

Showing 71 changed files with 886 additions and 1,616 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [ 1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge ]
+        branch: [ 1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge, 1.17.1-forge, 1.18.2-forge, 1.19.4-forge, 1.20.1-forge ]
+      fail-fast: false
 
     steps:
       - uses: actions/checkout@v3
@@ -28,16 +29,10 @@ jobs:
           java-version: '8'
       - name: Install deps
         run: sudo apt install -y pngquant findutils xvfb
-      - name: Hack Forge Gradle
-        run: mkdir -p ~/.gradle/caches/minecraft/; wget 'https://teamopenindustry.cc/maven/hack/ForgeGradleVersion.json' -O ~/.gradle/caches/minecraft/ForgeGradleVersion.json
       - name: Setup Universal Mod Core (and helpers)
         env:
           BRANCH: ${{ matrix.branch }}
-        run: ./gradlew umc -D umc.loader=${BRANCH} -D ssh.http=true
-      - name: Hack Forge Gradle Part Two
-        env:
-          BRANCH: ${{ matrix.branch }}
-        run: git apply --ignore-space-change --ignore-whitespace ${BRANCH}.patch || true
+        run: java -jar UMCSetup.jar ${BRANCH} https
       - name: Gradle compile
         run: ./gradlew classes
       - name: Process images
@@ -46,7 +41,13 @@ jobs:
         run: xvfb-run --auto-servernum ./gradlew runData || xvfb-run --auto-servernum ./gradlew runData || true
       - name: Gradle build
         run: ./gradlew build
-      - uses: actions/upload-artifact@v3
+      - name: Download UMC version used for build
+        run: |
+          umc_link=$(./gradlew showBuildInfo | grep "universalmodcore")
+          wget $umc_link -P build/libs/
+      - uses: actions/upload-artifact@v4
         with:
           name: LandOfSignals ${{matrix.branch}}
-          path: build/libs/LandOfSignals-${{matrix.branch}}-*
+          path: |
+            build/libs/LandOfSignals-${{matrix.branch}}-*
+            build/libs/UniversalModCore-*
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,5 +1,4 @@
 name: LandOfSignals Publish Pipeline
-
 on:
   workflow_dispatch:
     inputs:
@@ -30,23 +29,21 @@ jobs:
       - name: Replace version number with new version
         run: |
           sed -i 's/public static final String VERSION.*/public static final String VERSION = "${{ steps.getversion.outputs.version }}";/' src/main/java/net/landofrails/landofsignals/LandOfSignals.java
-          sed -i "s/String version =.*/String version = '${{ steps.getversion.outputs.version }}'/" ./build.gradle
-          sed -i 's/"version":.*/"version": "${{ steps.getversion.outputs.version }}",/' src/main/resources/mcmod.info
+          sed -i '0,/"version":.*/s//"version": "${{ steps.getversion.outputs.version }}",/' ./umc.json
       - name: Commit and push changes
         run: |
           git config --global user.name "MarkenJaden"
           git config --global user.email "jjsch1410@gmail.com"
           git add -A
           git diff-index --quiet HEAD || git commit -m "Updated mod version"
           git push
-
   build:
     runs-on: ubuntu-latest
     needs: [ versioncommit ]
     strategy:
       max-parallel: 1
       matrix:
-        branch: [ 1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge ]
+        branch: [1.7.10-forge, 1.10.2-forge, 1.11.2-forge, 1.12.2-forge, 1.14.4-forge, 1.15.2-forge, 1.16.5-forge]
         include:
           - branch: 1.7.10-forge
             version: 1.7.10
@@ -71,16 +68,10 @@ jobs:
           java-version: '8'
       - name: Install deps
         run: sudo apt install -y pngquant findutils xvfb
-      - name: Hack Forge Gradle
-        run: mkdir -p ~/.gradle/caches/minecraft/; wget 'https://teamopenindustry.cc/maven/hack/ForgeGradleVersion.json' -O ~/.gradle/caches/minecraft/ForgeGradleVersion.json
       - name: Setup Universal Mod Core (and helpers)
         env:
           BRANCH: ${{ matrix.branch }}
-        run: ./gradlew umc -D umc.loader=${BRANCH} -D ssh.http=true -Dtarget=release
-      - name: Hack Forge Gradle Part Two
-        env:
-          BRANCH: ${{ matrix.branch }}
-        run: git apply --ignore-space-change --ignore-whitespace ${BRANCH}.patch || true
+        run: java -jar UMCSetup.jar ${BRANCH} https
       - name: Gradle compile
         run: ./gradlew classes
       - name: Process images
@@ -104,7 +95,7 @@ jobs:
         run: |
           ls ./build/libs/
           mv -n build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}.jar build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}.jar
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: LandOfSignals ${{matrix.branch}}
           path: build/libs/LandOfSignals-${{matrix.branch}}-${{ steps.getversion.outputs.version }}${{ steps.getsuffix.outputs.suffix }}.jar
@@ -116,7 +107,6 @@ jobs:
           modrinth-featured: true
           modrinth-unfeature-mode: subset
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-
           # CurseForge
           curseforge-id: 434307
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -136,11 +126,9 @@ jobs:
             ${{ matrix.version }}
           java: |
             8
-
           retry-attempts: 2
           retry-delay: 10000
           fail-mode: fail
-
   package:
     runs-on: ubuntu-latest
     needs: [ build ]
@@ -184,7 +172,6 @@ jobs:
             1.16.5
           java: |
             8
-
           retry-attempts: 2
           retry-delay: 10000
           fail-mode: fail
diff --git a/.github/workflows/pullrequest.md b/.github/workflows/pullrequest.md
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -0,0 +1,35 @@
+name: Change version pipeline
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number for this release'
+        required: true
+        default: '1.2.0'
+        type: string
+      suffix:
+        description: 'Suffix to this release'
+        required: false
+        type: string
+
+jobs:
+  versioncommit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAT }}
+      - name: Replace version number with new version
+        run: |
+          sed -i 's/public static final String VERSION.*/public static final String VERSION = "${{ inputs.version }}";/' src/main/java/net/landofrails/landofsignals/LandOfSignals.java
+          sed -i '0,/"version":.*/s//"version": "${{ inputs.version }}",/' ./umc.json
+          echo ${{ inputs.version }} > VERSION
+          echo ${{ inputs.suffix }} > SUFFIX
+      - name: Commit and push changes
+        run: |
+          git config --global user.name "MarkenJaden"
+          git config --global user.email "jjsch1410@gmail.com"
+          git add -A
+          git diff-index --quiet HEAD || git commit -m "Updated mod version"
+          git push
diff --git a/.gitignore b/.gitignore
@@ -135,6 +135,10 @@ hs_err_pid*
 .gradle
 build/
 
+## Built JARs
+*.jar
+!UMCSetup.jar
+
 # Ignore Gradle GUI config
 gradle-app.setting
 
@@ -152,3 +156,10 @@ gradle-app.setting
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij+all,java,gradle,forgegradle
 /bin/
+
+## Generated
+build.gradle
+UMC.md
+gradle/wrapper/gradle-wrapper.properties
+src/main/java/net/landofrails/landofsignals/Mod.java
+src/main/resources/mcmod.info
diff --git a/1.7.10-forge.patch b/1.7.10-forge.patch