chore: upgrade refined storage

raoulvdberge · raoulvdberge · commit 725b3ec3a4c4 · 2025-03-28T12:36:28.000+01:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1,2 @@
-patreon: raoulvdberge
+patreon: raoulvdberge
+ko_fi: raoulvdberge
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -34,7 +34,7 @@ body:
             description: |
                 If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue.
             options:
-                - Minecraft 1.21
+                - Minecraft 1.21.1
         validations:
             required: true
     -   type: input
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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v1.0.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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v1.0.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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v1.0.0
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -7,9 +7,11 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v1.0.0
     secrets: inherit
     with:
       project-name: 'Refined Storage - JEI Integration'
       mutation-testing: false
-      javadoc: false
+      javadoc: false
+      curseforge: true
+      modrinth: true
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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v1.0.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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v1.0.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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v1.0.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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v1.0.0
diff --git 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-beta.1.
+
 ## [0.7.0] - 2024-12-08
 
 ### Fixed
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-Copyright © 2024 Refined Mods
+Copyright © 2024 - 2025 Refined Mods
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the “Software”), to deal in the Software without restriction, including without limitation the
diff --git a/README.md b/README.md
@@ -22,7 +22,6 @@ Adds support for:
     - [Refined Mods on GitHub](https://github.com/refinedmods)
 - [Crowdin](https://crowdin.com/project/refined-storage-jei-integration)
 - [Discord](https://discordapp.com/invite/VYzsydb)
-- [Twitter](https://twitter.com/refinedmods)
 
 ## Building
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-refinedarchitectVersion=0.20.0
-refinedstorageVersion=2.0.0-milestone.4.11
-refinedstorageQuartzArsenalVersion=0.1.1
+refinedarchitectVersion=1.0.0
+refinedstorageVersion=2.0.0-beta.1
+refinedstorageQuartzArsenalVersion=1.0.0
 jeiVersion=19.20.0.241
 minecraftVersion=1.21.1
 # Gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/images/logo.png b/images/logo.png
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/AbstractPatternGridRecipeTransferHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/AbstractPatternGridRecipeTransferHandler.java
@@ -1,7 +1,8 @@
 package com.refinedmods.refinedstorage.jei.common;
 
-import com.refinedmods.refinedstorage.api.grid.view.GridView;
 import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
+import com.refinedmods.refinedstorage.api.resource.repository.ResourceRepository;
+import com.refinedmods.refinedstorage.common.api.grid.view.GridResource;
 import com.refinedmods.refinedstorage.common.autocrafting.patterngrid.PatternGridContainerMenu;
 
 import java.util.List;
@@ -17,19 +18,20 @@ abstract class AbstractPatternGridRecipeTransferHandler<R>
     implements IRecipeTransferHandler<PatternGridContainerMenu, R> {
 
     @Nullable
-    public static IRecipeTransferError autocraftableHint(final GridView view, final IRecipeSlotsView recipeSlots) {
+    public static IRecipeTransferError autocraftableHint(final ResourceRepository<GridResource> repository,
+                                                         final IRecipeSlotsView recipeSlots) {
         final List<IRecipeSlotView> inputs = recipeSlots.getSlotViews(RecipeIngredientRole.INPUT);
         final boolean allAreAutocraftable = inputs.stream()
             .filter(slotView -> !slotView.isEmpty())
             .allMatch(slotView -> SlotUtil.getResources(slotView)
                 .stream()
                 .map(ResourceAmount::resource)
-                .anyMatch(view::isAutocraftable));
+                .anyMatch(repository::isSticky));
         final List<IRecipeSlotView> autocraftableSlots = inputs.stream()
             .filter(slotView -> SlotUtil.getResources(slotView)
                 .stream()
                 .map(ResourceAmount::resource)
-                .anyMatch(view::isAutocraftable))
+                .anyMatch(repository::isSticky))
             .toList();
         return autocraftableSlots.isEmpty()
             ? null
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/CraftingGridRecipeTransferHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/CraftingGridRecipeTransferHandler.java
@@ -1,10 +1,11 @@
 package com.refinedmods.refinedstorage.jei.common;
 
-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.api.resource.list.MutableResourceListImpl;
+import com.refinedmods.refinedstorage.api.resource.repository.ResourceRepository;
 import com.refinedmods.refinedstorage.common.api.RefinedStorageClientApi;
+import com.refinedmods.refinedstorage.common.api.grid.view.GridResource;
 import com.refinedmods.refinedstorage.common.grid.AbstractCraftingGridContainerMenu;
 import com.refinedmods.refinedstorage.common.support.resource.ItemResource;
 
@@ -62,9 +63,9 @@ public IRecipeTransferError transferRecipe(final T containerMenu,
                                                final Player player,
                                                final boolean maxTransfer,
                                                final boolean doTransfer) {
-        final GridView view = containerMenu.getView();
+        final ResourceRepository<GridResource> repository = containerMenu.getRepository();
         final MutableResourceList available = containerMenu.getAvailableListForRecipeTransfer();
-        final List<TransferInput> transferInputs = getTransferInputs(view, recipeSlots, available);
+        final List<TransferInput> transferInputs = getTransferInputs(repository, recipeSlots, available);
         final TransferType type = getTransferType(transferInputs);
         if (doTransfer) {
             if (type.canOpenAutocraftingPreview() && Screen.hasControlDown()) {
@@ -106,31 +107,31 @@ private void doTransfer(final IRecipeSlotsView recipeSlots, final AbstractCrafti
         containerMenu.transferRecipe(inputs);
     }
 
-    private List<TransferInput> getTransferInputs(final GridView view,
+    private List<TransferInput> getTransferInputs(final ResourceRepository<GridResource> repository,
                                                   final IRecipeSlotsView recipeSlots,
                                                   final MutableResourceList available) {
         return recipeSlots.getSlotViews(RecipeIngredientRole.INPUT)
             .stream()
             .filter(slotView -> !slotView.isEmpty())
-            .map(slotView -> toTransferInput(view, available, slotView))
+            .map(slotView -> toTransferInput(repository, available, slotView))
             .toList();
     }
 
-    private TransferInput toTransferInput(final GridView view,
+    private TransferInput toTransferInput(final ResourceRepository<GridResource> repository,
                                           final MutableResourceList available,
                                           final IRecipeSlotView slotView) {
         final List<ItemStack> possibilities = slotView.getItemStacks().toList();
         for (final ItemStack possibility : possibilities) {
             final ItemResource possibilityResource = ItemResource.ofItemStack(possibility);
-            if (available.remove(possibilityResource, 1).isPresent()) {
+            if (available.remove(possibilityResource, 1) != null) {
                 return new TransferInput(slotView, TransferInputType.AVAILABLE, null);
             }
         }
         final List<ItemResource> autocraftingPossibilities = possibilities
             .stream()
             .map(ItemResource::ofItemStack)
-            .filter(view::isAutocraftable)
-            .sorted(comparingLong(view::getAmount))
+            .filter(repository::isSticky)
+            .sorted(comparingLong(repository::getAmount))
             .toList();
         if (!autocraftingPossibilities.isEmpty()) {
             return new TransferInput(slotView, TransferInputType.AUTOCRAFTABLE, autocraftingPossibilities.getFirst());
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GridGuiContainerHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GridGuiContainerHandler.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.jei.common;
 
 import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
-import com.refinedmods.refinedstorage.common.api.grid.view.PlatformGridResource;
+import com.refinedmods.refinedstorage.common.api.grid.view.GridResource;
 import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey;
 import com.refinedmods.refinedstorage.common.grid.screen.AbstractGridScreen;
 
@@ -26,7 +26,7 @@ public Optional<IClickableIngredient<?>> getClickableIngredientUnderMouse(
         final double mouseX,
         final double mouseY
     ) {
-        final PlatformGridResource resource = screen.getCurrentGridResource();
+        final GridResource resource = screen.getCurrentGridResource();
         if (resource == null) {
             return Optional.empty();
         }
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridCraftingRecipeTransferHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridCraftingRecipeTransferHandler.java
@@ -48,6 +48,6 @@ public IRecipeTransferError transferRecipe(final PatternGridContainerMenu contai
             containerMenu.transferCraftingRecipe(inputs);
             return null;
         }
-        return autocraftableHint(containerMenu.getView(), recipeSlots);
+        return autocraftableHint(containerMenu.getRepository(), recipeSlots);
     }
 }
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridProcessingRecipeTransferHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridProcessingRecipeTransferHandler.java
@@ -41,6 +41,6 @@ public IRecipeTransferError transferRecipe(
             final List<List<ResourceAmount>> outputs = SlotUtil.getResources(recipeSlots, RecipeIngredientRole.OUTPUT);
             container.transferProcessingRecipe(inputs, outputs);
         }
-        return AbstractPatternGridRecipeTransferHandler.autocraftableHint(container.getView(), recipeSlots);
+        return AbstractPatternGridRecipeTransferHandler.autocraftableHint(container.getRepository(), recipeSlots);
     }
 }
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridSmithingTableRecipeTransferHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridSmithingTableRecipeTransferHandler.java
@@ -54,6 +54,6 @@ public IRecipeTransferError transferRecipe(final PatternGridContainerMenu contai
                 inputSlots.get(2)
             );
         }
-        return autocraftableHint(containerMenu.getView(), recipeSlots);
+        return autocraftableHint(containerMenu.getRepository(), recipeSlots);
     }
 }
diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridStonecutterRecipeTransferHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/PatternGridStonecutterRecipeTransferHandler.java
@@ -55,6 +55,6 @@ public IRecipeTransferError transferRecipe(final PatternGridContainerMenu contai
                 outputStacks.getFirst().getFirst()
             );
         }
-        return autocraftableHint(containerMenu.getView(), recipeSlots);
+        return autocraftableHint(containerMenu.getRepository(), recipeSlots);
     }
 }
diff --git a/refinedstorage-jei-integration-fabric/build.gradle.kts b/refinedstorage-jei-integration-fabric/build.gradle.kts
@@ -29,6 +29,8 @@ refinedarchitect {
     fabric()
     publishing {
         maven = true
+        curseForge = "1230497"
+        modrinth = "VzR5wiLo"
     }
 }
 
diff --git a/refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json
@@ -36,7 +36,7 @@
     "fabricloader": ">=0.14.6",
     "fabric-api": "*",
     "minecraft": "~1.21",
-    "refinedstorage": ">=2.0.0-milestone.4.11",
+    "refinedstorage": ">=2.0.0-beta.1",
     "jei": ">=19.20.0",
     "java": ">=17"
   }
diff --git a/refinedstorage-jei-integration-neoforge/build.gradle.kts b/refinedstorage-jei-integration-neoforge/build.gradle.kts
@@ -21,6 +21,8 @@ refinedarchitect {
     neoForge()
     publishing {
         maven = true
+        curseForge = "1230497"
+        modrinth = "VzR5wiLo"
     }
 }
 
diff --git a/refinedstorage-jei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml b/refinedstorage-jei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml
@@ -6,15 +6,15 @@ license = "MIT"
 modId = "refinedstorage_jei_integration"
 version = "${version}"
 displayName = "Refined Storage - JEI Integration"
-displayURL = "https://refinedmods.com/refined-storage"
+displayURL = "https://refinedmods.com/refined-storage/addons/just-enough-items.html"
 authors = "Refined Mods"
 description = '''
 JEI integration for Refined Storage.
 '''
 [[dependencies.refinedstorage_jei_integration]]
 modId = "refinedstorage"
 type = "required"
-versionRange = "2.0.0-milestone.4.11"
+versionRange = "2.0.0-beta.1"
 side = "BOTH"
 [[dependencies.refinedstorage_jei_integration]]
 modId = "jei"

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-patreon: raoulvdberge`
	`1`	`+patreon: raoulvdberge`
	`2`	`+ko_fi: raoulvdberge`