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

massive refactor of storage

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-13 21:14:54 +01:00
parent 455ec9dd47
commit 3e021cdf46
12 changed files with 268 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,8 +60,8 @@ public class MessagePullFromStorage implements IMessage, IMessageHandler<Message
if (tile instanceof TileController) {
TileController controller = (TileController) tile;
if (message.slot < controller.getStorage().getItems().size()) {
StorageItem item = controller.getStorage().getItems().get(message.slot);
if (message.slot < controller.getItems().size()) {
StorageItem item = controller.getItems().get(message.slot);
int quantity = 64;
@@ -69,12 +69,12 @@ public class MessagePullFromStorage implements IMessage, IMessageHandler<Message
quantity = item.getQuantity() / 2;
}
ItemStack stack = controller.getStorage().take(item.getType(), quantity, item.getMeta());
ItemStack stack = controller.take(item.getType(), quantity, item.getMeta());
if (message.shift) {
// @TODO: This doesn't work
if (!player.inventory.addItemStackToInventory(stack.copy())) {
controller.getStorage().push(stack);
controller.push(stack);
}
} else {
player.inventory.setItemStack(stack);

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

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