Merge pull request #13 from refinedmods/release/0.2.1

Release v0.2.1
refinedmods · Jul 26, 2024 · df61a67 · df61a67
2 parents 13cfa5b + 9b347ed
commit df61a67
Show file tree

Hide file tree

Showing 30 changed files with 48 additions and 39 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.9
diff --git 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
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.7
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.9
diff --git 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
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.9
diff --git 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
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.9
diff --git 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
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ 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.
+
 ## [0.2.0] - 2024-07-20
 
 ### Changed
@@ -20,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
 

diff --git 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
@@ -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
@@ -1,19 +1,19 @@
 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;
 
 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
@@ -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
@@ -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
@@ -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/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"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
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
@@ -1,3 +1,3 @@
 {
-  "trinkets.slot.refinedstorage_trinkets_integration.wireless": "Refined Storage"
+  "trinkets.slot.refinedstorage_trinkets_integration.refinedstorage": "Refined Storage"
 }
diff --git 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"
   }