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

Made the Disk Manipulator unsided (inserting goes to insert slots and extracting from output slots)

Browse Source
This commit is contained in:
raoulvdberge
2017-12-31 12:02:27 +01:00
parent d0e9e267d8
commit e3e4d5385b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
- Fixed error logs when toggling the Pattern Grid from and to processing mode (raoulvdberge) - Fixed error logs when toggling the Pattern Grid from and to processing mode (raoulvdberge)
- Fixed pattern slots in Crafters not being accessible (raoulvdberge) - Fixed pattern slots in Crafters not being accessible (raoulvdberge)
- Storage disk and block stored and capacity counts are formatted now in the tooltip (raoulvdberge) - Storage disk and block stored and capacity counts are formatted now in the tooltip (raoulvdberge)
- Made the Disk Manipulator unsided (inserting goes to insert slots and extracting from output slots) (raoulvdberge)
### 1.5.30 ### 1.5.30
- Fixed crashing bug when MCMultiPart is not installed (raoulvdberge) - Fixed crashing bug when MCMultiPart is not installed (raoulvdberge)

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

@@ -5,10 +5,7 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.NetworkNodeDiskDrive; import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.NetworkNodeDiskDrive;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.*;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerListenerNetworkNode;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerUpgrade;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator;
import com.raoulvdberge.refinedstorage.tile.config.IComparable; import com.raoulvdberge.refinedstorage.tile.config.IComparable;
@@ -105,6 +102,8 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
} }
}; };
private ItemHandlerProxy disks = new ItemHandlerProxy(inputDisks, outputDisks);
public NetworkNodeDiskManipulator(World world, BlockPos pos) { public NetworkNodeDiskManipulator(World world, BlockPos pos) {
super(world, pos); super(world, pos);
} }
@@ -399,6 +398,10 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
return outputDisks; return outputDisks;
} }
public ItemHandlerProxy getDisks() {
return disks;
}
public ItemHandlerBase getItemFilters() { public ItemHandlerBase getItemFilters() {
return itemFilters; return itemFilters;
} }

2
src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
View File

@@ -59,7 +59,7 @@ public class TileDiskManipulator extends TileNode<NetworkNodeDiskManipulator> {
@Override @Override
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) { public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? getNode().getOutputDisks() : getNode().getInputDisks()); return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getDisks());
} }
return super.getCapability(capability, facing); return super.getCapability(capability, facing);