chore: upgrade refined storage and add compat with quartz arsenal

refinedmods · Dec 8, 2024 · 4afe322 · 4afe322
1 parent 2126ea1
commit 4afe322
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 23 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 - EMI 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.5.0] - 2024-10-12
 
 ### Added

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,6 @@
-refinedarchitectVersion=0.19.1
-refinedstorageVersion=2.0.0-milestone.4.8
+refinedarchitectVersion=0.20.0
+refinedstorageVersion=2.0.0-milestone.4.11
+refinedstorageQuartzArsenalVersion=0.1.1
 emiVersion=1.1.11+1.21
 # Gradle
 org.gradle.jvmargs=-Xmx1G

diff --git a/refinedstorage-emi-integration-common/build.gradle.kts b/refinedstorage-emi-integration-common/build.gradle.kts
@@ -28,9 +28,11 @@ base {
 }
 
 val refinedstorageVersion: String by project
+val refinedstorageQuartzArsenalVersion: String by project
 val emiVersion: String by project
 
 dependencies {
     api("com.refinedmods.refinedstorage:refinedstorage-common:${refinedstorageVersion}")
     compileOnlyApi("dev.emi:emi-xplat-mojmap:${emiVersion}")
+    compileOnlyApi("com.refinedmods.refinedstorage:refinedstorage-quartz-arsenal-common:${refinedstorageQuartzArsenalVersion}")
 }
diff --git a/...src/main/java/com/refinedmods/refinedstorage/emi/common/CraftingGridEmiRecipeHandler.java b/...src/main/java/com/refinedmods/refinedstorage/emi/common/CraftingGridEmiRecipeHandler.java
@@ -5,8 +5,8 @@
 import com.refinedmods.refinedstorage.api.resource.list.MutableResourceList;
 import com.refinedmods.refinedstorage.api.resource.list.MutableResourceListImpl;
 import com.refinedmods.refinedstorage.api.resource.list.ResourceList;
-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 com.refinedmods.refinedstorage.common.support.tooltip.HelpClientTooltipComponent;
 
@@ -35,13 +35,13 @@
 import static com.refinedmods.refinedstorage.emi.common.Common.MOD_ID;
 import static java.util.Comparator.comparingLong;
 
