From 72273ad193b20a25626994e6743fd08ac87a9695 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 26 Jul 2024 20:57:28 +0200 Subject: [PATCH] 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 ++++ build.gradle.kts | 2 +- gradle.properties | 4 ++-- .../trinkets/TrinketsRefinedStoragePlugin.java | 10 +++++----- .../refinedstorage/trinkets/TrinketsSlotReference.java | 4 ++-- .../trinkets/TrinketsSlotReferenceFactory.java | 4 ++-- .../trinkets/TrinketsSlotReferenceProvider.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 16 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 869dafc..9875be5 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.7 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.9 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 31fd136..d1b6a91 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.7 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.9 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 59ca50f..054bce1 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.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index e65bdef..cf673d7 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.7 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.9 secrets: inherit with: project-name: 'Refined Storage - Trinkets Integration' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 85e717b..627e0f5 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.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index b13799f..944aa08 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.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 47db6c5..218f86e 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.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.9 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index ea9f66e..b70a80d 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.7 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.9 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d8daf5..bb77745 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.5. + ## [0.2.0] - 2024-07-20 ### Changed diff --git a/build.gradle.kts b/build.gradle.kts index c838108..f9bd96d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -45,7 +45,7 @@ val trinketsVersion: String by project val cardinalComponentsVersion: String by project dependencies { - modApi("com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}") + modApi("com.refinedmods.refinedstorage:refinedstorage-fabric:${refinedstorageVersion}") modApi("dev.emi:trinkets:${trinketsVersion}") modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${cardinalComponentsVersion}") modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${cardinalComponentsVersion}") diff --git a/gradle.properties b/gradle.properties index bf28ee2..3c86781 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -refinedarchitectVersion=0.16.7 -refinedstorageVersion=2.0.0-milestone.4.4 +refinedarchitectVersion=0.16.9 +refinedstorageVersion=2.0.0-milestone.4.5 # https://www.curseforge.com/minecraft/mc-mods/trinkets/files trinketsVersion=3.10.0 cardinalComponentsVersion=6.1.0 diff --git a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsRefinedStoragePlugin.java b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsRefinedStoragePlugin.java index ed3a220..ac892cf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsRefinedStoragePlugin.java +++ b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsRefinedStoragePlugin.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.trinkets; -import com.refinedmods.refinedstorage.platform.api.PlatformApi; -import com.refinedmods.refinedstorage.platform.api.RefinedStoragePlugin; +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.fabric.api.RefinedStoragePlugin; import net.minecraft.resources.ResourceLocation; @@ -9,11 +9,11 @@ public class TrinketsRefinedStoragePlugin implements RefinedStoragePlugin { public static final String ID = "refinedstorage_trinkets_integration"; @Override - public void onPlatformApiAvailable(final PlatformApi platformApi) { - PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register( + public void onApiAvailable(final RefinedStorageApi api) { + api.getSlotReferenceFactoryRegistry().register( ResourceLocation.fromNamespaceAndPath(ID, "trinkets"), TrinketsSlotReferenceFactory.INSTANCE ); - PlatformApi.INSTANCE.addSlotReferenceProvider(new TrinketsSlotReferenceProvider()); + api.addSlotReferenceProvider(new TrinketsSlotReferenceProvider()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReference.java b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReference.java index dc0100e..5e44e62 100644 --- a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReference.java +++ b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReference.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.trinkets; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import java.util.Optional; diff --git a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceFactory.java b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceFactory.java index 436c260..a41884a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceFactory.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.trinkets; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceFactory; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceProvider.java b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceProvider.java index 8b6596a..a31c10d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/trinkets/TrinketsSlotReferenceProvider.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.trinkets; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReference; -import com.refinedmods.refinedstorage.platform.api.support.slotreference.SlotReferenceProvider; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference; +import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceProvider; import java.util.Collections; import java.util.List; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d72897d..2ab7a40 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ "fabricloader": ">=0.14.6", "fabric-api": "*", "minecraft": "~1.21", - "refinedstorage": "*", + "refinedstorage": ">=2.0.0-milestone.4.5", "trinkets": ">=3.8", "java": ">=17" }