chore: upgrade refined storage

refinedmods · Dec 8, 2024 · 4fa2091 · 4fa2091
1 parent 560fa34
commit 4fa2091
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 26 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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.20.0
     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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.20.0
     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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.20.0
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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.20.0
     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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.20.0
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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.20.0
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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.20.0
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.19.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.20.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Fixed
+
+-   Support for Refined Storage v2.0.0-milestone.4.11.
+-   Recipe transfer not working in the Wireless Crafting Grid.
+
 ## [0.4.0] - 2024-10-12
 
 ### Added

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-refinedarchitectVersion=0.19.1
-refinedstorageVersion=2.0.0-milestone.4.8
+refinedarchitectVersion=0.20.0
+refinedstorageVersion=2.0.0-milestone.4.11
 # 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/.../src/main/java/com/refinedmods/refinedstorage/rei/fabric/CraftingGridTransferHandler.java b/.../src/main/java/com/refinedmods/refinedstorage/rei/fabric/CraftingGridTransferHandler.java
@@ -3,8 +3,8 @@
 import com.refinedmods.refinedstorage.api.grid.view.GridView;
 import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage.api.resource.list.MutableResourceList;
-import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
-import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu;
+import com.refinedmods.refinedstorage.common.api.RefinedStorageClientApi;
+import com.refinedmods.refinedstorage.common.grid.AbstractCraftingGridContainerMenu;
 import com.refinedmods.refinedstorage.common.support.resource.ItemResource;
 
 import java.awt.Color;
