Merge pull request #7 from refinedmods/release/0.2.0

Release v0.2.0
refinedmods · Jun 9, 2024 · 36ebc74 · 36ebc74
2 parents 1a57bd6 + 0272020
commit 36ebc74
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 30 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -11,4 +11,5 @@ jobs:
     secrets: inherit
     with:
       project-name: 'Refined Storage - JEI Integration'
-      mutation-testing: false
+      mutation-testing: false
+      javadoc: false
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.2.0] - 2024-06-09
+
+### Fixed
+
+-   Support for Refined Storage v2.0.0-milestone.3.8.
+
 ## [0.1.0] - 2024-06-08
 
 ### Added
@@ -17,6 +23,8 @@ 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.1.0...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.2.0...HEAD
+
+[0.2.0]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.1.0...v0.2.0
 
 [0.1.0]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/9145f6a9e8e1b1efd122d9e4cf91ffbd942625c7...v0.1.0
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Adds support for:
     - [Packages](https://github.com/refinedmods/refinedstorage-jei-integration/packages)
     - [Issues](https://github.com/refinedmods/refinedstorage-jei-integration/issues)
     - [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)
 - [Mastodon](https://anvil.social/@refinedmods)

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
+refinedstorageVersion=2.0.0-milestone.3.8
 # Gradle
 org.gradle.jvmargs=-Xmx1G
-refinedstorageVersion=2.0.0-milestone.3.7
diff --git a/...ommon/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java b/...ommon/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java
@@ -4,8 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
@@ -16,9 +16,9 @@
 
 @SuppressWarnings("rawtypes")
 class GhostIngredientHandler implements IGhostIngredientHandler<AbstractBaseScreen> {
-    private final IngredientConverter ingredientConverter;
+    private final RecipeModIngredientConverter ingredientConverter;
 
-    GhostIngredientHandler(final IngredientConverter ingredientConverter) {
+    GhostIngredientHandler(final RecipeModIngredientConverter ingredientConverter) {
         this.ingredientConverter = ingredientConverter;
     }
 

diff --git a/...mmon/src/main/java/com/refinedmods/refinedstorage/jei/common/GridGuiContainerHandler.java b/...mmon/src/main/java/com/refinedmods/refinedstorage/jei/common/GridGuiContainerHandler.java
@@ -3,8 +3,8 @@
 import java.util.Optional;
 
 import com.refinedmods.refinedstorage2.platform.api.grid.view.PlatformGridResource;
-import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import mezz.jei.api.ingredients.IIngredientHelper;
@@ -13,10 +13,10 @@
 import mezz.jei.api.runtime.IIngredientManager;
 
 class GridGuiContainerHandler implements IGuiContainerHandler<AbstractGridScreen<?>> {
-    private final IngredientConverter converter;
+    private final RecipeModIngredientConverter converter;
     private final IIngredientManager ingredientManager;
 
-    GridGuiContainerHandler(final IngredientConverter converter, final IIngredientManager ingredientManager) {
+    GridGuiContainerHandler(final RecipeModIngredientConverter converter, final IIngredientManager ingredientManager) {
         this.converter = converter;
         this.ingredientManager = ingredientManager;
     }

diff --git a/...n-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java b/...n-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java
@@ -9,17 +9,13 @@
 import static com.refinedmods.refinedstorage.jei.common.Common.MOD_ID;
 
 class JeiGridSynchronizer extends AbstractGridSynchronizer {
-    private static final MutableComponent TITLE = Component.translatable(
-        "gui.%s.grid.synchronizer.jei".formatted(MOD_ID)
-    );
+    private static final MutableComponent TITLE = Component.translatable("gui.%s.grid.synchronizer".formatted(MOD_ID));
     private static final MutableComponent TITLE_TWO_WAY = Component.translatable(
-        "gui.%s.grid.synchronizer.jei.two_way".formatted(MOD_ID)
-    );
-    private static final Component HELP = Component.translatable(
-        "gui.%s.grid.synchronizer.jei.help".formatted(MOD_ID)
+        "gui.%s.grid.synchronizer.two_way".formatted(MOD_ID)
     );
+    private static final Component HELP = Component.translatable("gui.%s.grid.synchronizer.help".formatted(MOD_ID));
     private static final Component HELP_TWO_WAY = Component.translatable(
-        "gui.%s.grid.synchronizer.jei.two_way.help".formatted(MOD_ID)
+        "gui.%s.grid.synchronizer.two_way.help".formatted(MOD_ID)
     );
 
     private final JeiProxy jeiProxy;

diff --git a/...age/jei/common/IngredientConvertImpl.java → ...mmon/JeiRecipeModIngredientConverter.java b/...age/jei/common/IngredientConvertImpl.java → ...mmon/JeiRecipeModIngredientConverter.java
@@ -2,17 +2,17 @@
 
 import java.util.Optional;
 
-import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
 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 net.minecraft.world.item.ItemStack;
 
-class IngredientConvertImpl implements IngredientConverter {
+class JeiRecipeModIngredientConverter implements RecipeModIngredientConverter {
     private final IPlatformFluidHelper<?> fluidHelper;
 
-    IngredientConvertImpl(final IPlatformFluidHelper<?> fluidHelper) {
+    JeiRecipeModIngredientConverter(final IPlatformFluidHelper<?> fluidHelper) {
         this.fluidHelper = fluidHelper;
     }
 

diff --git a/...n/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageJeiModPlugin.java b/...n/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageJeiModPlugin.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nullable;
 
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import mezz.jei.api.IModPlugin;
@@ -44,7 +44,7 @@ public void onRuntimeAvailable(final IJeiRuntime newRuntime) {
 
     @Override
     public void registerGuiHandlers(final IGuiHandlerRegistration registration) {
-        final IngredientConverter converter = PlatformApi.INSTANCE.getIngredientConverter();
+        final RecipeModIngredientConverter converter = PlatformApi.INSTANCE.getIngredientConverter();
         registration.addGenericGuiContainerHandler(
             AbstractBaseScreen.class,
             new ResourceGuiContainerHandler(converter, registration.getJeiHelpers().getIngredientManager())
@@ -84,6 +84,6 @@ private void registerGridSynchronizers() {
     }
 
     private void registerIngredientConverters(final IPlatformFluidHelper<?> fluidHelper) {
-        PlatformApi.INSTANCE.registerIngredientConverter(new IngredientConvertImpl(fluidHelper));
+        PlatformApi.INSTANCE.addIngredientConverter(new JeiRecipeModIngredientConverter(fluidHelper));
     }
 }
diff --git a/.../src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java b/.../src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java
@@ -3,8 +3,8 @@
 import java.util.Optional;
 import javax.annotation.Nullable;
 
-import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
 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.AbstractBaseScreen;
 import mezz.jei.api.gui.handlers.IGuiContainerHandler;
 import mezz.jei.api.ingredients.IIngredientHelper;
@@ -13,10 +13,11 @@
 import mezz.jei.api.runtime.IIngredientManager;
 
 class ResourceGuiContainerHandler implements IGuiContainerHandler<AbstractBaseScreen<?>> {
-    private final IngredientConverter converter;
+    private final RecipeModIngredientConverter converter;
     private final IIngredientManager ingredientManager;
 
-    ResourceGuiContainerHandler(final IngredientConverter converter, final IIngredientManager ingredientManager) {
+    ResourceGuiContainerHandler(final RecipeModIngredientConverter converter,
+                                final IIngredientManager ingredientManager) {
         this.converter = converter;
         this.ingredientManager = ingredientManager;
     }

diff --git a/...tegration-common/src/main/resources/assets/refinedstorage_jei_integration/lang/en_us.json b/...tegration-common/src/main/resources/assets/refinedstorage_jei_integration/lang/en_us.json
@@ -1,6 +1,6 @@
 {
-  "gui.refinedstorage_jei_integration.grid.synchronizer.jei": "JEI",
-  "gui.refinedstorage_jei_integration.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.",
-  "gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way": "JEI two-way",
-  "gui.refinedstorage_jei_integration.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
+  "gui.refinedstorage_jei_integration.grid.synchronizer": "JEI",
+  "gui.refinedstorage_jei_integration.grid.synchronizer.help": "Sync the search box text to the JEI filter.",
+  "gui.refinedstorage_jei_integration.grid.synchronizer.two_way": "JEI two-way",
+  "gui.refinedstorage_jei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text."
 }