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 Issue #995 Voiding mended item in XP tank #1002

Merged
merged 2 commits into from
Feb 19, 2025
Merged

Fix Issue #995 Voiding mended item in XP tank #1002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d732f91
Repairing a mending item in the XP tank would void any item already i…
CrazyPants Feb 14, 2025
470c039
Moved check up.
CrazyPants Feb 19, 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
8 changes: 4 additions & 4 deletions ...nes/src/main/java/com/enderio/machines/common/blocks/fluid_tank/FluidTankBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import com.enderio.machines.common.io.fluid.MachineFluidTank;
import com.enderio.machines.common.io.fluid.MachineTankLayout;
import com.enderio.machines.common.io.fluid.TankAccess;
import java.util.List;
import java.util.Optional;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.component.DataComponentMap;
Expand All @@ -41,9 +43,6 @@
import org.apache.commons.lang3.NotImplementedException;
import org.jetbrains.annotations.Nullable;

import java.util.List;
import java.util.Optional;

// TODO: Rewrite this with tasks?
// Could implement a task for each thing it currently has in the If's
public abstract class FluidTankBlockEntity extends MachineBlockEntity implements FluidItemInteractive, FluidTankUser {
Expand Down Expand Up @@ -332,7 +331,8 @@ private void tryTankRecipe() {
private void tryMendTool() {
FluidStack fluid = TANK.getFluid(this);

if (!fluid.isEmpty() && fluid.is(EIOTags.Fluids.EXPERIENCE)) {
if (!fluid.isEmpty() && fluid.is(EIOTags.Fluids.EXPERIENCE)
&& FLUID_DRAIN_OUTPUT.getItemStack(this).isEmpty()) {
ItemStack tool = FLUID_DRAIN_INPUT.getItemStack(this);

var enchantmentsRecipe = level.registryAccess().lookupOrThrow(Registries.ENCHANTMENT);
Expand Down