@@ -45,7 +45,7 @@ class CraftingGridTransferHandler extends AbstractTransferHandler {
 
     @Override
     public Result handle(final Context context) {
-        if (!(context.getMenu() instanceof CraftingGridContainerMenu containerMenu)
+        if (!(context.getMenu() instanceof AbstractCraftingGridContainerMenu containerMenu)
             || !context.getDisplay().getCategoryIdentifier().equals(BuiltinPlugin.CRAFTING)
             || !(context.getDisplay() instanceof DefaultCraftingDisplay<?> defaultCraftingDisplay)) {
             return Result.createNotApplicable();
@@ -68,12 +68,12 @@ public Result handle(final Context context) {
             .blocksFurtherHandling();
     }
 
-    private Result doActuallyCrafting(final Context context, final CraftingGridContainerMenu containerMenu,
+    private Result doActuallyCrafting(final Context context, final AbstractCraftingGridContainerMenu containerMenu,
                                       final TransferType type, final TransferInputs transferInputs,
                                       final List<EntryIngredient> ingredients) {
         if (type.canOpenAutocraftingPreview() && Screen.hasControlDown()) {
             final List<ResourceAmount> craftingRequests = transferInputs.createCraftingRequests();
-            RefinedStorageApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen());
+            RefinedStorageClientApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen());
             return Result.createSuccessful().blocksFurtherHandling(false);
         } else {
             doTransfer(ingredients, containerMenu);
@@ -98,7 +98,8 @@ private static Component getTooltip(final TransferType type) {
         };
     }
 
-    private void doTransfer(final List<EntryIngredient> ingredients, final CraftingGridContainerMenu containerMenu) {
+    private void doTransfer(final List<EntryIngredient> ingredients,
+                            final AbstractCraftingGridContainerMenu containerMenu) {
         final List<List<ItemResource>> inputs = getInputs(ingredients);
         containerMenu.transferRecipe(inputs);
     }

diff --git a/...c/src/main/java/com/refinedmods/refinedstorage/rei/fabric/PatternGridTransferHandler.java b/...c/src/main/java/com/refinedmods/refinedstorage/rei/fabric/PatternGridTransferHandler.java
@@ -3,7 +3,7 @@
 import com.refinedmods.refinedstorage.api.grid.view.GridView;
 import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
-import com.refinedmods.refinedstorage.common.autocrafting.PatternGridContainerMenu;
+import com.refinedmods.refinedstorage.common.autocrafting.patterngrid.PatternGridContainerMenu;
 import com.refinedmods.refinedstorage.common.support.resource.ItemResource;
 
 import java.util.List;

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.8",
+    "refinedstorage": ">=2.0.0-milestone.4.11",
     "roughlyenoughitems": ">=16",
     "java": ">=17"
   }

diff --git a/...e/src/main/java/com/refinedmods/refinedstorage/rei/forge/CraftingGridTransferHandler.java b/...e/src/main/java/com/refinedmods/refinedstorage/rei/forge/CraftingGridTransferHandler.java
@@ -3,8 +3,8 @@
 import com.refinedmods.refinedstorage.api.grid.view.GridView;
 import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage.api.resource.list.MutableResourceList;
-import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
-import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu;
+import com.refinedmods.refinedstorage.common.api.RefinedStorageClientApi;
+import com.refinedmods.refinedstorage.common.grid.AbstractCraftingGridContainerMenu;
 import com.refinedmods.refinedstorage.common.support.resource.ItemResource;
 
 import java.awt.Color;
@@ -45,7 +45,7 @@ class CraftingGridTransferHandler extends AbstractTransferHandler {
 
     @Override
     public Result handle(final Context context) {
-        if (!(context.getMenu() instanceof CraftingGridContainerMenu containerMenu)
+        if (!(context.getMenu() instanceof AbstractCraftingGridContainerMenu containerMenu)
             || !context.getDisplay().getCategoryIdentifier().equals(BuiltinPlugin.CRAFTING)
             || !(context.getDisplay() instanceof DefaultCraftingDisplay<?> defaultCraftingDisplay)) {
             return Result.createNotApplicable();
@@ -68,12 +68,12 @@ public Result handle(final Context context) {
             .blocksFurtherHandling();
     }
 
-    private Result doActuallyCrafting(final Context context, final CraftingGridContainerMenu containerMenu,
+    private Result doActuallyCrafting(final Context context, final AbstractCraftingGridContainerMenu containerMenu,
                                       final TransferType type, final TransferInputs transferInputs,
                                       final List<EntryIngredient> ingredients) {
         if (type.canOpenAutocraftingPreview() && Screen.hasControlDown()) {
             final List<ResourceAmount> craftingRequests = transferInputs.createCraftingRequests();
-            RefinedStorageApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen());
+            RefinedStorageClientApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen());
             return Result.createSuccessful().blocksFurtherHandling(false);
         } else {
             doTransfer(ingredients, containerMenu);
@@ -98,7 +98,8 @@ private static Component getTooltip(final TransferType type) {
         };
     }
 
-    private void doTransfer(final List<EntryIngredient> ingredients, final CraftingGridContainerMenu containerMenu) {
+    private void doTransfer(final List<EntryIngredient> ingredients,
+                            final AbstractCraftingGridContainerMenu containerMenu) {
         final List<List<ItemResource>> inputs = getInputs(ingredients);
         containerMenu.transferRecipe(inputs);
     }

diff --git a/...ge/src/main/java/com/refinedmods/refinedstorage/rei/forge/PatternGridTransferHandler.java b/...ge/src/main/java/com/refinedmods/refinedstorage/rei/forge/PatternGridTransferHandler.java
@@ -3,7 +3,7 @@
 import com.refinedmods.refinedstorage.api.grid.view.GridView;
 import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
-import com.refinedmods.refinedstorage.common.autocrafting.PatternGridContainerMenu;
+import com.refinedmods.refinedstorage.common.autocrafting.patterngrid.PatternGridContainerMenu;
 import com.refinedmods.refinedstorage.common.support.resource.ItemResource;
 
 import java.util.List;

diff --git a/refinedstorage-rei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml b/refinedstorage-rei-integration-neoforge/src/main/templates/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.8"
+versionRange = "2.0.0-milestone.4.11"
 side = "BOTH"
 [[dependencies.refinedstorage_rei_integration]]
 modId = "roughlyenoughitems"