From d7841fa1518d59866339f723243348b7aee795bd Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 20 Jul 2024 20:29:48 +0200 Subject: [PATCH 01/16] docs: correct placement mistake --- .github/CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 76a468b..aeff2a9 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,9 +9,10 @@ or any other method with the owners of this repository before making a change. These are the most important things to know before contributing (also explained in more detail later in this document): - Commit messages must adhere to [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/). -- Branch names must be formatted correctly. The format is `{category}/GH-{issue number}/{lowercase-description}`. +- Branch names must be formatted correctly. The format is `{category}/GH-{issue number}/{lowercase-description}`. You + can also use `NO-ISSUE` instead of a GitHub issue number. Category must match a - category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). You can also use `NO-ISSUE` instead of a GitHub issue number. + category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). - We use [Checkstyle](https://checkstyle.sourceforge.io/) in our build workflow to validate coding style. It is recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml) or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your From 2c51c8450864390fd8a1ec09f4eb7d5de53b65c6 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:40 +0200 Subject: [PATCH 02/16] chore: update translation French from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/fr_fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/fr_fr.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/fr_fr.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/fr_fr.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/fr_fr.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From e64f892860f5ed1f4737b6602c7a85e3b0b125d6 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:41 +0200 Subject: [PATCH 03/16] chore: update translation Spanish from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/es_es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/es_es.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/es_es.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/es_es.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/es_es.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From dacf8f9d62fc1783923d39dd0d25bc6edd559ae7 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:41 +0200 Subject: [PATCH 04/16] chore: update translation German from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/de_de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/de_de.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/de_de.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/de_de.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/de_de.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 19b84a73e93803074771f4d60d833d6567c58a9a Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:42 +0200 Subject: [PATCH 05/16] chore: update translation Hungarian from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/hu_hu.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/hu_hu.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/hu_hu.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/hu_hu.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/hu_hu.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 8622ae2d119328ec21df720278b4bca42cd1ef72 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:43 +0200 Subject: [PATCH 06/16] chore: update translation Italian from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/it_it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/it_it.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/it_it.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/it_it.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/it_it.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From a74f1414277fb024b80fab7a2d89083c26682f0d Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:44 +0200 Subject: [PATCH 07/16] chore: update translation Japanese from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/ja_jp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ja_jp.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ja_jp.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ja_jp.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ja_jp.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 20f799f88c7610aaa08451e8b51a9e73d47213d3 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:45 +0200 Subject: [PATCH 08/16] chore: update translation Korean from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/ko_kr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ko_kr.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ko_kr.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ko_kr.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ko_kr.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 1ece32b7d78f73e0680edeb5f6e236961921aafc Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:46 +0200 Subject: [PATCH 09/16] chore: update translation Polish from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/pl_pl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pl_pl.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pl_pl.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pl_pl.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pl_pl.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 918a966c184599366b9d14c02b9d6680b49afaf5 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:47 +0200 Subject: [PATCH 10/16] chore: update translation Russian from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/ru_ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ru_ru.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ru_ru.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ru_ru.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/ru_ru.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 2b2e1a4a5fa687d2eb0a55a17866782a8536d9a6 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:48 +0200 Subject: [PATCH 11/16] chore: update translation Chinese Simplified from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_cn.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_cn.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_cn.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_cn.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From f2b43a997459b30c08e84d6dbc6bb0a0fd351e83 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:49 +0200 Subject: [PATCH 12/16] chore: update translation Chinese Traditional from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/zh_tw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_tw.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_tw.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_tw.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/zh_tw.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 7beb8d39fb332dc83ad17efaaee7f024f3a0aceb Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:50 +0200 Subject: [PATCH 13/16] chore: update translation Portuguese, Brazilian from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/pt_br.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pt_br.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pt_br.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pt_br.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/pt_br.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From ba3fb42229e1e0b8bb53ba9e29d41a800f914ca7 Mon Sep 17 00:00:00 2001 From: Raoul Date: Sat, 20 Jul 2024 20:47:51 +0200 Subject: [PATCH 14/16] chore: update translation Indonesian from crowdin --- .../assets/refinedstorage_trinkets_integration/lang/id_id.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/id_id.json b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/id_id.json index 8b59198..3d908b8 100644 --- a/src/main/resources/assets/refinedstorage_trinkets_integration/lang/id_id.json +++ b/src/main/resources/assets/refinedstorage_trinkets_integration/lang/id_id.json @@ -1,3 +1,3 @@ { - "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage" + "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage" } \ No newline at end of file From 72273ad193b20a25626994e6743fd08ac87a9695 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 26 Jul 2024 20:57:28 +0200 Subject: [PATCH 15/16] 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" } From 9b347edb82433b860da9c0e87e02cfa90cfc3c5d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 26 Jul 2024 18:58:06 +0000 Subject: [PATCH 16/16] chore: prepare release v0.2.1 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb77745..5f11ee2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.2.1] - 2024-07-26 + ### Fixed - Support for Refined Storage v2.0.0-milestone.4.5. @@ -24,7 +26,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Initial release. -[Unreleased]: https://github.com/refinedmods/refinedstorage-trinkets-integration/compare/v0.2.0...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage-trinkets-integration/compare/v0.2.1...HEAD + +[0.2.1]: https://github.com/refinedmods/refinedstorage-trinkets-integration/compare/v0.2.0...v0.2.1 [0.2.0]: https://github.com/refinedmods/refinedstorage-trinkets-integration/compare/v0.1.0...v0.2.0