Skip to content

Commit

Permalink
fix fluidtank duplication with fluidstacks #49
Browse files Browse the repository at this point in the history
  • Loading branch information
maggi373 committed Nov 16, 2022
1 parent e2afd2c commit 749b93a
Showing 1 changed file with 20 additions and 12 deletions.
32 changes: 20 additions & 12 deletions src/main/java/mekanism/common/tile/TileEntityFluidTank.java
Original file line number Diff line number Diff line change
Expand Up @@ -276,25 +276,18 @@ public boolean isItemValidForSlot(int slotID, ItemStack itemstack)
{
if(slotID == 0)
{
if(itemstack.getItem() instanceof IFluidContainerItem)
{
if (itemstack.getItem() instanceof IFluidContainerItem) {
return true;
}
else if(FluidContainerRegistry.isFilledContainer(itemstack))
{
} else if (FluidContainerRegistry.isFilledContainer(itemstack)) {
FluidStack stack = FluidContainerRegistry.getFluidForFilledItem(itemstack);

if(fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(stack))
{

if (fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(stack)) {
return editMode == ContainerEditMode.EMPTY || editMode == ContainerEditMode.BOTH;
}
}
else if(FluidContainerRegistry.isEmptyContainer(itemstack))
{
} else if (FluidContainerRegistry.isEmptyContainer(itemstack)) {
return editMode == ContainerEditMode.FILL || editMode == ContainerEditMode.BOTH;
}
}

return false;
}

Expand Down Expand Up @@ -625,4 +618,19 @@ public TileComponentSecurity getSecurity()
{
return securityComponent;
}
@Override
public int getInventoryStackLimit()
{
return 1;
}
@Override
public void setInventorySlotContents(int slotID, ItemStack itemstack)
{
inventory[slotID] = itemstack;

if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
{
itemstack.stackSize = getInventoryStackLimit();
}
}
}

0 comments on commit 749b93a

Please sign in to comment.