conflicts...

This commit is contained in:
lordIcocain committed 2024-12-27 11:15:41 +02:00
1 parent 24b2e0a20b
commit 94be0bc52c
1 file changed
+2 -19
@@ -605,27 +605,9 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor
}
}
}
return true;
} else if (mult < 0) {
mult = Math.abs(mult);
for (Slot s : slots) {
ItemStack st = s.getStack();
if (st == null) continue;
final int count;
if (st.getItem() instanceof ItemFluidPacket) {
count = ItemFluidPacket.getFluidAmount(st);
} else {
count = s.getStack().stackSize;
}
if (count % mult != 0) {
return false;
}
}
return true;
}
return false;
}
/**
* Multiply or divide a number
*
@@ -637,6 +619,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor
multiplyOrDivideStacksInternal(this.craftingSlots, multi);
multiplyOrDivideStacksInternal(this.outputSlots, multi);
}
this.detectAndSendChanges();
}
}