From 2c2c4afda7fd1c7469928282551b8f57bdb10b44 Mon Sep 17 00:00:00 2001
From: "Gili \"OpenBagTwo\" Barlev" <openbagtwo@gmail.com>
Date: Fri, 18 Oct 2024 10:23:59 -0400
Subject: [PATCH 1/2] FIX: Player was no longer visibly "playing" their
 instrument

---
 .../openbagtwo/foxnap/instruments/SecretlyJustAGoatHorn.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/net/openbagtwo/foxnap/instruments/SecretlyJustAGoatHorn.java b/src/main/java/net/openbagtwo/foxnap/instruments/SecretlyJustAGoatHorn.java
index 933f6d2..2455512 100644
--- a/src/main/java/net/openbagtwo/foxnap/instruments/SecretlyJustAGoatHorn.java
+++ b/src/main/java/net/openbagtwo/foxnap/instruments/SecretlyJustAGoatHorn.java
@@ -71,4 +71,8 @@ private static void playSound(World world, PlayerEntity player, SoundEvent sound
     );
   }
 
+  @Override
+  public int getMaxUseTime(ItemStack stack) {
+    return this.cooldown;
+  }
 }

From 14ec34061c897d5867080e88d3dcca4e1a5c0ba6 Mon Sep 17 00:00:00 2001
From: "Gili \"OpenBagTwo\" Barlev" <openbagtwo@gmail.com>
Date: Sat, 3 Aug 2024 18:52:12 -0400
Subject: [PATCH 2/2] Backport CI changes

---
 .github/workflows/build_mod.yml |  6 +++---
 .github/workflows/build_rpg.yml | 20 ++++++++++----------
 .github/workflows/lint.yml      | 18 +++++++++---------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_mod.yml b/.github/workflows/build_mod.yml
index f17744a..f1dda08 100644
--- a/.github/workflows/build_mod.yml
+++ b/.github/workflows/build_mod.yml
@@ -21,13 +21,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # TODO: try removing this after the initial release
       - name: validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'  # is there a reason Fabric uses Microsoft?
@@ -36,7 +36,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: build/libs/
diff --git a/.github/workflows/build_rpg.yml b/.github/workflows/build_rpg.yml
index ee7aeb4..575a3e5 100644
--- a/.github/workflows/build_rpg.yml
+++ b/.github/workflows/build_rpg.yml
@@ -6,25 +6,25 @@ on: # run on any push to the primary branch
   pull_request:
   push:
     branches:
-      - 1.20.5
+      - 1.21.2
 
 jobs:
   test_and_build_rpg:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, windows-2019, macos-11 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # TODO: try removing this after the initial release
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: Cache ffmpeg binaries
         id: cache-ffmpeg
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: ffmpeg-cache
         with:
@@ -90,7 +90,7 @@ jobs:
           pyinstaller launcher.py --console --onefile -n FoxNapRPG --collect-all foxnap_rpg
       - name: Cache integration test music
         id: cache-music
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: music-cache
         with:
@@ -99,7 +99,7 @@ jobs:
       - name: Download music for integration test
         if: ${{ steps.cache-music.outputs.cache-hit != 'true' }}
         run: |
-          curl --create-dirs -JL "https://archive.org/compress/gustav-holst-the-planets-op.-32/formats=VBR%20MP3&file=/gustav-holst-the-planets-op.-32.zip" --output music/holst-the-planets.zip
+          curl --create-dirs -JL "https://openbagtwo.github.io/ThePlanets.zip" --output music/holst-the-planets.zip
       - name: Extract integration test music
         run: |
           python -c "from zipfile import ZipFile; zip = ZipFile('music/holst-the-planets.zip'); zip.extractall('build/dist')"
@@ -107,7 +107,7 @@ jobs:
         run: |
           python run_integration_tests.py build/dist/FoxNapRPG 7
       - name: capture build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ResourcepackGenerator-${{ runner.os }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2789451..b2d28f0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -4,18 +4,18 @@
 # them.
 
 name: lint
-on:  # so lightweight I have zero qualms about doing it on all branches
-    push:
+on: # so lightweight I have zero qualms about doing it on all branches
+  push:
 
 jobs:
   lint-python:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - name: Install package and dependencies
         run: |
           python -m pip install --upgrade pip
@@ -25,6 +25,6 @@ jobs:
         run: |
           isort . --profile="black"
           black foxnap_rpg
-      - name: Type check with mypy
-        run: |
-          mypy foxnap_rpg --exclude build
+#      - name: Type check with mypy
+#        run: |
+#          mypy foxnap_rpg --exclude build