Merge down from latest repo

.gitattributes

@@ -0,0 +1,11 @@
+# Use lf endings by default.
+* text=auto eol=lf
+
+# Declare text file types just in case
+*.java text
+*.yml text
+*.xml text
+*.md text
+
+# Exclude binary files
+*.png binary

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/automerge_dependabot.yml

@@ -0,0 +1,55 @@
+name: Auto-merge Dependabot PRs
+
+on:
+  workflow_run:
+    workflows: [ "Pull Request" ]
+    types: [ completed ]
+
+jobs:
+  merge-dependabot:
+    if: "github.actor == 'dependabot[bot]'
+      && github.event.workflow_run.event == 'pull_request'
+      && github.event.workflow_run.conclusion == 'success'"
+    runs-on: ubuntu-latest
+    steps:
+      # Note: this is directly from GitHub's example for using data from a triggering workflow:
+      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+      - name: 'Download artifact'
+        uses: actions/github-script@v8
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr_number"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_number.zip`, Buffer.from(download.data));
+
+      # This might be a useless use of cat, but I'm not sure what shell Actions is going to be running.
+      - name: Add Pull Number Variable
+        run: |-
+          unzip pr_number.zip
+          echo "PR_NUMBER=$(cat pr_number)" >> "$GITHUB_ENV"
+
+      - name: Approve
+        uses: hmarr/auto-approve-action@v4.0.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          pull-request-number: "${{ env.PR_NUMBER }}"
+      - name: Merge
+        uses: pascalgn/automerge-action@v0.16.4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_LABELS: "dependencies,java"
+          MERGE_METHOD: "squash"
+          PULL_REQUEST: "${{ env.PR_NUMBER }}"

.github/workflows/ci.yml

@@ -2,86 +2,46 @@ name: OpenInv CI
 
 on:
   push:
