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

Jump to bottom

Fix Fluid Task Detection with Stacked Fluid Containers #125

Open
wants to merge 1 commit into
base: 1.12
Choose a base branch
from
Open

Fix Fluid Task Detection with Stacked Fluid Containers #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 63 additions & 24 deletions src/main/java/betterquesting/questing/tasks/TaskFluid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ public void onInventoryChange(@Nonnull DBEntry<IQuest> quest, @Nonnull Participa
public void detect(ParticipantInfo pInfo, DBEntry<IQuest> quest) {
if (isComplete(pInfo.UUID)) return;

// Removing the consume check here would make the task cheaper on groups and for that reason sharing is restricted to detect only
final List<Tuple<UUID, int[]>> progress = getBulkProgress(consume ? Collections.singletonList(pInfo.UUID) : pInfo.ALL_UUIDS);
// Removing the consume check here would make the task cheaper on groups and for that reason sharing is
// restricted to detect only
List<Tuple<UUID, int[]>> progress = getBulkProgress(
consume ? Collections.singletonList(pInfo.UUID) : pInfo.ALL_UUIDS);
boolean updated = false;

if (!consume) {
if (groupDetect) // Reset all detect progress
{
progress.forEach((value) -> Arrays.fill(value.getSecond(), 0));
} else {
else {
for (int i = 0; i < requiredFluids.size(); i++) {
final int r = requiredFluids.get(i).amount;
for (Tuple<UUID, int[]> value : progress) {
Expand All @@ -105,9 +106,9 @@ public void detect(ParticipantInfo pInfo, DBEntry<IQuest> quest) {
}
}

final List<InventoryPlayer> invoList;
List<InventoryPlayer> invoList;
if (consume) {
// We do not support consuming resources from other member's invetories.
// We do not support consuming resources from other member's inventories.
// This could otherwise be abused to siphon items/fluids unknowingly
invoList = Collections.singletonList(pInfo.PLAYER.inventory);
} else {
Expand All @@ -118,46 +119,84 @@ public void detect(ParticipantInfo pInfo, DBEntry<IQuest> quest) {
for (InventoryPlayer invo : invoList) {
for (int i = 0; i < invo.getSizeInventory(); i++) {
ItemStack stack = invo.getStackInSlot(i);

if (stack.isEmpty()) continue;
IFluidHandlerItem handler = FluidUtil.getFluidHandler(stack);
if (handler == null) continue;

boolean hasDrained = false;
// Make a copy of the stack to retrieve the fluid amount & info.
// Set count to 1, otherwise fluid handlers may not allow draining
var toRetrieveInfo = stack.copy();
toRetrieveInfo.setCount(1);

var handler = FluidUtil.getFluidHandler(toRetrieveInfo);
if (handler == null) continue;

for (int j = 0; j < requiredFluids.size(); j++) {
final FluidStack rStack = requiredFluids.get(j);
FluidStack drainOG = rStack.copy();
if (ignoreNbt) drainOG.tag = null;
FluidStack rStack = requiredFluids.get(j);

// Pre-check
FluidStack sample = handler.drain(drainOG, false);
if (sample == null || sample.amount <= 0) continue;
boolean hasDrained = false;
boolean requiresFullDrain = false;
int fullDrainAmt = 0;

// Initial Check
FluidStack rStackOg = rStack.copy();
rStackOg.amount = (int) Math.ceil((double) rStack.amount / (double) stack.getCount());
FluidStack sample = handler.drain(rStackOg, false);
if (sample == null || sample.amount <= 0) {
// Check if we can drain the entire container instead (Simple Fluid Handler)
if (handler.getTankProperties().length < 1) continue;

fullDrainAmt = handler.getTankProperties()[0].getCapacity();
if (fullDrainAmt <= 0) continue;
rStackOg.amount = fullDrainAmt;

sample = handler.drain(rStackOg, false);
if (sample == null || sample.amount <= 0) continue;

requiresFullDrain = true;
}

// Theoretically this could work in consume mode for parties but the priority order and manual submission code would need changing
// Theoretically this could work in consume mode for parties but the priority order and manual
// submission code would need changing
for (Tuple<UUID, int[]> value : progress) {
if (value.getSecond()[j] >= rStack.amount) continue;
int remaining = rStack.amount - value.getSecond()[j];

FluidStack drain = rStack.copy();
drain.amount = remaining / stack.getCount(); // Must be a multiple of the stack size

// Take the ceiling, so we are not removing less than required
if (requiresFullDrain)
drain.amount = fullDrainAmt;
else
drain.amount = (int) Math.ceil((double) remaining / (double) stack.getCount());
if (ignoreNbt) drain.tag = null;
if (drain.amount <= 0) continue;

FluidStack fluid = handler.drain(drain, consume); // TODO: Look into reducing this to a single call if possible
FluidStack fluid = handler.drain(drain, consume);
if (fluid == null || fluid.amount <= 0) continue;

value.getSecond()[j] += fluid.amount * stack.getCount();
value.getSecond()[j] += Math.min(fluid.amount * stack.getCount(), remaining);
hasDrained = true;
updated = true;
}
}

if (hasDrained && consume) invo.setInventorySlotContents(i, handler.getContainer());
if (!hasDrained) continue;

if (consume) {
// Restore Stack Count
var result = handler.getContainer();
result.setCount(stack.getCount());

// Set Contents
invo.setInventorySlotContents(i, result);
}

break;
}
}
}

if (updated) setBulkProgress(progress);
checkAndComplete(pInfo, quest, updated);
if (updated) setBulkProgress(progress);
checkAndComplete(pInfo, quest, updated);
}
}

private void checkAndComplete(ParticipantInfo pInfo, DBEntry<IQuest> quest, boolean resync) {
Expand Down
Loading