From bbceb8df0709df9c32065c4c6fa227846d00f197 Mon Sep 17 00:00:00 2001 From: "Plamen K. Kosseff" Date: Thu, 12 Aug 2021 00:38:04 +0300 Subject: [PATCH 1/2] fixes #39 --- .github/workflows/auto-release.yml | 52 ------------------- .github/workflows/gradle.yml | 4 +- build.gradle.kts | 2 +- changelog.md | 10 ++-- platforms/forge-1.16/build.gradle.kts | 3 ++ .../src/main/resources/mixins.ipnext.json | 1 + 6 files changed, 14 insertions(+), 58 deletions(-) delete mode 100644 .github/workflows/auto-release.yml diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml deleted file mode 100644 index 01b7e8a0b..000000000 --- a/.github/workflows/auto-release.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: "tagged-release" - -# Controls when the action will run. -on: - push: - tags: - - "v*" -jobs: - gh_tagged_release: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up JDK 16 - uses: actions/setup-java@v2 - with: - java-version: '16' - distribution: 'adopt' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b - - name: Cache Gradle packages - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - env: - CURSEFORGE_DEPOY_TOKEN: ${{ secrets.CURSEFORGE_DEPOY_TOKEN }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - IPNEXT_RELEASE: "yes" - run: ./gradlew build curseforge publishModrinth - - name: Release - uses: softprops/action-gh-release@v1 - with: - files: build/libs/*.jar - body_path: changelog.md - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Cleanup Gradle Cache - # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # Restoring these files from a GitHub Actions cache might cause problems for future builds. - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 24e9cbfe3..8b6e64f61 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -5,9 +5,9 @@ name: CI on: push: - branches: [ all-in-one ] + branches: [ v0.8.fixes ] pull_request: - branches: [ all-in-one ] + branches: [ v0.8.fixes ] jobs: build: diff --git a/build.gradle.kts b/build.gradle.kts index 62346773d..926f65d6b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { } } -val versionObj = Version("0", "8", "5", +val versionObj = Version("0", "8", "6", preRelease = (System.getenv("IPNEXT_RELEASE") == null)) diff --git a/changelog.md b/changelog.md index 2b83770e6..0406bdfa7 100644 --- a/changelog.md +++ b/changelog.md @@ -1,8 +1,7 @@ -### 0.8.5 -- Fixed problem in Forge mods that made sorting impossible if the inventory/container has more than 1 enchanted item with same enchants, same item type, and same name and items were arranged in specific way. -- Added hotkey for reloading the mod configurations. It's recommended that it's only used while defining new custom rules and kept unset in other situations. +### 0.8.6 +- Fixed issue with Forge mixin handling that causes incompatibility with [Timeless and Classics](https://www.curseforge.com/minecraft/mc-mods/timeless-and-classic) and [I18nUpdateMod](https://www.curseforge.com/minecraft/mc-mods/i18nupdatemod), and possibly others ### Known Issues in Forge 1.17.1 due to missing MixIn support - Preventing swipe moving of locked slots doesn't work. @@ -12,6 +11,11 @@ +### 0.8.5 +- Fixed problem in Forge mods that made sorting impossible if the inventory/container has more than 1 enchanted item with same enchants, same item type, and same name and items were arranged in specific way. +- Added hotkey for reloading the mod configurations. It's recommended that it's only used while defining new custom rules and kept unset in other situations. + + ### 0.8.4 - Fixes locked slots behaviour when changing dimensions/worlds. There is new config that allows the user to control how many client ticks need to pass before the locked slot keeper is reinitialised on dimension/world change. This wait is necessary because the inventory might be empty when the player is spawned in the new dimension/world and we need to wait to receive the inventory content from the server. diff --git a/platforms/forge-1.16/build.gradle.kts b/platforms/forge-1.16/build.gradle.kts index 136975ff4..28aad9142 100644 --- a/platforms/forge-1.16/build.gradle.kts +++ b/platforms/forge-1.16/build.gradle.kts @@ -109,6 +109,9 @@ tasks.register("copyMixinMappings") { val outName = layout.buildDirectory.file("resources/main/") from (inName) into (outName) + rename { + "ipnext.refmap.json" + } } diff --git a/platforms/forge-1.16/src/main/resources/mixins.ipnext.json b/platforms/forge-1.16/src/main/resources/mixins.ipnext.json index d39968df5..ea872bf78 100644 --- a/platforms/forge-1.16/src/main/resources/mixins.ipnext.json +++ b/platforms/forge-1.16/src/main/resources/mixins.ipnext.json @@ -3,6 +3,7 @@ "minVersion": "0.8", "package": "org.anti_ad.mc.ipnext.mixin", "compatibilityLevel": "JAVA_8", + "refmap": "ipnext.refmap.json", "mixins": [ ], From 86052a9036d054bca1ad7f97259f53873dbe2b74 Mon Sep 17 00:00:00 2001 From: "Plamen K. Kosseff" Date: Thu, 12 Aug 2021 01:07:15 +0300 Subject: [PATCH 2/2] try to release again --- .github/workflows/auto-release.yml | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/workflows/auto-release.yml diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml new file mode 100644 index 000000000..01b7e8a0b --- /dev/null +++ b/.github/workflows/auto-release.yml @@ -0,0 +1,52 @@ +# This is a basic workflow to help you get started with Actions + +name: "tagged-release" + +# Controls when the action will run. +on: + push: + tags: + - "v*" +jobs: + gh_tagged_release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up JDK 16 + uses: actions/setup-java@v2 + with: + java-version: '16' + distribution: 'adopt' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + env: + CURSEFORGE_DEPOY_TOKEN: ${{ secrets.CURSEFORGE_DEPOY_TOKEN }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + IPNEXT_RELEASE: "yes" + run: ./gradlew build curseforge publishModrinth + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: build/libs/*.jar + body_path: changelog.md + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Cleanup Gradle Cache + # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. + # Restoring these files from a GitHub Actions cache might cause problems for future builds. + run: | + rm -f ~/.gradle/caches/modules-2/modules-2.lock + rm -f ~/.gradle/caches/modules-2/gc.properties