-class CraftingGridEmiRecipeHandler extends AbstractEmiRecipeHandler<CraftingGridContainerMenu> {
+class CraftingGridEmiRecipeHandler<T extends AbstractCraftingGridContainerMenu> extends AbstractEmiRecipeHandler<T> {
     private static final Component CTRL_CLICK_TO_AUTOCRAFT = Component.translatable(
         "gui.%s.transfer.ctrl_click_to_autocraft".formatted(MOD_ID)
     );
 
     @Override
-    public EmiPlayerInventory getInventory(final AbstractContainerScreen<CraftingGridContainerMenu> screen) {
+    public EmiPlayerInventory getInventory(final AbstractContainerScreen<T> screen) {
         final ResourceList available = screen.getMenu().getAvailableListForRecipeTransfer();
         return new EmiPlayerInventory(available.copyState().stream()
             .filter(resourceAmount -> resourceAmount.resource() instanceof ItemResource)
@@ -58,7 +58,7 @@ public boolean supportsRecipe(final EmiRecipe recipe) {
     }
 
     @Override
-    public boolean canCraft(final EmiRecipe recipe, final EmiCraftContext<CraftingGridContainerMenu> context) {
+    public boolean canCraft(final EmiRecipe recipe, final EmiCraftContext<T> context) {
         return true;
     }
 
@@ -92,7 +92,7 @@ private static List<ItemResource> getItems(final EmiIngredient ingredient) {
     }
 
     @Override
-    public boolean craft(final EmiRecipe recipe, final EmiCraftContext<CraftingGridContainerMenu> context) {
+    public boolean craft(final EmiRecipe recipe, final EmiCraftContext<T> context) {
         final MutableResourceList available = context.getScreenHandler().getAvailableListForRecipeTransfer();
         final List<TransferInput> transferInputs = recipe.getInputs()
             .stream()
@@ -102,7 +102,7 @@ public boolean craft(final EmiRecipe recipe, final EmiCraftContext<CraftingGridC
         final TransferType transferType = getTransferType(transferInputs);
         if (transferType.canOpenAutocraftingPreview() && Screen.hasControlDown()) {
             final List<ResourceAmount> craftingRequests = createCraftingRequests(transferInputs);
-            RefinedStorageApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getScreen());
+            RefinedStorageClientApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getScreen());
             return false;
         }
         final List<List<ItemResource>> inputs = recipe.getInputs()
@@ -115,7 +115,7 @@ public boolean craft(final EmiRecipe recipe, final EmiCraftContext<CraftingGridC
 
     @Override
     public void render(final EmiRecipe recipe,
-                       final EmiCraftContext<CraftingGridContainerMenu> craftContext,
+                       final EmiCraftContext<T> craftContext,
                        final List<Widget> widgets,
                        final GuiGraphics draw) {
         final EmiDrawContext context = EmiDrawContext.wrap(draw);
@@ -141,7 +141,7 @@ public void render(final EmiRecipe recipe,
 
     @Override
     public List<ClientTooltipComponent> getTooltip(final EmiRecipe recipe,
-                                                   final EmiCraftContext<CraftingGridContainerMenu> context) {
+                                                   final EmiCraftContext<T> context) {
         final MutableResourceList available = context.getScreenHandler().getAvailableListForRecipeTransfer();
         final List<TransferInput> transferInputs = recipe.getInputs()
             .stream()

diff --git a/.../src/main/java/com/refinedmods/refinedstorage/emi/common/PatternGridEmiRecipeHandler.java b/.../src/main/java/com/refinedmods/refinedstorage/emi/common/PatternGridEmiRecipeHandler.java
@@ -4,7 +4,7 @@
 import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage.api.resource.ResourceKey;
 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.Collections;

diff --git a/...mon/src/main/java/com/refinedmods/refinedstorage/emi/common/QuartzArsenalIntegration.java b/...mon/src/main/java/com/refinedmods/refinedstorage/emi/common/QuartzArsenalIntegration.java
@@ -0,0 +1,29 @@
+package com.refinedmods.refinedstorage.emi.common;
+
+import com.refinedmods.refinedstorage.quartzarsenal.common.Menus;
+
+import dev.emi.emi.api.EmiRegistry;
+
+public final class QuartzArsenalIntegration {
+    private QuartzArsenalIntegration() {
+    }
+
+    public static boolean isLoaded() {
+        try {
+            Class.forName(
+                "com.refinedmods.refinedstorage.quartzarsenal.common"
+                    + ".Menus"
+            );
+            return true;
+        } catch (final ClassNotFoundException e) {
+            return false;
+        }
+    }
+
+    public static void load(final EmiRegistry registration) {
+        registration.addRecipeHandler(
+            Menus.INSTANCE.getWirelessCraftingGrid(),
+            new CraftingGridEmiRecipeHandler<>()
+        );
+    }
+}
diff --git a/...mmon/src/main/java/com/refinedmods/refinedstorage/emi/common/RefinedStorageEmiPlugin.java b/...mmon/src/main/java/com/refinedmods/refinedstorage/emi/common/RefinedStorageEmiPlugin.java
@@ -15,7 +15,10 @@ public void register(final EmiRegistry registry) {
         registry.addGenericStackProvider(new ResourceEmiStackProvider());
         registry.addGenericDragDropHandler(new ResourceEmiDragDropHandler());
         registry.addGenericDragDropHandler(new FilterEmiDragDropHandler());
-        registry.addRecipeHandler(Menus.INSTANCE.getCraftingGrid(), new CraftingGridEmiRecipeHandler());
+        registry.addRecipeHandler(Menus.INSTANCE.getCraftingGrid(), new CraftingGridEmiRecipeHandler<>());
+        if (QuartzArsenalIntegration.isLoaded()) {
+            QuartzArsenalIntegration.load(registry);
+        }
         registry.addRecipeHandler(Menus.INSTANCE.getPatternGrid(), new PatternGridEmiRecipeHandler());
     }
 }
diff --git a/refinedstorage-emi-integration-fabric/build.gradle.kts b/refinedstorage-emi-integration-fabric/build.gradle.kts
@@ -37,6 +37,7 @@ base {
 }
 
 val refinedstorageVersion: String by project
+val refinedstorageQuartzArsenalVersion: String by project
 val emiVersion: String by project
 
 val commonJava by configurations.existing
@@ -49,4 +50,6 @@ dependencies {
     modApi("com.refinedmods.refinedstorage:refinedstorage-fabric:${refinedstorageVersion}")
     modRuntimeOnly("dev.emi:emi-fabric:${emiVersion}")
     modCompileOnlyApi("dev.emi:emi-fabric:${emiVersion}")
+    modCompileOnlyApi("com.refinedmods.refinedstorage:refinedstorage-quartz-arsenal-fabric:${refinedstorageQuartzArsenalVersion}")
+    // modRuntimeOnly("com.refinedmods.refinedstorage:refinedstorage-quartz-arsenal-fabric:${refinedstorageQuartzArsenalVersion}")
 }
diff --git a/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-emi-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",
     "emi": ">=1.1.10",
     "java": ">=17"
   }

diff --git a/refinedstorage-emi-integration-neoforge/build.gradle.kts b/refinedstorage-emi-integration-neoforge/build.gradle.kts
@@ -29,6 +29,7 @@ base {
 }
 
 val refinedstorageVersion: String by project
+val refinedstorageQuartzArsenalVersion: String by project
 val emiVersion: String by project
 
 val commonJava by configurations.existing
@@ -41,4 +42,6 @@ dependencies {
     api("com.refinedmods.refinedstorage:refinedstorage-neoforge:${refinedstorageVersion}")
     runtimeOnly("dev.emi:emi-neoforge:${emiVersion}")
     compileOnlyApi("dev.emi:emi-neoforge:${emiVersion}")
+    compileOnlyApi("com.refinedmods.refinedstorage:refinedstorage-quartz-arsenal-neoforge:${refinedstorageQuartzArsenalVersion}")
+    // runtimeOnly("com.refinedmods.refinedstorage:refinedstorage-quartz-arsenal-neoforge:${refinedstorageQuartzArsenalVersion}")
 }
diff --git a/refinedstorage-emi-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml b/refinedstorage-emi-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml
@@ -14,7 +14,7 @@ EMI integration for Refined Storage.
 [[dependencies.refinedstorage_emi_integration]]
 modId = "refinedstorage"
 type = "required"
-versionRange = "2.0.0-milestone.4.8"
+versionRange = "2.0.0-milestone.4.11"
 side = "BOTH"
 [[dependencies.refinedstorage_emi_integration]]
 modId = "emi"