From eb8ca3a796d2ade73d17b9b71bce13c06b47bbde Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 18:43:44 +0100 Subject: [PATCH] Make exporter less fast too --- .../refinedstorage/tile/TileExporter.java | 13 +++-- .../tile/TileExternalStorage.java | 56 +++++++++---------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 9b6b0d2c1..0d8026fec 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -13,6 +13,8 @@ import refinedstorage.util.InventoryUtils; public class TileExporter extends TileMachine implements ICompareSetting { public static final String NBT_COMPARE = "Compare"; + public static final int SPEED = 3; + private InventorySimple inventory = new InventorySimple("exporter", 9, this); private int compare = 0; @@ -24,19 +26,18 @@ public class TileExporter extends TileMachine implements ICompareSetting { @Override public void updateMachine() { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); - if (tile instanceof IInventory) { - IInventory connectedInventory = (IInventory) tile; + if (connectedTile instanceof IInventory) { + IInventory connectedInventory = (IInventory) connectedTile; - if (ticks % 5 == 0) { + if (ticks % SPEED == 0) { for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); if (slot != null) { ItemStack toTake = slot.copy(); - - toTake.stackSize = 64; + toTake.stackSize = 1; ItemStack took = getController().take(toTake, compare); diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 1f6495414..9fa0e4abc 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -48,10 +48,10 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void addItems(List items) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null) { ItemStack stack = deep.getStoredItemType().copy(); @@ -60,8 +60,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider items.add(new StorageItem(stack.splitStack(Math.min(stack.getMaxStackSize(), stack.stackSize)))); } } - } else if (connectedInventory instanceof IInventory) { - IInventory inventory = (IInventory) connectedInventory; + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; for (int i = 0; i < inventory.getSizeInventory(); ++i) { if (inventory.getStackInSlot(i) != null) { @@ -73,29 +73,29 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void push(ItemStack stack) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() == null) { deep.setStoredItemType(stack, stack.stackSize); } else { deep.setStoredItemCount(deep.getStoredItemType().stackSize + stack.stackSize); } - } else if (connectedInventory instanceof IInventory) { - InventoryUtils.pushToInventory((IInventory) connectedInventory, stack); + } else if (connectedTile instanceof IInventory) { + InventoryUtils.pushToInventory((IInventory) connectedTile, stack); } } @Override public ItemStack take(ItemStack stack, int flags) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); int quantity = stack.stackSize; - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null && InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { if (deep.getStoredItemType().stackSize < quantity) { @@ -109,8 +109,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider return took; } - } else if (connectedInventory instanceof IInventory) { - IInventory inventory = (IInventory) connectedInventory; + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); @@ -141,10 +141,10 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public boolean canPush(ItemStack stack) { if (ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack)) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null) { if (InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { @@ -155,15 +155,15 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider } else { return stack.stackSize < deep.getMaxStoredCount(); } - } else if (connectedInventory instanceof IInventory) { - return InventoryUtils.canPushToInventory((IInventory) connectedInventory, stack); + } else if (connectedTile instanceof IInventory) { + return InventoryUtils.canPushToInventory((IInventory) connectedTile, stack); } } return false; } - public TileEntity getConnectedInventory() { + public TileEntity getConnectedTile() { TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) { @@ -179,14 +179,14 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider buf.writeInt(priority); - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; buf.writeInt(deep.getStoredItemType() == null ? 0 : deep.getStoredItemType().stackSize); - } else if (connectedInventory instanceof IInventory) { - buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedInventory)); + } else if (connectedTile instanceof IInventory) { + buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedTile)); } else { buf.writeInt(0); } @@ -314,11 +314,11 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public int getCapacity() { - if (getConnectedInventory() == null) { + if (getConnectedTile() == null) { return 0; } - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedInventory = getConnectedTile(); if (connectedInventory instanceof IDeepStorageUnit) { return ((IDeepStorageUnit) connectedInventory).getMaxStoredCount();