Skip to content

Fixed Create(6.0.7+) integration for 1.21.x #162

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
v-ondee wants to merge 1 commit into
base: 1.21.x
Choose a base branch
from
Open

Fixed Create(6.0.7+) integration for 1.21.x #162

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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ dependencies {
//implementation "com.teamcofh:cofh_core:${mc_version}-${version_cofhcore}"
//implementation "curse.maven:compactcrafting-429735:${version_compactcrafting}"
implementation "curse.maven:corail-woodcutter-331983:${version_corail_woodcutter}"
implementation("com.simibubi.create:create-${mc_version}:${version_create}-+:all"){ transitive = false }
implementation("com.simibubi.create:create-${mc_version}:${version_create}"){ transitive = false }
// implementation "curse.maven:create-328085:${version_create}"
// implementation "com.brandon3055.draconicevolution:Draconic-Evolution:${mc_version}-${version_draconicevolution}:universal"
// implementation "curse.maven:elemental-craft-395158:${version_elementalcraft}"
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ release_type=release
# Env Details
mc_version=1.21.1
mc_version_range=[1.21.1,1.22)
neo_version=21.1.164
neo_version_range=[21.1.164,)
neo_version=21.1.200
neo_version_range=[21.1.200,)
loader_version_range=[1,)
mapping_channel=parchment
parchment_mc_version=1.21.1
Expand Down Expand Up @@ -98,7 +98,7 @@ version_chipped=5813117
#version_compactcrafting=4145295
# Corail Woodcutter: 3.4.2
version_corail_woodcutter=5749639
version_create=6.0.4
version_create=6.0.8-168
version_draconicevolution=3.1.2.588
# Elemental Craft: 6.0.1
version_elementalcraft=4800163
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/tagnumelite/projecteintegration/addons/CreateAddon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import com.simibubi.create.content.processing.recipe.ProcessingRecipe;
import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe;
import com.simibubi.create.content.processing.sequenced.SequencedRecipe;
import com.simibubi.create.foundation.fluid.FluidIngredient;
import com.tagnumelite.projecteintegration.PEIntegration;
import com.tagnumelite.projecteintegration.api.recipe.ARecipeTypeMapper;
import com.tagnumelite.projecteintegration.api.recipe.nss.NSSInput;
Expand All @@ -57,6 +56,7 @@
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.RecipeType;
import net.neoforged.neoforge.fluids.FluidStack;
import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient;

import java.util.*;

Expand All @@ -67,11 +67,11 @@ static String NAME(String name) {
return "Create" + name + "Mapper";
}

public abstract static class CreateProcessingRecipeMapper<R extends ProcessingRecipe<?>> extends ARecipeTypeMapper<R> {
public abstract static class CreateProcessingRecipeMapper<R extends ProcessingRecipe<?, ?>> extends ARecipeTypeMapper<R> {
@Override
public NSSInput getInput(R recipe) {
NonNullList<Ingredient> ingredients = recipe.getIngredients();
NonNullList<FluidIngredient> fluidIngredients = recipe.getFluidIngredients();
NonNullList<SizedFluidIngredient> fluidIngredients = recipe.getFluidIngredients();
if (ingredients.isEmpty() && fluidIngredients.isEmpty()) {
PEIntegration.debugLog("Recipe ({}) contains no inputs: (Ingredients: {}; Fluids: {})", recipeID, ingredients, fluidIngredients);
return null;
Expand All @@ -90,9 +90,9 @@ public NSSInput getInput(R recipe) {
}
}

for (FluidIngredient fluidIngredient : fluidIngredients) {
final int amount = fluidIngredient.getRequiredAmount();
List<FluidStack> matches = fluidIngredient.getMatchingFluidStacks();
for (SizedFluidIngredient fluidIngredient : fluidIngredients) {
final int amount = fluidIngredient.amount();
List<FluidStack> matches = List.of(fluidIngredient.getFluids());
if (matches.isEmpty()) {
//PEIntegration.LOGGER.warn("");
continue;
Expand Down Expand Up @@ -349,7 +349,7 @@ protected List<Ingredient> getIngredients(SequencedAssemblyRecipe recipe) {

int i = 0;
for (SequencedRecipe<?> step : recipe.getSequence()) {
final ProcessingRecipe<?> stepRecipe = step.getRecipe();
final ProcessingRecipe<?, ?> stepRecipe = step.getRecipe();
final List<Ingredient> stepIngredients = new ArrayList<>(stepRecipe.getIngredients());

// TODO: use fluids from stepRecipe.getFluidIngredients();
Expand Down