-  create:
-    types: [tag]
-  pull_request_target:
+    branches:
+      - 'master'
+    tags-ignore:
+      - '**'
+    paths-ignore:
+      - resource-pack/openinv-legibility-pack/**
+  # Enable running CI via other Actions, i.e. for drafting releases and handling PRs.
+  workflow_call:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v6
 
-      - name: Set Up Java
-        uses: actions/setup-java@v1
+      - uses: actions/setup-java@v5
         with:
-          java-version: 1.8
+          distribution: 'temurin'
+          java-version: '21'
 
-      # Use cache to speed up build
-      - name: Cache Maven Repo
-        uses: actions/cache@v2
-        id: cache
+      # We can't use 'maven' prebuilt cache setup because it requires that the project have a pom file.
+      # BuildTools installs to Maven local if available, so it's easier to just rely on that.
+      - name: Cache Spigot dependency
+        uses: actions/cache@v5
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          path: |
+            ~/.m2/repository/org/spigotmc/
+          key: ${{ runner.os }}-buildtools-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-buildtools-
 
-      # Install Spigot dependencies.
-      # This script uses Maven to check all required installations and ensure that they are present.
-      - name: Install Spigot Dependencies
-        run: . scripts/install_spigot_dependencies.sh
+      - uses: gradle/actions/setup-gradle@v5
 
-      - name: Build With Maven
-        run: mvn -e clean package -am -P all
+      - name: Build with Gradle
+        run: ./gradlew clean build
 
       # Upload artifacts
       - name: Upload Distributable Jar
         id: upload-final
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v6
         with:
           name: dist
-          path: ./target/OpenInv.jar
-      - name: Upload API Jar
-        id: upload-api
-        uses: actions/upload-artifact@v2
-        with:
-          name: api
-          path: ./api/target/openinvapi*.jar
-
-  release:
-    name: Create Github Release
-    needs: [ build ]
-    if: github.event_name == 'create' && github.event.ref_type == 'tag'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-
-      - name: Generate changelog
-        run: . scripts/generate_changelog.sh
-
-      - name: Create Release
-        id: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ env.GENERATED_CHANGELOG }}
-          draft: true
-          prerelease: false
-
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: ./OpenInv.jar
-          asset_name: OpenInv.jar
-          asset_content_type: application/java-archive
+          path: ./dist/*

.github/workflows/draft_release.yml

@@ -0,0 +1,36 @@
+name: Draft Github Release
+
+on:
+  push:
+    tags:
+      - '**'
+
+jobs:
+  run-ci:
+    uses: Jikoo/OpenInv/.github/workflows/ci.yml@master
+  draft-release:
+    needs: [ run-ci ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download build
+        uses: actions/download-artifact@v7
+        with:
+          name: dist
+          path: dist
+
+      - name: Create Release
+        id: create-release
+        uses: softprops/action-gh-release@v2.5.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          name: OpenInv ${{ env.VERSIONED_NAME }}
+          body: |-
+            ## Supported server versions
+            **Paper:** TODO VERSION, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.1  
+            **Spigot:** TODO VERSION
+
+            TODO HELLO HUMAN, PRESS THE GENERATE CHANGELOG BUTTON PLEASE.
+          draft: true
+          prerelease: false
+          files: ./dist/**

.github/workflows/external_release.yml

@@ -0,0 +1,97 @@
+name: Release to external sites
+
+on:
+  release:
+    types: [ released ]
+
+jobs:
+  curseforge_release:
+    runs-on: ubuntu-latest
+    steps:
+      - &parse-paper-versions
+        name: Parse Paper Versions
+        id: parse_versions
+        run: |
+          # Find line declaring Paper versions.
+          raw=$(grep "\\*\\*Paper:\\*\\*" <<< "${{ github.event.release.body }}")
+
+          # Enable extended glob pattern to match 0 or more whitespace characters.
+          shopt -s extglob
+          # Trim Paper versions identifier prefix.
+          raw=${raw/*([[:space:]])'**'Paper:'**'*([[:space:]])/}
+          # Replace commas and optional spaces with a newline.
+          raw=${raw//,*([[:space:]])/$'\n'}
+          # Turn extglob back off.
+          shopt -u extglob
+
+          echo "$raw"
+          printf "PAPER_VERSIONS<<EOF\n%s\nEOF\n" "$raw" >> "$GITHUB_OUTPUT"
+
+      - &fetch-release-asset
+        name: Fetch Github Release Asset
+        uses: dsaltares/fetch-gh-release-asset@1.1.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          version: ${{ github.event.release.id }}
+          file: OpenInv.jar
+
+      - name: Create CurseForge Release
+        uses: Kira-NT/mc-publish@v3.3
+        with:
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          curseforge-id: 31432
+          files: ./OpenInv.jar
+          game-versions: "${{ steps.parse_versions.outputs.PAPER_VERSIONS }}"
+          game-version-filter: releases
+
+  modrinth_release:
+    runs-on: ubuntu-latest
+    steps:
+      - *parse-paper-versions
+      - *fetch-release-asset
+
+      - name: Create Modrinth Release
+        uses: Kira-NT/mc-publish@v3.3
+        with:
+          modrinth-id: 1UlvXbzL
+          modrinth-featured: false
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          files: ./OpenInv.jar
+          game-versions: "${{ steps.parse_versions.outputs.PAPER_VERSIONS }}"
+          game-version-filter: releases
+
+  hangar_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Parse Hangar Paper Versions
+        id: parse_versions
+        run: |
+          # Find line declaring Paper versions.
+          raw=$(grep "\\*\\*Paper:\\*\\*" <<< "${{ github.event.release.body }}")
+          # Trim Paper versions identifier prefix.
+          raw=${raw/'**'Paper:'**'/}
+
+          # Generate JSON for Hangar. GitHub Actions provides jq 1.7 in the 24.04 image.
+          # Trim, then split on comma and optional spaces.
+          hangar_versions=$(jq -nc --arg versions "$raw" '{"PAPER": $versions | trim | split(", *";null)}')
+
+          echo "$hangar_versions"
+          echo "HANGAR_PAPER_VERSIONS=$hangar_versions" >> "$GITHUB_OUTPUT"
+
+      - *fetch-release-asset
+
+      - name: Create Hangar Release
+        uses: benwoo1110/hangar-upload-action@v1
+        with:
+          api_token: ${{ secrets.HANGAR_TOKEN }}
+          slug: 'OpenInv'
+          version: ${{ github.event.release.tag_name }}
+          channel: release
+          files: |-
+            [
+              {
+                "path": "./OpenInv.jar",
+                "platforms": ["PAPER"]
+              }
+            ]
+          platform_dependencies: "${{ steps.parse_versions.outputs.HANGAR_PAPER_VERSIONS }}"

.github/workflows/pull_request.yml

@@ -0,0 +1,22 @@
+name: Pull Request
+
+on:
+  pull_request:
+
+jobs:
+  run-ci:
+    uses: Jikoo/OpenInv/.github/workflows/ci.yml@master
+  store-dependabot-pr-data:
+    if: "github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'"
+    runs-on: ubuntu-latest
+    steps:
+      # Note: this is directly from GitHub's example for using data from a triggering workflow:
+      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+      - name: Store Pull Number
+        run: |
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/pr_number
+      - uses: actions/upload-artifact@v6
+        with:
+          name: pr_number
+          path: pr/

.github/workflows/resource_pack_ci.yml

@@ -0,0 +1,24 @@
+name: Resource Pack CI
+
+on:
+  push:
+    branches:
+      - 'master'
+    tags-ignore:
+      - '**'
+    paths:
+      - resource-pack/openinv-legibility-pack/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Build resource pack
+        id: upload-resource-pack
+        uses: actions/upload-artifact@v6
+        with:
+          name: openinv-legibility-pack
+          path: ./resource-pack/openinv-legibility-pack/
+          compression-level: 9

.gitignore

@@ -2,9 +2,12 @@
 **/.project
 **/.classpath
 **/.idea/
+**/.gradle/
 **.iml
 **/target/
 **/bin/
 **/out/
+**/build/
+**/dist/
 **/dependency-reduced-pom.xml
 **/pom.xml.versionsBackup