Merge branch 'dev/avalon/main' into dev/avalon/chemistryrework

.editorconfig

@@ -399,9 +399,15 @@ ij_markdown_max_lines_between_paragraphs = 1
 ij_markdown_min_lines_around_block_elements = 1
 ij_markdown_min_lines_around_header = 1
 ij_markdown_min_lines_between_paragraphs = 1
-ij_markdown_wrap_text_if_long = true
+ij_markdown_wrap_text_if_long = false
 ij_markdown_wrap_text_inside_blockquotes = true
 
+[**/ie_manual/**.md]
+ij_markdown_force_one_space_after_header_symbol = false
+ij_markdown_max_lines_around_header = 0
+ij_markdown_min_lines_around_header = 0
+
+
 [{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
 ij_toml_keep_indents_on_empty_lines = false
 

.github/workflows/optimize_assets.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Create Pull Request
         if: steps.verify-changed-files.outputs.files_changed == 'true'
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: Optimized Assets
           commit-message: optimized assets

.github/workflows/pr.yml

@@ -3,6 +3,13 @@ name: Check Pull Request
 on:
   pull_request:
     branches: [ "master", "dev/**" ]
+permissions:
+  contents: read
+  actions: read
+  checks: write
+env:
+  GITHUB_USERNAME: "CarverBot"
+  GITHUB_TOKEN: ${{ secrets.OPTIMIZATION_TOKEN }}
 
 jobs:
   assign-reviewer:
@@ -13,13 +20,11 @@ jobs:
         uses: hkusu/review-assign-action@v1
         with:
           assignees: Pabilo8
+          github-token: ${{ secrets.OPTIMIZATION_TOKEN }}
 
   check:
     runs-on: ubuntu-latest
-    name: Check Pull Request's Quality
-    env:
-      GITHUB_USERNAME: ${{ github.actor }}
-      GITHUB_TOKEN: ${{ secrets.OPTIMIZATION_TOKEN }}
+    name: Compile and Run Checks
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -42,6 +47,16 @@ jobs:
       - name: Run Unit Tests
         run: ./gradlew test
 
+      - name: Test Report
+        uses: phoenix-actions/test-reporting@v15
+        id: test-report               # Set ID reference for step
+        if: success() || failure()    # run this step even if previous step failed
+        with:
+          name: Tests            # Name of the check run which will be created
+          path: build/test-results/test/TEST-*.xml    # Path to test results
+          reporter: java-junit        # Format of test results
+          token: ${{ secrets.OPTIMIZATION_TOKEN }}
+
   notify-discord:
     runs-on: ubuntu-latest
     name: Notify Discord
@@ -50,10 +65,11 @@ jobs:
         uses: sebastianpopp/discord-action@releases/v2
         with:
           webhook: ${{ secrets.WH_PR_PRIVATE }}
-          message: "[@${{ github.event.pull_request.user.login }}](https://github.com/${{ github.event.pull_request.user.login }}) has contributed to Engineers' Cause with [${{ github.event.issue.title }}](https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }})."
+          message: "[@${{ github.event.pull_request.user.login }}](<https://github.com/${{ github.event.pull_request.user.login }}>) has contributed to Engineers' Cause with [${{ github.event.pull_request.title }}](<https://github.com/${{ github.repository }}/issues/${{ github.event.pull_request.number }}>)."
 
       - name: Notify Public Discord
+        if: ${{ github.event.pull_request.user.login != 'CarverBot' }}
         uses: sebastianpopp/discord-action@releases/v2
         with:
           webhook: ${{ secrets.WH_PR_PUBLIC }}
-          message: "[@${{ github.event.pull_request.user.login }}](https://github.com/${{ github.event.pull_request.user.login }}) has contributed to Engineers' Cause with [${{ github.event.issue.title }}](https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }})."
+          message: "[@${{ github.event.pull_request.user.login }}](<https://github.com/${{ github.event.pull_request.user.login }}>) has contributed to Engineers' Cause with [${{ github.event.pull_request.title }}](<https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}>)."

.github/workflows/push.yml

@@ -3,8 +3,49 @@ name: Commits Pushed
 on:
   push: #Trigger On Push
     branches: [ "dev/**" ]
+permissions:
+  contents: read
+  actions: read
+  checks: write
 
 jobs:
+  check:
+    runs-on: ubuntu-latest
+    name: Compile and Run Checks
+    env:
+      GITHUB_USERNAME: ${{ github.actor }}
+      GITHUB_TOKEN: ${{ secrets.OPTIMIZATION_TOKEN }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: corretto
+          java-version: 8
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v3
+
+      - name: Prepare Workspace
+        run: chmod +x gradlew ; ./gradlew setupDecompWorkspace
+
+      - name: Check for Compilation
+        run: ./gradlew compileJava
+
+      - name: Run Unit Tests
+        run: ./gradlew test
+
+      - name: Test Report
+        uses: phoenix-actions/test-reporting@v15
+        id: test-report               # Set ID reference for step
+        if: success() || failure()    # run this step even if previous step failed
+        with:
+          name: Tests            # Name of the check run which will be created
+          path: build/test-results/test/TEST-*.xml    # Path to test results
+          reporter: java-junit        # Format of test results
+
   notify-public-discord:
     continue-on-error: true
     name: Notify Public Discord

.github/workflows/task_added.yml

@@ -16,4 +16,4 @@ jobs:
         uses: sebastianpopp/discord-action@releases/v2
         with:
           webhook: ${{ secrets.WH_TASK_ADDED }}
-          message: "Task [${{ github.event.issue.title }}](https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}) has been added to the project."
+          message: "Task [${{ github.event.issue.title }}](<https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}>) has been added to the project."

.github/workflows/task_closed.yml

@@ -16,10 +16,10 @@ jobs:
         uses: sebastianpopp/discord-action@releases/v2
         with:
           webhook: ${{ secrets.WH_TASK_COMPLETE_PRIVATE }}
-          message: "Task [${{ github.event.issue.title }}](https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}) has been marked as completed."
+          message: "Task [${{ github.event.issue.title }}](<https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}>) has been marked as completed."
 
       - name: Notify Public Discord
         uses: sebastianpopp/discord-action@releases/v2
         with:
           webhook: ${{ secrets.WH_TASK_COMPLETE_PUBLIC }}
-          message: "Task [${{ github.event.issue.title }}](https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}) has been marked as completed."
+          message: "Task [${{ github.event.issue.title }}](<https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}>) has been marked as completed."

.github/workflows/task_reassign.yml

@@ -13,4 +13,4 @@ jobs:
         uses: sebastianpopp/discord-action@releases/v2
         with:
           webhook: ${{ secrets.WH_TASK_REASSIGN }}
-          message: "Issue [${{ github.event.issue.title }}](https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}) has been reassigned to [@${{ github.event.issue.assignee.login }}](https://github.com/${{ github.event.issue.assignee.login }})."
+          message: "Issue [${{ github.event.issue.title }}](<https://github.com/${{ github.repository }}/issues/${{ github.event.issue.number }}>) has been reassigned to [@${{ github.event.issue.assignee.login }}](<https://github.com/${{ github.event.issue.assignee.login }}>)."

.gitignore

@@ -25,8 +25,6 @@ bin/
 .gradle
 custom.gradle
 
-docs/
-
 # Forge
 run/
 hs_err_pid*
@@ -37,4 +35,13 @@ src/main/generated/*
 # System
 *Thumbs.db
 *.ini
-cert/II_CS.jks
+
+# Certs
+cert/*
+
+# Tests
+run_tests/
+
+# Act
+.secret
+custom.gradle.template