dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disk Manipulator in fluid mode will now extract a bucket at a time instead of 1 mB (or 64 buckets at a time with a Stack Upgrade instead of 64 mB), fixes #1650

Browse Source
This commit is contained in:
raoulvdberge
2018-02-17 23:04:36 +01:00
parent bc65285d41
commit 35b32fb636
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@
- Changed fluid stack amount to not display "0" anymore (ineternet) - Changed fluid stack amount to not display "0" anymore (ineternet)
- Fixed NBT/metadata check on exporting in an Interface (ineternet) - Fixed NBT/metadata check on exporting in an Interface (ineternet)
- Fixed Disk Manipulator being stuck on unemptiable, non-empty disks (ineternet) - Fixed Disk Manipulator being stuck on unemptiable, non-empty disks (ineternet)
- Disk Manipulator in fluid mode will now extract a bucket at a time instead of 1 mB (or 64 buckets at a time with a Stack Upgrade instead of 64 mB) (raoulvdberge)
### 1.5.31 ### 1.5.31
- Improved the "cannot craft! loop in processing..." error message (raoulvdberge) - Improved the "cannot craft! loop in processing..." error message (raoulvdberge)

14
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
View File

@@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@@ -46,7 +47,18 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
private IStorageDisk<ItemStack>[] itemStorages = new IStorageDisk[6]; private IStorageDisk<ItemStack>[] itemStorages = new IStorageDisk[6];
private IStorageDisk<FluidStack>[] fluidStorages = new IStorageDisk[6]; private IStorageDisk<FluidStack>[] fluidStorages = new IStorageDisk[6];
private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK); private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK) {
@Override
public int getItemInteractCount() {
int count = super.getItemInteractCount();
if (type == IType.FLUIDS) {
count *= Fluid.BUCKET_VOLUME;
}
return count;
}
};
private ItemHandlerBase inputDisks = new ItemHandlerBase(3, new ItemHandlerListenerNetworkNode(this), NetworkNodeDiskDrive.VALIDATOR_STORAGE_DISK) { private ItemHandlerBase inputDisks = new ItemHandlerBase(3, new ItemHandlerListenerNetworkNode(this), NetworkNodeDiskDrive.VALIDATOR_STORAGE_DISK) {
@Override @Override