From 8cf27c0f7a9b80322d658f1a39366d1daef77daf Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 18:04:08 +0200 Subject: [PATCH 1/5] fix: use sprites for grid synchronizer --- CHANGELOG.md | 4 ++++ gradle.properties | 4 ++-- .../refinedstorage/jei/common/JeiGridSynchronizer.java | 10 ++++++---- .../src/main/resources/fabric.mod.json | 4 ++-- .../src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d216f8..79c70a2 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.4.7. + ## [0.4.0] - 2024-08-08 ### Added diff --git a/gradle.properties b/gradle.properties index f6bb0dd..c025390 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ refinedarchitectVersion=0.16.9 -refinedstorageVersion=2.0.0-milestone.4.6 -jeiVersion=19.4.0.28 +refinedstorageVersion=2.0.0-milestone.4.7 +jeiVersion=19.8.2.99 minecraftVersion=1.21 # Gradle org.gradle.jvmargs=-Xmx1G 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 27f3f82..074533a 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 @@ -1,15 +1,17 @@ package com.refinedmods.refinedstorage.jei.common; -import com.refinedmods.refinedstorage.common.grid.AbstractGridSynchronizer; +import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.common.grid.NoopGridSynchronizer; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; import static com.refinedmods.refinedstorage.jei.common.Common.MOD_ID; -class JeiGridSynchronizer extends AbstractGridSynchronizer { +class JeiGridSynchronizer implements GridSynchronizer { 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.two_way".formatted(MOD_ID) @@ -47,7 +49,7 @@ public String getTextToSynchronizeToGrid() { } @Override - public int getXTexture() { - return twoWay ? 32 : 48; + public ResourceLocation getSprite() { + return twoWay ? NoopGridSynchronizer.ON_TWO_WAY : NoopGridSynchronizer.ON; } } diff --git a/refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json index 6266a70..abc49b6 100644 --- a/refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json +++ b/refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json @@ -36,8 +36,8 @@ "fabricloader": ">=0.14.6", "fabric-api": "*", "minecraft": "~1.21", - "refinedstorage": ">=2.0.0-milestone.4.5", - "jei": ">=19", + "refinedstorage": ">=2.0.0-milestone.4.7", + "jei": ">=19.8.2", "java": ">=17" } } diff --git a/refinedstorage-jei-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-jei-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml index eeba5e3..700533b 100644 --- a/refinedstorage-jei-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/refinedstorage-jei-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -14,10 +14,10 @@ JEI integration for Refined Storage. [[dependencies.refinedstorage_jei_integration]] modId = "refinedstorage" type = "required" -versionRange = "2.0.0-milestone.4.5" +versionRange = "2.0.0-milestone.4.7" side = "BOTH" [[dependencies.refinedstorage_jei_integration]] modId = "jei" type = "required" -versionRange = "[19,)" +versionRange = "[19.8.2,)" side = "BOTH" From 0a0ea55ec657ea70f743b637f42d287086363d68 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 18:05:13 +0200 Subject: [PATCH 2/5] refactor: use new universal recipe transfer handler --- ...rnGridProcessingRecipeTransferHandler.java | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) 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 index 7a959e7..f1f3645 100644 --- 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 @@ -10,15 +10,12 @@ import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.RecipeIngredientRole; -import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.transfer.IRecipeTransferError; -import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; +import mezz.jei.api.recipe.transfer.IUniversalRecipeTransferHandler; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.crafting.RecipeHolder; -class PatternGridProcessingRecipeTransferHandler implements - IRecipeTransferHandler> { +class PatternGridProcessingRecipeTransferHandler implements IUniversalRecipeTransferHandler { @Override public Class getContainerClass() { return PatternGridContainerMenu.class; @@ -29,24 +26,20 @@ public Optional> getMenuType() { return Optional.of(Menus.INSTANCE.getPatternGrid()); } - @Override - @SuppressWarnings({"DataFlowIssue"}) - public RecipeType> getRecipeType() { - return null; // universal transfer handler makes this null safe - } - @Override @Nullable - public IRecipeTransferError transferRecipe(final PatternGridContainerMenu containerMenu, - final RecipeHolder recipe, - final IRecipeSlotsView recipeSlots, - final Player player, - final boolean maxTransfer, - final boolean doTransfer) { + public IRecipeTransferError transferRecipe( + final PatternGridContainerMenu container, + final Object recipe, + final IRecipeSlotsView recipeSlots, + final Player player, + final boolean maxTransfer, + final boolean doTransfer + ) { if (doTransfer) { final List> inputs = SlotUtil.getResources(recipeSlots, RecipeIngredientRole.INPUT); final List> outputs = SlotUtil.getResources(recipeSlots, RecipeIngredientRole.OUTPUT); - containerMenu.transferProcessingRecipe(inputs, outputs); + container.transferProcessingRecipe(inputs, outputs); } return null; } From 57421d9fbce45554663f5d1c2449038b3a6d49af Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 18:19:29 +0200 Subject: [PATCH 3/5] fix: use multiple ghost ingredient handlers instead --- .../common/FilterGhostIngredientHandler.java | 68 +++++++++++ .../jei/common/GhostIngredientHandler.java | 109 ------------------ .../jei/common/RefinedStorageModPlugin.java | 3 +- .../ResourceGhostIngredientHandler.java | 71 ++++++++++++ 4 files changed, 141 insertions(+), 110 deletions(-) create mode 100644 refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/FilterGhostIngredientHandler.java delete mode 100644 refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java create mode 100644 refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGhostIngredientHandler.java diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/FilterGhostIngredientHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/FilterGhostIngredientHandler.java new file mode 100644 index 0000000..c503da7 --- /dev/null +++ b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/FilterGhostIngredientHandler.java @@ -0,0 +1,68 @@ +package com.refinedmods.refinedstorage.jei.common; + +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.FilterSlot; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import mezz.jei.api.gui.handlers.IGhostIngredientHandler; +import mezz.jei.api.ingredients.ITypedIngredient; +import net.minecraft.client.renderer.Rect2i; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; + +@SuppressWarnings("rawtypes") +class FilterGhostIngredientHandler implements IGhostIngredientHandler { + @Override + public List> getTargetsTyped(final AbstractBaseScreen screen, + final ITypedIngredient ingredient, + final boolean doStart) { + final I i = ingredient.getIngredient(); + if (i instanceof ItemStack stack) { + final List> targets = new ArrayList<>(); + for (final Slot slot : screen.getMenu().slots) { + if (slot instanceof FilterSlot filterSlot && filterSlot.isActive() && filterSlot.mayPlace(stack)) { + final Rect2i bounds = getBounds(screen, filterSlot); + targets.add(new TargetImpl<>(bounds, filterSlot.index)); + } + } + return targets; + } + return Collections.emptyList(); + } + + private static Rect2i getBounds(final AbstractBaseScreen screen, final Slot slot) { + return new Rect2i(screen.getLeftPos() + slot.x, screen.getTopPos() + slot.y, 17, 17); + } + + @Override + public void onComplete() { + // no op + } + + private static class TargetImpl implements Target { + private final Rect2i area; + private final int slotIndex; + + TargetImpl(final Rect2i area, final int slotIndex) { + this.area = area; + this.slotIndex = slotIndex; + } + + @Override + public Rect2i getArea() { + return area; + } + + @Override + public void accept(final I ingredient) { + if (ingredient instanceof ItemStack stack) { + C2SPackets.sendFilterSlotChange(stack, slotIndex); + } + } + } +} + 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 deleted file mode 100644 index dea9af5..0000000 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.refinedmods.refinedstorage.jei.common; - -import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; -import com.refinedmods.refinedstorage.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage.common.support.containermenu.FilterSlot; -import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import mezz.jei.api.gui.handlers.IGhostIngredientHandler; -import mezz.jei.api.ingredients.ITypedIngredient; -import net.minecraft.client.renderer.Rect2i; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.ItemStack; - -@SuppressWarnings("rawtypes") -class GhostIngredientHandler implements IGhostIngredientHandler { - @Override - public List> getTargetsTyped(final AbstractBaseScreen screen, - final ITypedIngredient ingredient, - final boolean doStart) { - if (screen.getMenu() instanceof AbstractBaseContainerMenu menu) { - return getTargets(screen, ingredient.getIngredient(), menu); - } - return Collections.emptyList(); - } - - private List> getTargets(final AbstractBaseScreen screen, - final I ingredient, - final AbstractBaseContainerMenu menu) { - final List> targets = new ArrayList<>(); - addResourceTargets(screen, ingredient, menu, targets); - addFilterTargets(screen, ingredient, menu, targets); - return targets; - } - - private void addResourceTargets(final AbstractBaseScreen screen, - final I ingredient, - final AbstractBaseContainerMenu menu, - final List> targets) { - if (menu instanceof AbstractResourceContainerMenu resourceMenu) { - RefinedStorageApi.INSTANCE.getIngredientConverter().convertToResource(ingredient).ifPresent(resource -> { - for (final ResourceSlot slot : resourceMenu.getResourceSlots()) { - if (slot.isActive() && slot.isFilter() && slot.isValid(resource)) { - final Rect2i bounds = getBounds(screen, slot); - targets.add(new TargetImpl<>(bounds, slot.index, true)); - } - } - }); - } - } - - private void addFilterTargets(final AbstractBaseScreen screen, - final I ingredient, - final AbstractBaseContainerMenu menu, - final List> targets) { - if (ingredient instanceof ItemStack stack) { - for (final Slot slot : menu.slots) { - if (slot instanceof FilterSlot filterSlot && filterSlot.isActive() && filterSlot.mayPlace(stack)) { - final Rect2i bounds = getBounds(screen, filterSlot); - targets.add(new TargetImpl<>(bounds, filterSlot.index, false)); - } - } - } - } - - private Rect2i getBounds(final AbstractBaseScreen screen, final Slot slot) { - return new Rect2i(screen.getLeftPos() + slot.x, screen.getTopPos() + slot.y, 17, 17); - } - - @Override - public void onComplete() { - // no op - } - - private static class TargetImpl implements Target { - private final Rect2i area; - private final int slotIndex; - private final boolean resource; - - TargetImpl(final Rect2i area, final int slotIndex, final boolean resource) { - this.area = area; - this.slotIndex = slotIndex; - this.resource = resource; - } - - @Override - public Rect2i getArea() { - return area; - } - - @Override - public void accept(final I ingredient) { - if (resource) { - RefinedStorageApi.INSTANCE.getIngredientConverter().convertToResource(ingredient).ifPresent( - convertedResource -> C2SPackets.sendResourceFilterSlotChange(convertedResource, slotIndex) - ); - } else if (ingredient instanceof ItemStack stack) { - C2SPackets.sendFilterSlotChange(stack, slotIndex); - } - } - } -} - diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageModPlugin.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageModPlugin.java index b7079f7..878ef36 100644 --- a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageModPlugin.java +++ b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageModPlugin.java @@ -63,7 +63,8 @@ public void registerGuiHandlers(final IGuiHandlerRegistration registration) { AbstractBaseScreen.class, new ExclusionZonesGuiContainerHandler() ); - registration.addGhostIngredientHandler(AbstractBaseScreen.class, new GhostIngredientHandler()); + registration.addGhostIngredientHandler(AbstractBaseScreen.class, new ResourceGhostIngredientHandler()); + registration.addGhostIngredientHandler(AbstractBaseScreen.class, new FilterGhostIngredientHandler()); } @Nullable diff --git a/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGhostIngredientHandler.java b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGhostIngredientHandler.java new file mode 100644 index 0000000..1ad743d --- /dev/null +++ b/refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGhostIngredientHandler.java @@ -0,0 +1,71 @@ +package com.refinedmods.refinedstorage.jei.common; + +import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; +import com.refinedmods.refinedstorage.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.common.support.packet.c2s.C2SPackets; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import mezz.jei.api.gui.handlers.IGhostIngredientHandler; +import mezz.jei.api.ingredients.ITypedIngredient; +import net.minecraft.client.renderer.Rect2i; +import net.minecraft.world.inventory.Slot; + +@SuppressWarnings("rawtypes") +class ResourceGhostIngredientHandler implements IGhostIngredientHandler { + @Override + public List> getTargetsTyped(final AbstractBaseScreen screen, + final ITypedIngredient ingredient, + final boolean doStart) { + if (screen.getMenu() instanceof AbstractResourceContainerMenu resourceMenu) { + final List> targets = new ArrayList<>(); + RefinedStorageApi.INSTANCE.getIngredientConverter().convertToResource(ingredient.getIngredient()) + .ifPresent(resource -> { + for (final ResourceSlot slot : resourceMenu.getResourceSlots()) { + if (slot.isActive() && slot.isFilter() && slot.isValid(resource)) { + final Rect2i bounds = getBounds(screen, slot); + targets.add(new TargetImpl<>(bounds, slot.index)); + } + } + }); + return targets; + } + return Collections.emptyList(); + } + + private static Rect2i getBounds(final AbstractBaseScreen screen, final Slot slot) { + return new Rect2i(screen.getLeftPos() + slot.x, screen.getTopPos() + slot.y, 17, 17); + } + + @Override + public void onComplete() { + // no op + } + + private static class TargetImpl implements Target { + private final Rect2i area; + private final int slotIndex; + + TargetImpl(final Rect2i area, final int slotIndex) { + this.area = area; + this.slotIndex = slotIndex; + } + + @Override + public Rect2i getArea() { + return area; + } + + @Override + public void accept(final I ingredient) { + RefinedStorageApi.INSTANCE.getIngredientConverter().convertToResource(ingredient).ifPresent( + convertedResource -> C2SPackets.sendResourceFilterSlotChange(convertedResource, slotIndex) + ); + } + } +} + From 2457cea53247f258bde48f24798ec025d43c6b31 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 18:19:36 +0200 Subject: [PATCH 4/5] chore: upgrade refined architect --- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .github/workflows/issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .github/workflows/validate-commit-messages.yml | 2 +- gradle.properties | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9875be5..3ba2c44 100644 --- 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.16.9 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.17.1 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index d1b6a91..e21ed03 100644 --- 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.16.9 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.17.1 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 index 054bce1..f8ce865 100644 --- 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.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 6dc50f4..f7c0e9a 100644 --- 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.16.9 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.17.1 secrets: inherit with: project-name: 'Refined Storage - JEI Integration' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 627e0f5..67112b4 100644 --- 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.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 944aa08..ce5e06e 100644 --- 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.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 218f86e..db04af1 100644 --- 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.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.17.1 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index b70a80d..043dba2 100644 --- 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.16.9 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.17.1 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c025390..28825f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -refinedarchitectVersion=0.16.9 +refinedarchitectVersion=0.17.1 refinedstorageVersion=2.0.0-milestone.4.7 jeiVersion=19.8.2.99 minecraftVersion=1.21 From 87952557af09c20b5a5f9b7522b5640cc5bac77b Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 11 Aug 2024 16:21:03 +0000 Subject: [PATCH 5/5] chore: prepare release v0.5.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79c70a2..f49db75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.5.0] - 2024-08-11 + ### Fixed - Support for Refined Storage v2.0.0-milestone.4.7. @@ -64,7 +66,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.4.0...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.5.0...HEAD + +[0.5.0]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.4.0...v0.5.0 [0.4.0]: https://github.com/refinedmods/refinedstorage-jei-integration/compare/v0.3.2...v0.4.0