Merge pull request #17 from refinedmods/release/0.3.0

Release v0.3.0

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   build:
-    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.1
     with:
       mutation-testing: false
     secrets: inherit

.github/workflows/draft-release.yml

@@ -17,7 +17,7 @@ on:
         type: string
 jobs:
   draft:
-    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.1
     with:
       release-type: ${{ inputs.release-type }}
       version-number-override: ${{ inputs.version-number-override }}

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.1

.github/workflows/publish-release.yml

@@ -7,7 +7,7 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.1
     secrets: inherit
     with:
       project-name: 'Refined Storage - JEI Integration'

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.1

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.1

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.1

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.1

CHANGELOG.md

@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.3.0] - 2024-07-06
+
+### Fixed
+
+-   Support for Refined Storage v2.0.0-milestone.4.0.
+
 ## [0.2.2] - 2024-06-20
 
 ### Fixed
@@ -36,7 +42,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Recipe transfer integration for the Crafting Grid.
 -   Grid / JEI search box synchronization options.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.2...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.3.0...HEAD
+
+[0.3.0]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.2...v0.3.0
 
 [0.2.2]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.1...v0.2.2
 

gradle.properties

@@ -1,4 +1,4 @@
-refinedstorageVersion=2.0.0-milestone.3.13
-jeiVersion=17.3.0.52
+refinedstorageVersion=2.0.0-milestone.4.1
+jeiVersion=19.1.0.17
 # Gradle
 org.gradle.jvmargs=-Xmx1G

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

refinedstorage-jei-integration-common/build.gradle

