From 1cca97d6b176acc6aee35997fb74edb95eccee89 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 8 Jun 2024 18:55:29 +0200 Subject: [PATCH 1/5] ci: disable javadoc --- .github/workflows/publish-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 52d0e4d..5eb88f6 100644 --- 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 \ No newline at end of file + mutation-testing: false + javadoc: false \ No newline at end of file From 79a016c4ebbdbceb85d15cc70d068fbb411825ee Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 00:21:25 +0200 Subject: [PATCH 2/5] docs: add crowdin link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 93bb29d..604e4f6 100644 --- 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) From ada46274a4aedf255052e5e5e37fcfe12622408c Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 10:17:49 +0200 Subject: [PATCH 3/5] fix: unneeded jei prefix in translation --- .../jei/common/JeiGridSynchronizer.java | 12 ++++-------- .../refinedstorage_jei_integration/lang/en_us.json | 8 ++++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java index 6f36939..35d1382 100644 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java +++ b/refinedstorage-jei-integration-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/refinedstorage-jei-integration-common/src/main/resources/assets/refinedstorage_jei_integration/lang/en_us.json b/refinedstorage-jei-integration-common/src/main/resources/assets/refinedstorage_jei_integration/lang/en_us.json index 2f3961a..9cff150 100644 --- a/refinedstorage-jei-integration-common/src/main/resources/assets/refinedstorage_jei_integration/lang/en_us.json +++ b/refinedstorage-jei-integration-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." } \ No newline at end of file From e3aa0d5bddf30ded0f963539672d89d95c7ad384 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 10:30:04 +0200 Subject: [PATCH 4/5] chore: upgrade refined storage --- CHANGELOG.md | 4 ++++ gradle.properties | 2 +- .../refinedstorage/jei/common/GhostIngredientHandler.java | 6 +++--- .../refinedstorage/jei/common/GridGuiContainerHandler.java | 6 +++--- ...nvertImpl.java => JeiRecipeModIngredientConverter.java} | 6 +++--- .../jei/common/RefinedStorageJeiModPlugin.java | 6 +++--- .../jei/common/ResourceGuiContainerHandler.java | 7 ++++--- 7 files changed, 21 insertions(+), 16 deletions(-) rename refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/{IngredientConvertImpl.java => JeiRecipeModIngredientConverter.java} (85%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70b259f..b99bdf5 100644 --- 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-milestone.3.8. + ## [0.1.0] - 2024-06-08 ### Added diff --git a/gradle.properties b/gradle.properties index c408a30..d22703a 100644 --- 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/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java index 6b4dcae..80ef8aa 100644 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java +++ b/refinedstorage-jei-integration-common/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 { - private final IngredientConverter ingredientConverter; + private final RecipeModIngredientConverter ingredientConverter; - GhostIngredientHandler(final IngredientConverter ingredientConverter) { + GhostIngredientHandler(final RecipeModIngredientConverter ingredientConverter) { this.ingredientConverter = ingredientConverter; } 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 index b4ca9d6..5ed7a5f 100644 --- 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 @@ -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> { - 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/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/IngredientConvertImpl.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiRecipeModIngredientConverter.java similarity index 85% rename from refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/IngredientConvertImpl.java rename to refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiRecipeModIngredientConverter.java index e0e0314..010dce0 100644 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/IngredientConvertImpl.java +++ b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/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/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageJeiModPlugin.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageJeiModPlugin.java index aeee06e..75b4b76 100644 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageJeiModPlugin.java +++ b/refinedstorage-jei-integration-common/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/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java index 4495c66..6c8285a 100644 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java +++ b/refinedstorage-jei-integration-common/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> { - 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; } From 02720204c5f4d4017adee85782b237fb5b0b7f05 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 9 Jun 2024 08:36:14 +0000 Subject: [PATCH 5/5] chore: prepare release v0.2.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b99bdf5..72af435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ 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. @@ -21,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