Added spotless back and reformatted
This commit is contained in:
@@ -20,11 +20,12 @@ package appeng.fluids.helper;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import alexiil.mc.lib.attributes.AttributeList;
|
||||
import alexiil.mc.lib.attributes.item.FixedItemInv;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
|
||||
import alexiil.mc.lib.attributes.AttributeList;
|
||||
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
|
||||
import alexiil.mc.lib.attributes.item.FixedItemInv;
|
||||
|
||||
import appeng.api.config.Actionable;
|
||||
import appeng.api.config.Settings;
|
||||
|
||||
@@ -18,16 +18,18 @@
|
||||
|
||||
package appeng.fluids.helper;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import alexiil.mc.lib.attributes.Simulation;
|
||||
import alexiil.mc.lib.attributes.fluid.FluidAttributes;
|
||||
import alexiil.mc.lib.attributes.fluid.FluidExtractable;
|
||||
import alexiil.mc.lib.attributes.fluid.amount.FluidAmount;
|
||||
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
|
||||
import alexiil.mc.lib.attributes.item.filter.ItemFilter;
|
||||
|
||||
import appeng.core.Api;
|
||||
import appeng.fluids.items.FluidDummyItem;
|
||||
import appeng.items.contents.CellConfig;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
||||
* @author DrummerMC
|
||||
@@ -44,7 +46,8 @@ public class FluidCellConfig extends CellConfig {
|
||||
return stack;
|
||||
}
|
||||
|
||||
// Try to auto-convert any fluid-containing item into a dummy item before insertion
|
||||
// Try to auto-convert any fluid-containing item into a dummy item before
|
||||
// insertion
|
||||
FluidExtractable fluidExtractable = FluidAttributes.EXTRACTABLE.getFirstOrNull(stack);
|
||||
if (fluidExtractable == null) {
|
||||
return ItemStack.EMPTY;
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
package appeng.fluids.helper;
|
||||
|
||||
import java.math.RoundingMode;
|
||||
import java.util.*;
|
||||
|
||||
import alexiil.mc.lib.attributes.fluid.GroupedFluidInv;
|
||||
import alexiil.mc.lib.attributes.fluid.amount.FluidAmount;
|
||||
import alexiil.mc.lib.attributes.fluid.volume.FluidKey;
|
||||
|
||||
import appeng.api.storage.data.IAEFluidStack;
|
||||
import appeng.api.storage.data.IItemList;
|
||||
import appeng.fluids.util.AEFluidStack;
|
||||
|
||||
import java.math.RoundingMode;
|
||||
import java.util.*;
|
||||
|
||||
public class GroupedFluidInvCache {
|
||||
|
||||
private final GroupedFluidInv inventory;
|
||||
@@ -38,7 +39,8 @@ public class GroupedFluidInvCache {
|
||||
FluidAmount oldAmount = old == null ? FluidAmount.ZERO : old.getAmount();
|
||||
|
||||
if (!newAmount.equals(oldAmount)) {
|
||||
AEFluidStack newStack = AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount), RoundingMode.DOWN);
|
||||
AEFluidStack newStack = AEFluidStack.fromFluidVolume(storedFluid.withAmount(newAmount),
|
||||
RoundingMode.DOWN);
|
||||
|
||||
if (old != null) {
|
||||
old = old.copy();
|
||||
|
||||
Reference in New Issue
Block a user