From b4a843a3cb1e5c747ea3396cf0debbf28977723d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 19:17:25 +0200 Subject: [PATCH 1/2] chore: upgrade refined storage --- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .github/workflows/issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .github/workflows/validate-commit-messages.yml | 2 +- CHANGELOG.md | 4 ++++ gradle.properties | 6 +++--- .../refinedstorage/emi/common/EmiGridSynchronizer.java | 10 ++++++---- .../src/main/resources/fabric.mod.json | 2 +- .../src/main/resources/META-INF/neoforge.mods.toml | 2 +- 13 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9875be5..3ba2c44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.9 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.17.1 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index d1b6a91..e21ed03 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.9 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.17.1 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 054bce1..f8ce865 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 28c3797..673e76e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.9 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.17.1 secrets: inherit with: project-name: 'Refined Storage - EMI Integration' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 627e0f5..67112b4 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * *' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 944aa08..ce5e06e 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 218f86e..db04af1 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index b70a80d..043dba2 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.17.1 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 81ea2a2..21d35a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Support for Refined Storage v2.0.0-milestone.4.7. + ## [0.4.0] - 2024-08-08 ### Added diff --git a/gradle.properties b/gradle.properties index 8f7a637..89753fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -refinedarchitectVersion=0.16.9 -refinedstorageVersion=2.0.0-milestone.4.6 -emiVersion=1.1.10+1.21 +refinedarchitectVersion=0.17.1 +refinedstorageVersion=2.0.0-milestone.4.7 +emiVersion=1.1.11+1.21 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java index 3355f1e..82d12a4 100644 --- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java +++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java @@ -1,16 +1,18 @@ package com.refinedmods.refinedstorage.emi.common; -import com.refinedmods.refinedstorage.common.grid.AbstractGridSynchronizer; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.grid.NoopGridSynchronizer; import javax.annotation.Nullable; import dev.emi.emi.api.EmiApi; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; import static com.refinedmods.refinedstorage.emi.common.Common.MOD_ID; -class EmiGridSynchronizer extends AbstractGridSynchronizer { +class EmiGridSynchronizer implements GridSynchronizer { private static final MutableComponent TITLE = Component.translatable("gui.%s.grid.synchronizer".formatted(MOD_ID)); private static final MutableComponent TITLE_TWO_WAY = Component.translatable( "gui.%s.grid.synchronizer.two_way".formatted(MOD_ID) @@ -48,7 +50,7 @@ public String getTextToSynchronizeToGrid() { } @Override - public int getXTexture() { - return twoWay ? 32 : 48; + public ResourceLocation getSprite() { + return twoWay ? NoopGridSynchronizer.ON_TWO_WAY : NoopGridSynchronizer.ON; } } diff --git a/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json index ec1d971..6c2f57d 100644 --- a/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json +++ b/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "fabricloader": ">=0.14.6", "fabric-api": "*", "minecraft": "~1.21", - "refinedstorage": ">=2.0.0-milestone.4.5", + "refinedstorage": ">=2.0.0-milestone.4.7", "emi": ">=1.1.10", "java": ">=17" } diff --git a/refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml index b766a35..3ec6d7d 100644 --- a/refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -14,7 +14,7 @@ EMI integration for Refined Storage. [[dependencies.refinedstorage_emi_integration]] modId = "refinedstorage" type = "required" -versionRange = "2.0.0-milestone.4.5" +versionRange = "2.0.0-milestone.4.7" side = "BOTH" [[dependencies.refinedstorage_emi_integration]] modId = "emi" From 890d3c86a1ac0ec9e5e08129239a9e25072e8298 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 17:18:11 +0000 Subject: [PATCH 2/2] chore: prepare release v0.4.1 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21d35a5..6dc42d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.4.1] - 2024-08-11 + ### Fixed - Support for Refined Storage v2.0.0-milestone.4.7. @@ -61,7 +63,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Recipe transfer integration for the Crafting Grid. - Grid / EMI search box synchronization options. -[Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.4.0...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.4.1...HEAD + +[0.4.1]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.4.0...v0.4.1 [0.4.0]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.3.2...v0.4.0