Skip to content
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

Fix cribs in fluid shaper #3862

Merged
merged 2 commits into from
Jan 25, 2025
Merged

Fix cribs in fluid shaper #3862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32e945b
first commit
lordIcocain Jan 25, 2025
9a76530
Merge branch 'master' into fix_cribs_fluid_shaper
serenibyss Jan 25, 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
26 changes: 26 additions & 0 deletions src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

import javax.annotation.Nonnull;

Expand Down Expand Up @@ -53,6 +55,7 @@
import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase;
import gregtech.api.metatileentity.implementations.MTEHatchEnergy;
import gregtech.api.metatileentity.implementations.MTEHatchInput;
import gregtech.api.objects.GTDualInputs;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.recipe.check.CheckRecipeResult;
Expand All @@ -62,6 +65,7 @@
import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.common.blocks.BlockCasings10;
import gregtech.common.tileentities.machines.IDualInputInventory;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
Expand Down Expand Up @@ -307,6 +311,28 @@ public CheckRecipeResult process() {
return super.process();
}

@Override
public boolean craftingPatternHandler(IDualInputInventory slot) {
if (craftingPatternRecipeCache.containsKey(slot)) {
craftingPattern = slot;
return true;
}

GTDualInputs inputs = slot.getPatternInputs();
setInputItems(inputs.inputItems);
setInputFluids(inputs.inputFluid);
Set<GTRecipe> recipes = findRecipeMatches(RecipeMaps.fluidSolidifierRecipes)
.collect(Collectors.toSet());
if (recipes.isEmpty())
recipes = findRecipeMatches(GGFabRecipeMaps.toolCastRecipes).collect(Collectors.toSet());
if (!recipes.isEmpty()) {
craftingPatternRecipeCache.put(slot, recipes);
craftingPattern = slot;
return true;
}
return false;
}

@NotNull
@Override
protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) {
Expand Down
Loading