From 1bf8292b65e53baf48387a8e225833cefd7841dc Mon Sep 17 00:00:00 2001 From: "Craig (Jeryn)" Date: Wed, 8 Jan 2025 13:46:24 +0000 Subject: [PATCH 1/4] - Bug fix: Fixed issue where End Dragon fight would not be checked correctly --- .github/workflows/github_release.yml | 37 +++++++++++++++++++ changelog.md | 3 +- .../control/flight/DimensionalControl.java | 2 +- fabric/build.gradle | 5 ++- 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/github_release.yml diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml new file mode 100644 index 000000000..f4166d308 --- /dev/null +++ b/.github/workflows/github_release.yml @@ -0,0 +1,37 @@ +name: Publish Minecraft Mod Release + +on: + push: + branches: + - mc/1.20.1 + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: '17' + + - name: Cache Gradle dependencies + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/settings.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Build Project + run: ./gradlew build + env: + JAVA_HOME: ${{ env.JAVA_HOME }} + + - name: Run Gradle githubRelease + run: ./gradlew githubRelease + env: + GITHUB_TOKEN: ${{ secrets.GITHUB }} diff --git a/changelog.md b/changelog.md index 7902181f9..ecfed6b09 100644 --- a/changelog.md +++ b/changelog.md @@ -9,7 +9,8 @@ - Bug Fix: Fixed Dedicated Servers on Fabric having issues loading data from disk (Caused dupe TARDIS and loss of Upgrades etc) - Bug Fix: Fixed Diagonal Windows Support - Bug fix: Fixed duplication happening on logging out mid-flight (and other occasions) - +- Bug fix: Fixed issue where End Dragon fight would not be checked correctly +- #### Textures and Models - Altered: Factory Console Emission Texture - Altered: Factory Console (Mint) Emission Texture diff --git a/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java b/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java index 0f3268095..1f9509b57 100644 --- a/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java +++ b/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java @@ -82,7 +82,7 @@ private boolean changeDim(TardisLevelOperator operator, ConsoleTheme theme, Cont // We want to filter out the end if the end hasn't been completed whilst the player is in flight. We can keep it pre-flight because we do some fancy sounds to tell the player // it's not an option. if (nextDimension.dimension() == Level.END && pilotManager.isInFlight()) { - if (!TardisHelper.hasTheEndBeenCompleted(pilotManager.getTargetLocation().getLevel())) { + if (!TardisHelper.hasTheEndBeenCompleted(nextDimension)) { nextIndex += forward ? 1 : -1; } } diff --git a/fabric/build.gradle b/fabric/build.gradle index c1dbf55ae..d81b1ad1a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -83,9 +83,10 @@ dependencies { include "dev.onyxstudios.cardinal-components-api:cardinal-components-world:${rootProject.cardinal_version}" include "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${rootProject.cardinal_version}" - modCompileOnly "com.terraformersmc:modmenu:${rootProject.mod_menu_version}" - modCompileOnly "curse.maven:jei-238222:${rootProject.jei_fabric_version}" + modImplementation "com.terraformersmc:modmenu:${rootProject.mod_menu_version}" + modImplementation "curse.maven:jei-238222:${rootProject.jei_fabric_version}" modImplementation "curse.maven:huge-structure-blocks-474114:4803539" + modImplementation "curse.maven:configured-457570:5180902" // Trinkets modCompileOnly ("dev.emi:trinkets:${rootProject.trinkets_version}") { From f3f84c1525759178b6c45a0a4e1561daf70a788f Mon Sep 17 00:00:00 2001 From: "Craig (Jeryn)" Date: Wed, 8 Jan 2025 13:47:58 +0000 Subject: [PATCH 2/4] Small test --- .github/workflows/github_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index f4166d308..5cb33e39d 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '17' + distribution: 'temurin' - name: Cache Gradle dependencies uses: actions/cache@v2 From f1059854ca68b95fe260b30c8f5d9f27edfea249 Mon Sep 17 00:00:00 2001 From: "Craig (Jeryn)" Date: Wed, 8 Jan 2025 13:48:46 +0000 Subject: [PATCH 3/4] Small test 2 --- .github/workflows/github_release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index 5cb33e39d..d4a4e5cf0 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -27,6 +27,9 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- + - name: Set executable permission for gradlew + run: chmod +x ./gradlew + - name: Build Project run: ./gradlew build env: From cf7015ff7d3a1455009d32f57ef2c221b1710c05 Mon Sep 17 00:00:00 2001 From: "Craig (Jeryn)" Date: Wed, 8 Jan 2025 13:58:48 +0000 Subject: [PATCH 4/4] Update github_release.yml --- .github/workflows/github_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index d4a4e5cf0..445ebf83c 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up JDK + - name: Set up JDK 17 uses: actions/setup-java@v2 with: java-version: '17'