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

very experimental drive support!!!

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-13 18:10:54 +01:00
parent 9836dfb77c
commit 7f594b5e36
10 changed files with 272 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/storagecraft/network/MessagePullFromStorage.java
View File

@@ -14,6 +14,7 @@ public class MessagePullFromStorage implements IMessage, IMessageHandler<Message
private int x;
private int y;
private int z;
// @TODO: this won't work when sorting
private int slot;
private boolean half;
private boolean shift;
@@ -59,8 +60,8 @@ public class MessagePullFromStorage implements IMessage, IMessageHandler<Message
if (tile instanceof TileController) {
TileController controller = (TileController) tile;
if (message.slot < controller.getStorage().all().size()) {
StorageItem item = controller.getStorage().all().get(message.slot);
if (message.slot < controller.getStorage().getItems().size()) {
StorageItem item = controller.getStorage().getItems().get(message.slot);
int quantity = 64;

14
src/main/java/storagecraft/network/MessagePushToStorage.java
View File

@@ -53,13 +53,15 @@ public class MessagePushToStorage implements IMessage, IMessageHandler<MessagePu
ItemStack stack = message.slot == -1 ? player.inventory.getItemStack() : player.inventory.getStackInSlot(message.slot);
if (stack != null) {
controller.getStorage().push(stack);
boolean success = controller.getStorage().push(stack);
if (message.slot == -1) {
player.inventory.setItemStack(null);
player.updateHeldItem();
} else {
player.inventory.setInventorySlotContents(message.slot, null);
if (success) {
if (message.slot == -1) {
player.inventory.setItemStack(null);
player.updateHeldItem();
} else {
player.inventory.setInventorySlotContents(message.slot, null);
}
}
}
}