Port to Neoforge 1.20.2

AppliedEnergistics · Nov 11, 2023 · 72693d7 · 72693d7
1 parent 5c6c1f4
commit 72693d7
Show file tree

Hide file tree

Showing 595 changed files with 10,927 additions and 10,487 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,8 +42,8 @@ jobs:
       - name: Build PR with Gradle
         run: ./gradlew build
         if: github.event_name != 'pull_request'
-      - name: Run Game Tests
-        run: ./gradlew runGametest
+      #- name: Run Game Tests
+      #  run: ./gradlew runGametest
       - name: Upload new Source Text Strings to Crowdin
         run: ./gradlew uploadToCrowdin
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,12 +33,12 @@ jobs:
       - name: Prepare artifact metadata. Note that VERSION is set by the gradle script.
         id: prepare_artifact_metadata
         run: |
-          echo ARTIFACT_PATH=./build/libs/appliedenergistics2-fabric-${VERSION}.jar >> $GITHUB_OUTPUT
-          echo ARTIFACT_NAME=appliedenergistics2-fabric-${VERSION}.jar >> $GITHUB_OUTPUT
-          echo JAVADOC_PATH=./build/libs/appliedenergistics2-fabric-${VERSION}-javadoc.jar >> $GITHUB_OUTPUT
-          echo JAVADOC_NAME=appliedenergistics2-fabric-${VERSION}-javadoc.jar >> $GITHUB_OUTPUT
-          echo API_PATH=./build/libs/appliedenergistics2-fabric-${VERSION}-api.jar >> $GITHUB_OUTPUT
-          echo API_NAME=appliedenergistics2-fabric-${VERSION}-api.jar >> $GITHUB_OUTPUT
+          echo ARTIFACT_PATH=./build/libs/appliedenergistics2-forge-${VERSION}.jar >> $GITHUB_OUTPUT
+          echo ARTIFACT_NAME=appliedenergistics2-forge-${VERSION}.jar >> $GITHUB_OUTPUT
+          echo JAVADOC_PATH=./build/libs/appliedenergistics2-forge-${VERSION}-javadoc.jar >> $GITHUB_OUTPUT
+          echo JAVADOC_NAME=appliedenergistics2-forge-${VERSION}-javadoc.jar >> $GITHUB_OUTPUT
+          echo API_PATH=./build/libs/appliedenergistics2-forge-${VERSION}-api.jar >> $GITHUB_OUTPUT
+          echo API_NAME=appliedenergistics2-forge-${VERSION}-api.jar >> $GITHUB_OUTPUT
           echo VERSION=${VERSION} >> $GITHUB_OUTPUT
       - name: Archive build results
         # It is important to  archive .gradle as well since gradle stores the incremental build state there
@@ -126,16 +126,21 @@ jobs:
       - name: Upload to Curseforge
         uses: Kir-Antipov/mc-publish@4db8bd126f74d5e143822181a2b1201308e2c796
         with:
-          name: AE2 ${{ needs.build.outputs.VERSION }} [FABRIC]
+          name: AE2 ${{ needs.build.outputs.VERSION }} [NEOFORGE]
           version: ${{ needs.build.outputs.VERSION }}
           files: ${{ needs.build.outputs.ARTIFACT_PATH }}
           dependencies: |
             jade(optional){modrinth:nvQzSEkH}{curseforge:324717}
             wthit(optional){modrinth:6AQIaxuO}{curseforge:440979}
             rei(optional){modrinth:nfn13YXA}{curseforge:310111}
             jei(optional){modrinth:u6dRKJwZ}{curseforge:238222}
+            optifine(incompatible)
+            theoneprobe(optional){modrinth:Eyw0UxEx}{curseforge:245211}
           curseforge-id: 223794
           curseforge-token: ${{ secrets.CURSEFORGE }}
+          loaders: |
+            neoforge
+            forge
 
   deploy-modmaven:
     name: Deploy to Modmaven
@@ -174,13 +179,18 @@ jobs:
       - name: Upload to Modrinth
         uses: Kir-Antipov/mc-publish@4db8bd126f74d5e143822181a2b1201308e2c796
         with:
-          name: AE2 ${{ needs.build.outputs.VERSION }} [FABRIC]
+          name: AE2 ${{ needs.build.outputs.VERSION }} [NEOFORGE]
           version: ${{ needs.build.outputs.VERSION }}
           files: ${{ needs.build.outputs.ARTIFACT_PATH }}
           dependencies: |
             jade(optional){modrinth:nvQzSEkH}{curseforge:324717}
             wthit(optional){modrinth:6AQIaxuO}{curseforge:440979}
             rei(optional){modrinth:nfn13YXA}{curseforge:310111}
             jei(optional){modrinth:u6dRKJwZ}{curseforge:238222}
+            optifine(incompatible)
+            theoneprobe(optional){modrinth:Eyw0UxEx}{curseforge:245211}
           modrinth-id: XxWD5pD3
           modrinth-token: ${{ secrets.MODRINTH }}
+          loaders: |
+            neoforge
+            forge