@@ -21,7 +21,7 @@ repositories {
 commonProject()
 
 dependencies {
-    api "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}"
+    api "com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}"
     api "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
     api "mezz.jei:jei-${minecraftVersion}-common:${jeiVersion}"
 }

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/Common.java

@@ -1,6 +1,7 @@
 package com.refinedmods.refinedstorage.jei.common;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+
 import net.minecraft.resources.ResourceLocation;
 
 import static java.util.Objects.requireNonNull;
@@ -24,11 +25,11 @@ public static Platform getPlatform() {
     public static void init(final PlatformApi platformApi) {
         platformApi.addIngredientConverter(new JeiRecipeModIngredientConverter());
         platformApi.getGridSynchronizerRegistry().register(
-            new ResourceLocation(Common.MOD_ID, "jei"),
+            ResourceLocation.fromNamespaceAndPath(Common.MOD_ID, "jei"),
             new JeiGridSynchronizer(false)
         );
         platformApi.getGridSynchronizerRegistry().register(
-            new ResourceLocation(Common.MOD_ID, "jei_two_way"),
+            ResourceLocation.fromNamespaceAndPath(Common.MOD_ID, "jei_two_way"),
             new JeiGridSynchronizer(true)
         );
     }

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/CraftingGridRecipeTransferHandler.java

@@ -1,14 +1,15 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.api.resource.list.ResourceList;
+import com.refinedmods.refinedstorage.platform.common.content.Menus;
+import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu;
+import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
-import com.refinedmods.refinedstorage2.api.resource.list.ResourceList;
-import com.refinedmods.refinedstorage2.platform.common.content.Menus;
-import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource;
 import mezz.jei.api.constants.RecipeTypes;
 import mezz.jei.api.gui.ingredient.IRecipeSlotView;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ExclusionZonesGuiContainerHandler.java

@@ -1,8 +1,9 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+
 import java.util.List;
 
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import net.minecraft.client.renderer.Rect2i;
 

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java

@@ -1,15 +1,16 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu;
+import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot;
+import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.common.Platform;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
-import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
-import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot;
 import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
 import mezz.jei.api.ingredients.ITypedIngredient;
 import net.minecraft.client.renderer.Rect2i;
@@ -50,7 +51,7 @@ public void onComplete() {
         // no op
     }
 
-    private class TargetImpl<I> implements Target<I> {
+    private static class TargetImpl<I> implements Target<I> {
         private final Rect2i area;
         private final int slotIndex;
 
@@ -70,10 +71,7 @@ public void accept(final I ingredient) {
         }
 
         private void accept(final PlatformResourceKey resource) {
-            Platform.INSTANCE.getClientToServerCommunications().sendResourceFilterSlotChange(
-                resource,
-                slotIndex
-            );
+            C2SPackets.sendResourceFilterSlotChange(resource, slotIndex);
         }
     }
 }

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GridGuiContainerHandler.java

@@ -1,11 +1,12 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource;
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen;
+
 import java.util.Optional;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.grid.view.PlatformGridResource;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import mezz.jei.api.ingredients.IIngredientHelper;
 import mezz.jei.api.ingredients.ITypedIngredient;

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java

@@ -1,8 +1,9 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridSynchronizer;
+
 import javax.annotation.Nullable;
 
-import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridSynchronizer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiRecipeModIngredientConverter.java

@@ -1,11 +1,12 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter;
+import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
+import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource;
+
 import java.util.Optional;
 
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource;
 import mezz.jei.api.helpers.IPlatformFluidHelper;
 import mezz.jei.common.platform.Services;
 import net.minecraft.world.item.ItemStack;
@@ -24,16 +25,17 @@ public Optional<PlatformResourceKey> convertToResource(final Object ingredient)
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public Optional<Object> convertToIngredient(final PlatformResourceKey resource) {
         if (resource instanceof ItemResource itemResource) {
             return Optional.of(itemResource.toItemStack());
         }
         if (resource instanceof FluidResource fluidResource) {
             final IPlatformFluidHelper<?> fluidHelper = Services.PLATFORM.getFluidHelper();
             return Optional.of(fluidHelper.create(
-                fluidResource.fluid(),
+                fluidResource.fluid().builtInRegistryHolder(),
                 fluidHelper.bucketVolume(),
-                fluidResource.tag()
+                fluidResource.components()
             ));
         }
         return Optional.empty();

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/Platform.java

@@ -1,8 +1,8 @@
 package com.refinedmods.refinedstorage.jei.common;
 
-import java.util.Optional;
+import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
 
-import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
+import java.util.Optional;
 
 public interface Platform {
     Optional<FluidResource> convertJeiIngredientToFluid(Object ingredient);

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageModPlugin.java

@@ -1,9 +1,10 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen;
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+
 import javax.annotation.Nullable;
 
-import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.constants.RecipeTypes;
@@ -14,7 +15,7 @@
 
 @JeiPlugin
 public class RefinedStorageModPlugin implements IModPlugin {
-    private static final ResourceLocation ID = new ResourceLocation(Common.MOD_ID, "plugin");
+    private static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(Common.MOD_ID, "plugin");
     @Nullable
     private static IJeiRuntime runtime;
 

refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java

@@ -1,11 +1,12 @@
 package com.refinedmods.refinedstorage.jei.common;
 
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+
 import java.util.Optional;
 import javax.annotation.Nullable;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import mezz.jei.api.ingredients.IIngredientHelper;
 import mezz.jei.api.ingredients.ITypedIngredient;

refinedstorage-jei-integration-fabric/build.gradle

@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    modApi "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}"
+    modApi "com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}"
     modRuntimeOnly "mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}"
     modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
     modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}"

refinedstorage-jei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/jei/fabric/FabricPlatform.java

@@ -1,20 +1,19 @@
 package com.refinedmods.refinedstorage.jei.fabric;
 
 import com.refinedmods.refinedstorage.jei.common.Platform;
+import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
 
 import java.util.Optional;
 
-import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
 import mezz.jei.api.fabric.ingredients.fluids.IJeiFluidIngredient;
 
+import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant;
+
 public class FabricPlatform implements Platform {
     @Override
     public Optional<FluidResource> convertJeiIngredientToFluid(final Object ingredient) {
         if (ingredient instanceof IJeiFluidIngredient fluidIngredient) {
-            return Optional.of(new FluidResource(
-                fluidIngredient.getFluid(),
-                fluidIngredient.getTag().orElse(null)
-            ));
+            return Optional.of(ofFluidVariant(fluidIngredient.getFluidVariant()));
         }
         return Optional.empty();
     }

refinedstorage-jei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/jei/fabric/JeiRefinedStoragePlugin.java

@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.jei.fabric;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.RefinedStoragePlugin;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.RefinedStoragePlugin;
 
 import static com.refinedmods.refinedstorage.jei.common.Common.init;
 

refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json

@@ -29,14 +29,15 @@
       "links": {
         "modmenu.discord": "https://discordapp.com/invite/VYzsydb"
       },
-      "parent": "refinedstorage2"
+      "parent": "refinedstorage"
     }
   },
   "depends": {
     "fabricloader": ">=0.14.6",
     "fabric-api": "*",
-    "minecraft": "~1.20.4",
-    "jei": ">=17",
+    "minecraft": "~1.21",
+    "refinedstorage": ">=2.0.0-milestone.4.0",
+    "jei": ">=19",
     "java": ">=17"
   }
 }

refinedstorage-jei-integration-neoforge/.gitignore

@@ -0,0 +1 @@
+run/