Fix centrifuge not working with multiple fluid recipes for same input…

… item
Rearth · Dec 6, 2024 · 791e5e9 · 791e5e9
1 parent 08e0564
commit 791e5e9
Showing 1 changed file with 31 additions and 2 deletions.
diff --git a/common/src/main/java/rearth/oritech/block/entity/processing/CentrifugeBlockEntity.java b/common/src/main/java/rearth/oritech/block/entity/processing/CentrifugeBlockEntity.java
@@ -20,6 +20,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.recipe.RecipeEntry;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.screen.ScreenHandler;
@@ -44,6 +45,8 @@
 import rearth.oritech.util.InventorySlotAssignment;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 public class CentrifugeBlockEntity extends MultiblockMachineEntity implements FluidProvider {
 
@@ -62,7 +65,7 @@ public class CentrifugeBlockEntity extends MultiblockMachineEntity implements Fl
         public void markDirty() {
             CentrifugeBlockEntity.this.markDirty();
         }
-
+        
         @Override
         public boolean canInsert(ItemStack stack) {
             System.out.println(stack);
@@ -155,7 +158,8 @@ protected boolean canProceed(OritechRecipe recipe) {
         // check if input is available
         var input = recipe.getFluidInput();
         if (input == null || input.getAmount() <= 0) return false;
-        if (!input.getFluid().equals(inputStorage.variant.getFluid()) || input.getAmount() > inputStorage.amount) return false;
+        if (!input.getFluid().equals(inputStorage.variant.getFluid()) || input.getAmount() > inputStorage.amount)
+            return false;
 
         // check if output fluid fits
         var output = recipe.getFluidOutput();
@@ -170,6 +174,31 @@ protected boolean canProceed(OritechRecipe recipe) {
 
     }
 
+    @Override
+    protected Optional<RecipeEntry<OritechRecipe>> getRecipe() {
+
+        if (!hasFluidAddon)
+            return super.getRecipe();
+
+        // get recipes matching input items
+        var candidates = Objects.requireNonNull(world).getRecipeManager().getAllMatches(getOwnRecipeType(), getInputInventory(), world);
+        // filter out recipes based on input tank
+        return candidates.stream().filter(candidate -> recipeMatchesTank(inputStorage, candidate.value())).findAny();
+    }
+
+    protected boolean recipeMatchesTank(SingleVariantStorage<FluidVariant> checkedTank, OritechRecipe recipe) {
+
+        var isTankEmpty = checkedTank.isResourceBlank() || checkedTank.amount <= 0;
+        var recipeNeedsFluid = recipe.getFluidInput() != null && recipe.getFluidInput().getAmount() > 0;
+
+        if (!recipeNeedsFluid) return true;
+        if (isTankEmpty) return false;
+
+        var recipeFluid = recipe.getFluidInput().getFluid();
+        var tankFluid = checkedTank.variant.getFluid();
+        return recipeFluid.equals(tankFluid) && checkedTank.amount >= recipe.getFluidInput().getAmount();
+    }
+
     @Override
     protected void craftItem(OritechRecipe activeRecipe, List<ItemStack> outputInventory, List<ItemStack> inputInventory) {
         super.craftItem(activeRecipe, outputInventory, inputInventory);