Skip to content

Add support for custom ProcessingRecipeParams in basin recipes #9070

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
wants to merge 2 commits into
base: mc1.21.1/dev
Choose a base branch
from
Open

Add support for custom ProcessingRecipeParams in basin recipes #9070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39f034b
The great BasinRecipe split
dudek26 Aug 8, 2025
1836c10
The greater BasinRecipe split
dudek26 Aug 9, 2025
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
13 changes: 6 additions & 7 deletions src/main/java/com/simibubi/create/AllRecipeTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import java.util.function.Predicate;
import java.util.function.Supplier;

import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipeParams;

import org.jetbrains.annotations.ApiStatus.Internal;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand All @@ -20,6 +18,7 @@
import com.simibubi.create.content.kinetics.crusher.CrushingRecipe;
import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe;
import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipe;
import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipeParams;
import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe;
import com.simibubi.create.content.kinetics.fan.processing.HauntingRecipe;
import com.simibubi.create.content.kinetics.fan.processing.SplashingRecipe;
Expand Down Expand Up @@ -60,9 +59,9 @@ public enum AllRecipeTypes implements IRecipeTypeInfo, StringRepresentable {
CRUSHING(CrushingRecipe::new),
CUTTING(CuttingRecipe::new),
MILLING(MillingRecipe::new),
BASIN(BasinRecipe::new),
MIXING(MixingRecipe::new),
COMPACTING(CompactingRecipe::new),
BASIN(() -> new BasinRecipe.Serializer<>(BasinRecipe::new)),
MIXING(() -> new BasinRecipe.Serializer<>(MixingRecipe::new)),
COMPACTING(() -> new BasinRecipe.Serializer<>(CompactingRecipe::new)),
PRESSING(PressingRecipe::new),
SANDPAPER_POLISHING(SandPaperPolishingRecipe::new),
SPLASHING(SplashingRecipe::new),
Expand All @@ -79,8 +78,8 @@ public enum AllRecipeTypes implements IRecipeTypeInfo, StringRepresentable {
ITEM_COPYING(() -> new SimpleCraftingRecipeSerializer<>(ItemCopyingRecipe::new), () -> RecipeType.CRAFTING, false);

public static final Predicate<RecipeHolder<?>> CAN_BE_AUTOMATED = r -> !r.id()
.getPath()
.endsWith("_manual_only");
.getPath()
.endsWith("_manual_only");

public final ResourceLocation id;
public final Supplier<RecipeSerializer<?>> serializerSupplier;
Expand Down
15 changes: 13 additions & 2 deletions src/main/java/com/simibubi/create/api/data/recipe/CompactingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
import java.util.concurrent.CompletableFuture;

import com.simibubi.create.AllRecipeTypes;

import com.simibubi.create.content.kinetics.mixer.CompactingRecipe;
import com.simibubi.create.content.processing.basin.BasinRecipe;
import com.simibubi.create.content.processing.basin.BasinRecipe.Builder;
import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;

import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;

/**
* The base class for Compacting recipe generation.
Expand All @@ -16,7 +19,7 @@
* For an example of how you might do this, see Create's implementation: {@link com.simibubi.create.foundation.data.recipe.CreateCompactingRecipeGen}.
* Needs to be added to a registered recipe provider to do anything, see {@link com.simibubi.create.foundation.data.recipe.CreateRecipeProvider}
*/
public abstract class CompactingRecipeGen extends StandardProcessingRecipeGen<CompactingRecipe> {
public abstract class CompactingRecipeGen extends ProcessingRecipeGen<ProcessingRecipeParams, CompactingRecipe, BasinRecipe.Builder<CompactingRecipe>> {

public CompactingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
super(output, registries, defaultNamespace);
Expand All @@ -27,4 +30,12 @@ protected AllRecipeTypes getRecipeType() {
return AllRecipeTypes.COMPACTING;
}

protected BasinRecipe.Serializer<CompactingRecipe> getSerializer() {
return getRecipeType().getSerializer();
}

@Override
protected Builder<CompactingRecipe> getBuilder(ResourceLocation id) {
return new BasinRecipe.Builder<>(getSerializer().factory(), id);
}
}
16 changes: 14 additions & 2 deletions src/main/java/com/simibubi/create/api/data/recipe/MixingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
import java.util.concurrent.CompletableFuture;

import com.simibubi.create.AllRecipeTypes;

import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
import com.simibubi.create.content.processing.basin.BasinRecipe;
import com.simibubi.create.content.processing.basin.BasinRecipe.Builder;
import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams;

import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;

/**
* The base class for Mixing recipe generation.
Expand All @@ -15,7 +19,7 @@
* For an example of how you might do this, see Create's implementation: {@link com.simibubi.create.foundation.data.recipe.CreateMixingRecipeGen}.
* Needs to be added to a registered recipe provider to do anything, see {@link com.simibubi.create.foundation.data.recipe.CreateRecipeProvider}
*/
public abstract class MixingRecipeGen extends StandardProcessingRecipeGen<MixingRecipe> {
public abstract class MixingRecipeGen extends ProcessingRecipeGen<ProcessingRecipeParams, MixingRecipe, BasinRecipe.Builder<MixingRecipe>> {

public MixingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, String defaultNamespace) {
super(output, registries, defaultNamespace);
Expand All @@ -26,4 +30,12 @@ protected AllRecipeTypes getRecipeType() {
return AllRecipeTypes.MIXING;
}

protected BasinRecipe.Serializer<MixingRecipe> getSerializer() {
return getRecipeType().getSerializer();
}

@Override
protected Builder<MixingRecipe> getBuilder(ResourceLocation id) {
return new BasinRecipe.Builder<>(getSerializer().factory(), id);
}
}
Loading