Merge pull request #28 from refinedmods/release/0.3.1

Release v0.3.1
refinedmods · Aug 11, 2024 · 3e33fbe · 3e33fbe
2 parents 1c70c85 + f119db5
commit 3e33fbe
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 21 deletions.
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.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
@@ -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
@@ -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
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.17.1
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.9
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.17.1
     secrets: inherit
     with:
       project-name: 'Refined Storage - REI 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.9
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1
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.9
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.17.1
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.9
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.17.1
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.9
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.17.1
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.3.1] - 2024-08-11
+
+### Fixed
+
+-   Support for Refined Storage v2.0.0-milestone.4.7.
+
 ## [0.3.0] - 2024-08-08
 
 ### Added
@@ -63,7 +69,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Support for REI collapsable entries.
 -   Grid / REI search box synchronization options.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.0...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.1...HEAD
+
+[0.3.1]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.0...v0.3.1
 
 [0.3.0]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.2.2...v0.3.0
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-refinedarchitectVersion=0.16.9
-refinedstorageVersion=2.0.0-milestone.4.6
+refinedarchitectVersion=0.17.1
+refinedstorageVersion=2.0.0-milestone.4.7
 # https://linkie.shedaniel.dev/dependencies?loader=neoforge&version=1.21
 # https://linkie.shedaniel.dev/dependencies?loader=fabric&version=1.21
 architecturyVersion=13.0.3

diff --git a/...n-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ReiGridSynchronizer.java b/...n-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/ReiGridSynchronizer.java
@@ -1,18 +1,20 @@
 package com.refinedmods.refinedstorage.rei.fabric;
 
-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 net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.ResourceLocation;
 
 import static com.refinedmods.refinedstorage.rei.common.Common.SYNCHRONIZER_HELP;
 import static com.refinedmods.refinedstorage.rei.common.Common.SYNCHRONIZER_TITLE;
 import static com.refinedmods.refinedstorage.rei.common.Common.TWO_WAY_SYNCHRONIZER_HELP;
 import static com.refinedmods.refinedstorage.rei.common.Common.TWO_WAY_SYNCHRONIZER_TITLE;
 
-public class ReiGridSynchronizer extends AbstractGridSynchronizer {
+public class ReiGridSynchronizer implements GridSynchronizer {
     private final boolean twoWay;
 
     public ReiGridSynchronizer(final boolean twoWay) {
@@ -41,7 +43,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-rei-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-rei-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",
     "roughlyenoughitems": ">=16",
     "java": ">=17"
   }

diff --git a/...-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/ReiGridSynchronizer.java b/...-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/ReiGridSynchronizer.java
@@ -1,18 +1,20 @@
 package com.refinedmods.refinedstorage.rei.forge;
 
-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 net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.resources.ResourceLocation;
 
 import static com.refinedmods.refinedstorage.rei.common.Common.SYNCHRONIZER_HELP;
 import static com.refinedmods.refinedstorage.rei.common.Common.SYNCHRONIZER_TITLE;
 import static com.refinedmods.refinedstorage.rei.common.Common.TWO_WAY_SYNCHRONIZER_HELP;
 import static com.refinedmods.refinedstorage.rei.common.Common.TWO_WAY_SYNCHRONIZER_TITLE;
 
-public class ReiGridSynchronizer extends AbstractGridSynchronizer {
+public class ReiGridSynchronizer implements GridSynchronizer {
     private final boolean twoWay;
 
     public ReiGridSynchronizer(final boolean twoWay) {
@@ -41,7 +43,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-rei-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-rei-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -14,7 +14,7 @@ REI integration for Refined Storage.
 [[dependencies.refinedstorage_rei_integration]]
 modId = "refinedstorage"
 type = "required"
-versionRange = "2.0.0-milestone.4.5"
+versionRange = "2.0.0-milestone.4.7"
 side = "BOTH"
 [[dependencies.refinedstorage_rei_integration]]
 modId = "roughlyenoughitems"