From 2cf8543615c17b502fe193563d508450adde595c Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 20 Jun 2024 21:49:27 +0200 Subject: [PATCH 1/3] fix: recipe transfer not working --- CHANGELOG.md | 4 ++++ .../refinedstorage/emi/common/EmiRecipeHandlerImpl.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28cfb75..923940a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Recipe transfer not working. + ## [0.1.0] - 2024-06-20 ### Added diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java index a041a78..c9f19ed 100644 --- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java +++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java @@ -1,6 +1,7 @@ package com.refinedmods.refinedstorage.emi.common; import java.util.List; +import java.util.stream.Collectors; import com.mojang.blaze3d.systems.RenderSystem; import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; @@ -17,6 +18,7 @@ import dev.emi.emi.api.widget.SlotWidget; import dev.emi.emi.api.widget.Widget; import dev.emi.emi.runtime.EmiDrawContext; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; @@ -72,7 +74,7 @@ private List getStacks(final EmiIngredient input) { .map(EmiStack::getItemStack) .filter(stack -> !stack.isEmpty()) .map(ItemResource::ofItemStack) - .toList(); + .collect(Collectors.toList()); } @Override @@ -82,6 +84,7 @@ public boolean craft(final EmiRecipe recipe, final EmiCraftContext Date: Thu, 20 Jun 2024 21:49:40 +0200 Subject: [PATCH 2/3] feat: recipe defaults --- CHANGELOG.md | 4 ++ .../refinedstorage_emi_integration.json | 72 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 923940a..7f956a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added + +- Recipe defaults. + ### Fixed - Recipe transfer not working. diff --git a/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json new file mode 100644 index 0000000..b369cf7 --- /dev/null +++ b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json @@ -0,0 +1,72 @@ +{ + "added": [ + "refinedstorage2:stack_upgrade", + "refinedstorage2:block_of_quartz_enriched_iron", + "refinedstorage2:upgrade", + "refinedstorage2:fortune_3_upgrade", + "refinedstorage2:crafting_grid", + "refinedstorage2:64b_fluid_storage_disk", + "refinedstorage2:security_card", + "refinedstorage2:256b_fluid_storage_disk", + "refinedstorage2:1k_storage_part", + "refinedstorage2:construction_core", + "refinedstorage2:improved_processor", + "refinedstorage2:4096b_fluid_storage_disk", + "refinedstorage2:wireless_grid", + "refinedstorage2:64b_fluid_storage_part", + "refinedstorage2:4k_storage_disk", + "refinedstorage2:range_upgrade", + "refinedstorage2:cable", + "refinedstorage2:1024b_fluid_storage_part", + "refinedstorage2:4k_storage_block", + "refinedstorage2:64k_storage_disk", + "refinedstorage2:interface", + "refinedstorage2:speed_upgrade", + "refinedstorage2:network_receiver", + "refinedstorage2:silk_touch_upgrade", + "refinedstorage2:exporter", + "refinedstorage2:4096b_fluid_storage_part", + "refinedstorage2:4k_storage_part", + "refinedstorage2:16k_storage_block", + "refinedstorage2:64k_storage_block", + "refinedstorage2:configuration_card", + "refinedstorage2:importer", + "refinedstorage2:controller", + "refinedstorage2:external_storage", + "refinedstorage2:64k_storage_part", + "refinedstorage2:storage_housing", + "refinedstorage2:1k_storage_disk", + "refinedstorage2:fortune_1_upgrade", + "refinedstorage2:constructor", + "refinedstorage2:4096b_fluid_storage_block", + "refinedstorage2:fortune_2_upgrade", + "refinedstorage2:1024b_fluid_storage_disk", + "refinedstorage2:256b_fluid_storage_part", + "refinedstorage2:64b_fluid_storage_block", + "refinedstorage2:network_transmitter", + "refinedstorage2:16k_storage_disk", + "refinedstorage2:1k_storage_block", + "refinedstorage2:portable_grid", + "refinedstorage2:destruction_core", + "refinedstorage2:16k_storage_part", + "refinedstorage2:advanced_processor", + "refinedstorage2:grid", + "refinedstorage2:256b_fluid_storage_block", + "refinedstorage2:relay", + "refinedstorage2:security_manager", + "refinedstorage2:1024b_fluid_storage_block", + "refinedstorage2:fallback_security_card", + "refinedstorage2:disk_drive", + "refinedstorage2:raw_basic_processor", + "refinedstorage2:wireless_transmitter", + "refinedstorage2:raw_improved_processor", + "refinedstorage2:basic_processor", + "refinedstorage2:network_card", + "refinedstorage2:detector", + "refinedstorage2:storage_monitor", + "refinedstorage2:destructor", + "refinedstorage2:regulator_upgrade", + "refinedstorage2:wrench", + "refinedstorage2:raw_advanced_processor" + ] +} \ No newline at end of file From 85991a31e71c5e28b293bfa75e30d139606ead3c Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 20 Jun 2024 19:55:26 +0000 Subject: [PATCH 3/3] 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 7f956a1..cdf1d4d 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-20 + ### Added - Recipe defaults. @@ -25,6 +27,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Recipe transfer integration for the Crafting Grid. - Grid / EMI search box synchronization options. -[Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.1.0...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.2.0...HEAD + +[0.2.0]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.1.0...v0.2.0 [0.1.0]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/6525c5339e844996b6c2b4b3f8a9e4b65cb7de68...v0.1.0