From 4577ee14868e22a02eb841fbe6fca41529fa0bf3 Mon Sep 17 00:00:00 2001 From: Abbie Date: Fri, 15 May 2026 22:27:06 +0100 Subject: [PATCH] Update rechiseled integration --- gradle.properties | 16 ++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../exmi/rechiseled/ChiselingEmiRecipe.java | 24 +++++++++++-------- .../exmi/rechiseled/RIntegration.java | 6 ++--- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index 22f8d99..e9ff443 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs = -Xmx4G org.gradle.parallel = true # Gradle Plugins -loom_version = 1.9-SNAPSHOT -moddev_version = 2.0.33-beta +loom_version = 1.14-SNAPSHOT +moddev_version = 2.0.141 versioning_version = 1.0.0 kpublish_version = 1.0.0 submodule_version = 0.7.2 @@ -79,14 +79,14 @@ pneumaticcraft_version = 8.2.9+mc1.21.1 # Rechiseled rechiseled_enabled = true -rechiseled_id_fabric = X8UhAfDk -rechiseled_id_neoforge = UZPjD9WH -fusion_id_fabric = 8YmZC36O -fusion_id_neoforge = GNMK73Sg +rechiseled_id_fabric = Whwd5n82 +rechiseled_id_neoforge = b3uurWWs +fusion_id_fabric = 6fQXv7Yl +fusion_id_neoforge = h2GrA0Ku sm_config_id_fabric = euSlaAtA sm_config_id_neoforge = qKL9jM75 -sm_core_id_fabric = XMcUxulR -sm_core_id_neoforge = I55kQvEh +sm_core_id_fabric = blDCgrqh +sm_core_id_neoforge = hcYSe7v7 # Reliquary reliquary_enabled = true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8fca11c..913e918 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase = GRADLE_USER_HOME distributionPath = wrapper/dists -distributionUrl = https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl = https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout = 10000 validateDistributionUrl = true zipStoreBase = GRADLE_USER_HOME diff --git a/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/ChiselingEmiRecipe.java b/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/ChiselingEmiRecipe.java index b5d3082..8fad81f 100644 --- a/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/ChiselingEmiRecipe.java +++ b/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/ChiselingEmiRecipe.java @@ -3,7 +3,9 @@ import java.util.List; import java.util.stream.Stream; -import com.supermartijn642.rechiseled.chiseling.ChiselingRecipe; +import com.supermartijn642.rechiseled.api.chiseling.ChiselingRecipe; +import com.supermartijn642.rechiseled.api.chiseling.ChiselingBlockShape; +import com.supermartijn642.rechiseled.api.chiseling.ItemWithWorth; import org.jetbrains.annotations.Nullable; @@ -22,18 +24,20 @@ public class ChiselingEmiRecipe extends EmiIngredientRecipe { private final List stacks; public ChiselingEmiRecipe(ChiselingRecipe recipe) { - id = recipe.getRecipeId().withPrefix("/"); - stacks = recipe.getEntries().stream().flatMap(e -> { - if (e.hasRegularItem() && e.hasConnectingItem()) { - return Stream.of(e.getRegularItem(), e.getConnectingItem()); - } else if (e.hasRegularItem()) { - return Stream.of(e.getRegularItem()); - } else if (e.hasConnectingItem()) { - return Stream.of(e.getConnectingItem()); + id = recipe.entries().getFirst().recipe().withPrefix("/"); + stacks = recipe.entries().stream().flatMap(e -> { + ItemWithWorth regularItem = e.getRegularItem(ChiselingBlockShape.BLOCK); + ItemWithWorth connectingItem = e.getConnectingItem(ChiselingBlockShape.BLOCK); + if (regularItem != null && connectingItem != null) { + return Stream.of(regularItem, connectingItem); + } else if (regularItem != null) { + return Stream.of(regularItem); + } else if (connectingItem != null) { + return Stream.of(connectingItem); } else { return Stream.of(); } - }).map(EmiStack::of).toList(); + }).map(ItemWithWorth::item).map(EmiStack::of).toList(); ingredient = EmiIngredient.of(stacks); } diff --git a/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/RIntegration.java b/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/RIntegration.java index 4c29b05..b773100 100644 --- a/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/RIntegration.java +++ b/modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/RIntegration.java @@ -1,8 +1,8 @@ package com.kneelawk.exmi.rechiseled; import com.supermartijn642.rechiseled.Rechiseled; -import com.supermartijn642.rechiseled.chiseling.ChiselingRecipe; -import com.supermartijn642.rechiseled.chiseling.ChiselingRecipes; +import com.supermartijn642.rechiseled.api.chiseling.ChiselingRecipe; +import com.supermartijn642.rechiseled.api.chiseling.ChiselingRecipeManager; import dev.emi.emi.api.EmiRegistry; import dev.emi.emi.api.recipe.EmiRecipeCategory; @@ -24,7 +24,7 @@ public void register(EmiRegistry registry) { registry.addWorkstation(CHISELING, CHISEL); - for (ChiselingRecipe recipe : ChiselingRecipes.getAllRecipes()) { + for (ChiselingRecipe recipe : ChiselingRecipeManager.get(true).getAllRecipes()) { registry.addRecipe(new ChiselingEmiRecipe(recipe)); } }