Skip to content

Update rechiseled integration #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abbie5 wants to merge 1 commit into
base: 1.21.1
Choose a base branch
from
Open

Update rechiseled integration #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 14 additions & 10 deletions modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/ChiselingEmiRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -22,18 +24,20 @@ public class ChiselingEmiRecipe extends EmiIngredientRecipe {
private final List<EmiStack> 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);
}

Expand Down
6 changes: 3 additions & 3 deletions modules/rechiseled-xplat/src/main/java/com/kneelawk/exmi/rechiseled/RIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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));
}
}
Expand Down
Loading