diff --git a/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java b/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java index 43e84a1f0..710f75823 100755 --- a/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java +++ b/src/main/java/refinedstorage/api/RefinedStorageCapabilities.java @@ -2,9 +2,9 @@ package refinedstorage.api; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; -import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.INetworkNode; public final class RefinedStorageCapabilities { - @CapabilityInject(INetworkSlave.class) - public static final Capability NETWORK_SLAVE_CAPABILITY = null; + @CapabilityInject(INetworkNode.class) + public static final Capability NETWORK_NODE_CAPABILITY = null; } diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/refinedstorage/api/network/INetworkMaster.java index 7dd0dc470..eed40b731 100755 --- a/src/main/java/refinedstorage/api/network/INetworkMaster.java +++ b/src/main/java/refinedstorage/api/network/INetworkMaster.java @@ -38,19 +38,19 @@ public interface INetworkMaster { boolean canRun(); /** - * @return A list with all the network slaves + * @return A list with all the network nodes */ - List getSlaves(); + List getNodes(); /** - * @param slave The slave to add + * @param node The node to add */ - void addSlave(@Nonnull INetworkSlave slave); + void addNode(@Nonnull INetworkNode node); /** - * @param slave The slave to remove + * @param node The node to remove */ - void removeSlave(@Nonnull INetworkSlave slave); + void removeNode(@Nonnull INetworkNode node); /** * @return The {@link IGridHandler} for this network diff --git a/src/main/java/refinedstorage/api/network/INetworkSlave.java b/src/main/java/refinedstorage/api/network/INetworkNode.java similarity index 68% rename from src/main/java/refinedstorage/api/network/INetworkSlave.java rename to src/main/java/refinedstorage/api/network/INetworkNode.java index da55d6e7e..b1e3f7301 100755 --- a/src/main/java/refinedstorage/api/network/INetworkSlave.java +++ b/src/main/java/refinedstorage/api/network/INetworkNode.java @@ -6,29 +6,29 @@ import net.minecraft.world.World; /** * Represents a node in the storage network. */ -public interface INetworkSlave { +public interface INetworkNode { /** * Called every tile entity tick. */ - void updateSlave(); + void updateNode(); /** - * @return If the slave can send a connectivity update + * @return If this node can send a connectivity update */ boolean canSendConnectivityUpdate(); /** - * @return The energy usage of this slave + * @return The energy usage of this node */ int getEnergyUsage(); /** - * @return The position of this slave in the world + * @return The position of this node in the world */ BlockPos getPosition(); /** - * Called when the neighbor of this slave is changed. Typically used to check if there is still a connection to the network. + * Called when the neighbor of this node is changed. Typically used to check if there is still a connection to the network. * * @param world The world */ @@ -55,7 +55,7 @@ public interface INetworkSlave { boolean isConnected(); /** - * @return If {@link INetworkSlave#canUpdate()} can get called. Typically checks for connection status and redstone mode. + * @return If {@link INetworkNode#canUpdate()} can get called. Typically checks for connection status and redstone mode. */ boolean canUpdate(); diff --git a/src/main/java/refinedstorage/api/storage/IStorageProvider.java b/src/main/java/refinedstorage/api/storage/IStorageProvider.java index 68eb052a7..2003b5502 100755 --- a/src/main/java/refinedstorage/api/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/api/storage/IStorageProvider.java @@ -3,7 +3,7 @@ package refinedstorage.api.storage; import java.util.List; /** - * Implement this interface on the tile that has a {@link refinedstorage.api.RefinedStorageCapabilities#NETWORK_SLAVE_CAPABILITY} capability. + * Implement this interface on the tile that has a {@link refinedstorage.api.RefinedStorageCapabilities#NETWORK_NODE_CAPABILITY} capability. */ public interface IStorageProvider { /** diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java index d0cba32c0..0e1ec7d99 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java @@ -9,7 +9,7 @@ import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.INetworkNode; import refinedstorage.api.network.IWirelessGridHandler; import refinedstorage.api.network.WirelessGridConsumer; import refinedstorage.item.ItemWirelessGrid; @@ -84,9 +84,9 @@ public class WirelessGridHandler implements IWirelessGridHandler { public int getRange() { int range = 0; - for (INetworkSlave slave : network.getSlaves()) { - if (slave instanceof TileWirelessTransmitter) { - range += ((TileWirelessTransmitter) slave).getRange(); + for (INetworkNode node : network.getNodes()) { + if (node instanceof TileWirelessTransmitter) { + range += ((TileWirelessTransmitter) node).getRange(); } } diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java index b48fcbc06..4ebba6e50 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageUtils; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.INetworkNode; import refinedstorage.api.storage.IGroupedStorage; import refinedstorage.api.storage.IStorage; import refinedstorage.api.storage.IStorageProvider; @@ -29,9 +29,9 @@ public class GroupedStorage implements IGroupedStorage { public void rebuild() { storages.clear(); - for (INetworkSlave slave : network.getSlaves()) { - if (slave.canUpdate() && slave instanceof IStorageProvider) { - ((IStorageProvider) slave).addStorages(storages); + for (INetworkNode node : network.getNodes()) { + if (node.canUpdate() && node instanceof IStorageProvider) { + ((IStorageProvider) node).addStorages(storages); } } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index 4c26800c1..982745ce0 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -13,7 +13,7 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.api.RefinedStorageCapabilities; import refinedstorage.tile.TileCable; -public class BlockCable extends BlockSlave { +public class BlockCable extends BlockNode { public static final AxisAlignedBB CABLE_AABB = new AxisAlignedBB(4 * (1F / 16F), 4 * (1F / 16F), 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F), 1 - 4 * (1F / 16F)); public static final PropertyBool NORTH = PropertyBool.create("north"); @@ -57,7 +57,7 @@ public class BlockCable extends BlockSlave { } public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { - return world.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER || (world.getTileEntity(pos) != null && world.getTileEntity(pos).hasCapability(RefinedStorageCapabilities.NETWORK_SLAVE_CAPABILITY, null)); + return world.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER || (world.getTileEntity(pos) != null && world.getTileEntity(pos).hasCapability(RefinedStorageCapabilities.NETWORK_NODE_CAPABILITY, null)); } @Override diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index 60ecd25a8..a9537ac1e 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileConstructor; -public class BlockConstructor extends BlockSlave { +public class BlockConstructor extends BlockNode { public BlockConstructor() { super("constructor"); } diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index d21324a0a..51614cb64 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -105,7 +105,7 @@ public class BlockController extends BlockBase { @Override public void breakBlock(World world, BlockPos pos, IBlockState state) { if (!world.isRemote) { - ((TileController) world.getTileEntity(pos)).disconnectSlaves(); + ((TileController) world.getTileEntity(pos)).disconnectNodes(); } super.breakBlock(world, pos, state); diff --git a/src/main/java/refinedstorage/block/BlockCrafter.java b/src/main/java/refinedstorage/block/BlockCrafter.java index d9eab3300..ddc4294e6 100755 --- a/src/main/java/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/refinedstorage/block/BlockCrafter.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileCrafter; -public class BlockCrafter extends BlockSlave { +public class BlockCrafter extends BlockNode { public BlockCrafter() { super("crafter"); } diff --git a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/refinedstorage/block/BlockCraftingMonitor.java index eb25aaf26..ad465fa74 100755 --- a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java +++ b/src/main/java/refinedstorage/block/BlockCraftingMonitor.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileCraftingMonitor; -public class BlockCraftingMonitor extends BlockSlave { +public class BlockCraftingMonitor extends BlockNode { public BlockCraftingMonitor() { super("crafting_monitor"); } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 196e6c20e..233429f72 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDestructor; -public class BlockDestructor extends BlockSlave { +public class BlockDestructor extends BlockNode { public BlockDestructor() { super("destructor"); } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 8e312dd19..0fe554536 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -16,7 +16,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDetector; -public class BlockDetector extends BlockSlave { +public class BlockDetector extends BlockNode { public static final PropertyBool POWERED = PropertyBool.create("powered"); public BlockDetector() { diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java index 790c4b205..ee94232a7 100755 --- a/src/main/java/refinedstorage/block/BlockDiskDrive.java +++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDiskDrive; -public class BlockDiskDrive extends BlockSlave { +public class BlockDiskDrive extends BlockNode { public BlockDiskDrive() { super("disk_drive"); } diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java index 4f1aba475..e2c5482be 100755 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileExporter; -public class BlockExporter extends BlockSlave { +public class BlockExporter extends BlockNode { public BlockExporter() { super("exporter"); } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index eaa6f1309..e3820a535 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -13,7 +13,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.externalstorage.TileExternalStorage; -public class BlockExternalStorage extends BlockSlave { +public class BlockExternalStorage extends BlockNode { public BlockExternalStorage() { super("external_storage"); } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index 07ba2250d..bf819a5c3 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -20,7 +20,7 @@ import refinedstorage.tile.grid.TileGrid; import java.util.List; -public class BlockGrid extends BlockSlave { +public class BlockGrid extends BlockNode { public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); public BlockGrid() { diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java index 71bf4f77a..ba5f714f8 100755 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileImporter; -public class BlockImporter extends BlockSlave { +public class BlockImporter extends BlockNode { public BlockImporter() { super("importer"); } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index c66c5cec2..a8a6ce80b 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileInterface; -public class BlockInterface extends BlockSlave { +public class BlockInterface extends BlockNode { public BlockInterface() { super("interface"); } diff --git a/src/main/java/refinedstorage/block/BlockSlave.java b/src/main/java/refinedstorage/block/BlockNode.java similarity index 76% rename from src/main/java/refinedstorage/block/BlockSlave.java rename to src/main/java/refinedstorage/block/BlockNode.java index 5a2a27693..f38e53107 100755 --- a/src/main/java/refinedstorage/block/BlockSlave.java +++ b/src/main/java/refinedstorage/block/BlockNode.java @@ -10,12 +10,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.tile.TileSlave; +import refinedstorage.tile.TileNode; -public abstract class BlockSlave extends BlockBase { +public abstract class BlockNode extends BlockBase { public static final PropertyBool CONNECTED = PropertyBool.create("connected"); - public BlockSlave(String name) { + public BlockNode(String name) { super(name); } @@ -35,7 +35,7 @@ public abstract class BlockSlave extends BlockBase { @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { return super.getActualState(state, world, pos) - .withProperty(CONNECTED, ((TileSlave) world.getTileEntity(pos)).isConnected()); + .withProperty(CONNECTED, ((TileNode) world.getTileEntity(pos)).isConnected()); } @Override @@ -43,17 +43,17 @@ public abstract class BlockSlave extends BlockBase { super.onBlockPlacedBy(world, pos, state, player, stack); if (!world.isRemote) { - ((TileSlave) world.getTileEntity(pos)).refreshConnection(world); + ((TileNode) world.getTileEntity(pos)).refreshConnection(world); } } @Override public void breakBlock(World world, BlockPos pos, IBlockState state) { if (!world.isRemote) { - TileSlave slave = (TileSlave) world.getTileEntity(pos); + TileNode node = (TileNode) world.getTileEntity(pos); - if (slave.isConnected()) { - slave.disconnect(world); + if (node.isConnected()) { + node.disconnect(world); } } @@ -65,7 +65,7 @@ public abstract class BlockSlave extends BlockBase { super.neighborChanged(state, world, pos, block); if (!world.isRemote) { - ((TileSlave) world.getTileEntity(pos)).refreshConnection(world); + ((TileNode) world.getTileEntity(pos)).refreshConnection(world); } } } diff --git a/src/main/java/refinedstorage/block/BlockRelay.java b/src/main/java/refinedstorage/block/BlockRelay.java index b99d4ecb2..83a13e011 100755 --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/src/main/java/refinedstorage/block/BlockRelay.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileRelay; -public class BlockRelay extends BlockSlave { +public class BlockRelay extends BlockNode { public BlockRelay() { super("relay"); } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 2e0f5f0b1..baa677dbf 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -16,7 +16,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileSolderer; -public class BlockSolderer extends BlockSlave { +public class BlockSolderer extends BlockNode { public static final PropertyBool WORKING = PropertyBool.create("working"); public BlockSolderer() { diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index 46d8688cd..cd730f319 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -25,7 +25,7 @@ import refinedstorage.tile.TileStorage; import java.util.ArrayList; import java.util.List; -public class BlockStorage extends BlockSlave { +public class BlockStorage extends BlockNode { public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); public BlockStorage() { diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index e641824f9..5441c095d 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -12,7 +12,7 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileWirelessTransmitter; -public class BlockWirelessTransmitter extends BlockSlave { +public class BlockWirelessTransmitter extends BlockNode { public BlockWirelessTransmitter() { super("wireless_transmitter"); } diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 033d2c348..9f5e937ac 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.RenderHelper; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerController; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.controller.ClientSlave; +import refinedstorage.tile.controller.ClientNode; import refinedstorage.tile.controller.TileController; import java.util.List; @@ -62,28 +62,28 @@ public class GuiController extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); - List slaves = controller.getClientSlaves(); + List nodes = controller.getClientNodes(); - ClientSlave slaveHovering = null; + ClientNode nodeHovering = null; for (int i = 0; i < 4; ++i) { - if (slot < slaves.size()) { - ClientSlave slave = slaves.get(slot); + if (slot < nodes.size()) { + ClientNode node = nodes.get(slot); - drawItem(x, y + 5, slave.stack); + drawItem(x, y + 5, node.stack); float scale = 0.5f; GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); - drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 1, scale), RefinedStorageUtils.calculateOffsetOnScale(y - 2, scale), slave.stack.getDisplayName()); - drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 21, scale), RefinedStorageUtils.calculateOffsetOnScale(y + 10, scale), t("gui.refinedstorage:controller.machine_amount", slave.amount)); + drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 1, scale), RefinedStorageUtils.calculateOffsetOnScale(y - 2, scale), node.stack.getDisplayName()); + drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 21, scale), RefinedStorageUtils.calculateOffsetOnScale(y + 10, scale), t("gui.refinedstorage:controller.machine_amount", node.amount)); GlStateManager.popMatrix(); if (inBounds(x, y, 16, 16, mouseX, mouseY)) { - slaveHovering = slave; + nodeHovering = node; } } @@ -97,8 +97,8 @@ public class GuiController extends GuiBase { slot++; } - if (slaveHovering != null) { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage_minimal", slaveHovering.energyUsage)); + if (nodeHovering != null) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage_minimal", nodeHovering.energyUsage)); } if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { @@ -111,7 +111,7 @@ public class GuiController extends GuiBase { } private int getRows() { - int max = (int) Math.ceil((float) controller.getClientSlaves().size() / (float) 2); + int max = (int) Math.ceil((float) controller.getClientNodes().size() / (float) 2); return max < 0 ? 0 : max; } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java index 17b46026c..ac9a33d99 100755 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -3,14 +3,14 @@ package refinedstorage.tile; import net.minecraft.inventory.Container; import refinedstorage.RefinedStorage; -public class TileCable extends TileSlave { +public class TileCable extends TileNode { @Override public int getEnergyUsage() { return RefinedStorage.INSTANCE.cableRfUsage; } @Override - public void updateSlave() { + public void updateNode() { // NO OP } diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index ce0caf3dd..7a1122ea0 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -23,7 +23,7 @@ import refinedstorage.inventory.BasicItemValidator; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; -public class TileConstructor extends TileSlave implements ICompareConfig { +public class TileConstructor extends TileNode implements ICompareConfig { private static final String NBT_COMPARE = "Compare"; private static final int BASE_SPEED = 20; @@ -54,7 +54,7 @@ public class TileConstructor extends TileSlave implements ICompareConfig { } @Override - public void updateSlave() { + public void updateNode() { if (block != null && ticks % RefinedStorageUtils.getSpeed(upgrades, BASE_SPEED, 4) == 0) { BlockPos front = pos.offset(getDirection()); diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index 26ccf65b1..b98b8afd3 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -22,7 +22,7 @@ import refinedstorage.inventory.IItemValidator; import refinedstorage.item.ItemPattern; import refinedstorage.item.ItemUpgrade; -public class TileCrafter extends TileSlave implements ICraftingPatternContainer, IConnectionHandler { +public class TileCrafter extends TileNode implements ICraftingPatternContainer, IConnectionHandler { private BasicItemHandler patterns = new BasicItemHandler(9, this, new IItemValidator() { @Override public boolean valid(ItemStack stack) { @@ -55,7 +55,7 @@ public class TileCrafter extends TileSlave implements ICraftingPatternContainer, } @Override - public void updateSlave() { + public void updateNode() { } @Override diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index eb5de6c58..74ec74107 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class TileCraftingMonitor extends TileSlave { +public class TileCraftingMonitor extends TileNode { private List tasks = new ArrayList(); @Override @@ -21,7 +21,7 @@ public class TileCraftingMonitor extends TileSlave { } @Override - public void updateSlave() { + public void updateNode() { } @Override diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 2afabcbba..c1135a611 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -26,7 +26,7 @@ import refinedstorage.tile.config.ModeFilter; import java.util.List; -public class TileDestructor extends TileSlave implements ICompareConfig, IModeConfig { +public class TileDestructor extends TileNode implements ICompareConfig, IModeConfig { private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; @@ -48,7 +48,7 @@ public class TileDestructor extends TileSlave implements ICompareConfig, IModeCo } @Override - public void updateSlave() { + public void updateNode() { if (ticks % RefinedStorageUtils.getSpeed(upgrades, BASE_SPEED, 4) == 0) { BlockPos front = pos.offset(getDirection()); @@ -63,7 +63,7 @@ public class TileDestructor extends TileSlave implements ICompareConfig, IModeCo worldObj.setBlockToAir(front); for (ItemStack drop : drops) { - // We check if the controller isn't null here because when a destructor faces a slave block and removes it + // We check if the controller isn't null here because when a destructor faces a node and removes it // it will essentially remove this block itself from the network without knowing if (network == null) { InventoryHelper.spawnItemStack(worldObj, front.getX(), front.getY(), front.getZ(), drop); diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 653b0483e..99736ea21 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -14,7 +14,7 @@ import refinedstorage.inventory.BasicItemHandler; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.RedstoneMode; -public class TileDetector extends TileSlave implements ICompareConfig { +public class TileDetector extends TileNode implements ICompareConfig { public static final int SPEED = 5; public static final int MODE_UNDER = 0; @@ -47,7 +47,7 @@ public class TileDetector extends TileSlave implements ICompareConfig { } @Override - public void updateSlave() { + public void updateNode() { if (ticks % SPEED == 0) { ItemStack slot = filter.getStackInSlot(0); diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 7c96e6c64..74bf68854 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -26,7 +26,7 @@ import refinedstorage.tile.config.*; import java.util.List; -public class TileDiskDrive extends TileSlave implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { +public class TileDiskDrive extends TileNode implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { public class Storage extends NBTStorage { public Storage(ItemStack disk) { super(disk.getTagCompound(), EnumStorageType.getById(disk.getItemDamage()).getCapacity(), TileDiskDrive.this); @@ -100,7 +100,7 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora } @Override - public void updateSlave() { + public void updateNode() { } @Override diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 0fbbad31b..d3a74c909 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -19,7 +19,7 @@ import refinedstorage.inventory.BasicItemValidator; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; -public class TileExporter extends TileSlave implements ICompareConfig { +public class TileExporter extends TileNode implements ICompareConfig { private static final String NBT_COMPARE = "Compare"; private BasicItemHandler filters = new BasicItemHandler(9, this); @@ -41,7 +41,7 @@ public class TileExporter extends TileSlave implements ICompareConfig { } @Override - public void updateSlave() { + public void updateNode() { IItemHandler handler = RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); int size = RefinedStorageUtils.hasUpgrade(upgrades, ItemUpgrade.TYPE_STACK) ? 64 : 1; diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 69b438e3b..442a25faa 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -20,7 +20,7 @@ import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.ModeConstants; import refinedstorage.tile.config.ModeFilter; -public class TileImporter extends TileSlave implements ICompareConfig, IModeConfig { +public class TileImporter extends TileNode implements ICompareConfig, IModeConfig { private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; @@ -43,7 +43,7 @@ public class TileImporter extends TileSlave implements ICompareConfig, IModeConf } @Override - public void updateSlave() { + public void updateNode() { IItemHandler handler = RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); if (getFacingTile() instanceof TileDiskDrive || handler == null) { diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 107845fb2..d4f40f63b 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -18,7 +18,7 @@ import refinedstorage.inventory.BasicItemValidator; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.config.ICompareConfig; -public class TileInterface extends TileSlave implements ICompareConfig { +public class TileInterface extends TileNode implements ICompareConfig { private static final String NBT_COMPARE = "Compare"; private BasicItemHandler importItems = new BasicItemHandler(9, this); @@ -41,7 +41,7 @@ public class TileInterface extends TileSlave implements ICompareConfig { } @Override - public void updateSlave() { + public void updateNode() { if (currentSlot >= importItems.getSlots()) { currentSlot = 0; } diff --git a/src/main/java/refinedstorage/tile/TileSlave.java b/src/main/java/refinedstorage/tile/TileNode.java similarity index 91% rename from src/main/java/refinedstorage/tile/TileSlave.java rename to src/main/java/refinedstorage/tile/TileNode.java index 5e38c8019..99f9c8fea 100755 --- a/src/main/java/refinedstorage/tile/TileSlave.java +++ b/src/main/java/refinedstorage/tile/TileNode.java @@ -10,7 +10,7 @@ import net.minecraftforge.common.capabilities.Capability; import refinedstorage.RefinedStorageUtils; import refinedstorage.api.RefinedStorageCapabilities; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.INetworkNode; import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.config.RedstoneMode; import refinedstorage.tile.controller.TileController; @@ -18,7 +18,7 @@ import refinedstorage.tile.controller.TileController; import java.util.HashSet; import java.util.Set; -public abstract class TileSlave extends TileBase implements INetworkSlave, ISynchronizedContainer, IRedstoneModeConfig { +public abstract class TileNode extends TileBase implements INetworkNode, ISynchronizedContainer, IRedstoneModeConfig { private static final String NBT_CONNECTED = "Connected"; private RedstoneMode redstoneMode = RedstoneMode.IGNORE; @@ -63,7 +63,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync } if (isActive()) { - updateSlave(); + updateNode(); } if (active != isActive() && canSendConnectivityUpdate()) { @@ -82,7 +82,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync this.network = network; this.connected = true; - this.network.addSlave(this); + this.network.addNode(this); world.notifyNeighborsOfStateChange(pos, getBlockType()); @@ -97,7 +97,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync this.connected = false; if (this.network != null) { - this.network.removeSlave(this); + this.network.removeNode(this); this.network = null; } @@ -136,7 +136,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync if (tile instanceof TileController) { return (TileController) tile; - } else if (tile instanceof TileSlave) { + } else if (tile instanceof TileNode) { if (visits.size() > 1 && tile instanceof TileRelay && !((TileRelay) tile).canUpdate()) { return null; } @@ -228,7 +228,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync @Override public T getCapability(Capability capability, EnumFacing facing) { - if (capability == RefinedStorageCapabilities.NETWORK_SLAVE_CAPABILITY) { + if (capability == RefinedStorageCapabilities.NETWORK_NODE_CAPABILITY) { return (T) this; } @@ -237,7 +237,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == RefinedStorageCapabilities.NETWORK_SLAVE_CAPABILITY || super.hasCapability(capability, facing); + return capability == RefinedStorageCapabilities.NETWORK_NODE_CAPABILITY || super.hasCapability(capability, facing); } @Override @@ -247,6 +247,6 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync @Override public boolean equals(Object other) { - return other instanceof TileSlave && ((TileSlave) other).getPosition().equals(getPosition()); + return other instanceof TileNode && ((TileNode) other).getPosition().equals(getPosition()); } } diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java index 554bb8b8d..02bcec2dd 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -6,7 +6,7 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.container.ContainerRelay; import refinedstorage.tile.config.RedstoneMode; -public class TileRelay extends TileSlave { +public class TileRelay extends TileNode { private boolean couldUpdate; public TileRelay() { @@ -19,7 +19,7 @@ public class TileRelay extends TileSlave { } @Override - public void updateSlave() { + public void updateNode() { } public void update() { diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 1fd16b243..483baa956 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -20,7 +20,7 @@ import refinedstorage.inventory.BasicItemValidator; import refinedstorage.inventory.SoldererItemHandler; import refinedstorage.item.ItemUpgrade; -public class TileSolderer extends TileSlave { +public class TileSolderer extends TileNode { private static final String NBT_WORKING = "Working"; private static final String NBT_PROGRESS = "Progress"; @@ -40,7 +40,7 @@ public class TileSolderer extends TileSlave { } @Override - public void updateSlave() { + public void updateNode() { boolean wasWorking = working; if (items.getStackInSlot(1) == null && items.getStackInSlot(2) == null && items.getStackInSlot(3) == null) { diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 4de7fd2c3..f228d57a7 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -23,7 +23,7 @@ import refinedstorage.tile.config.*; import java.util.List; -public class TileStorage extends TileSlave implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { +public class TileStorage extends TileNode implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { class Storage extends NBTStorage { public Storage() { super(TileStorage.this.getStorageTag(), TileStorage.this.getCapacity(), TileStorage.this); @@ -69,7 +69,7 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage } @Override - public void updateSlave() { + public void updateNode() { } @Override diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 436a09002..d58fe4701 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -14,7 +14,7 @@ import refinedstorage.inventory.BasicItemHandler; import refinedstorage.inventory.BasicItemValidator; import refinedstorage.item.ItemUpgrade; -public class TileWirelessTransmitter extends TileSlave { +public class TileWirelessTransmitter extends TileNode { private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE)); @Override @@ -23,7 +23,7 @@ public class TileWirelessTransmitter extends TileSlave { } @Override - public void updateSlave() { + public void updateNode() { } @Override diff --git a/src/main/java/refinedstorage/tile/controller/ClientSlave.java b/src/main/java/refinedstorage/tile/controller/ClientNode.java similarity index 70% rename from src/main/java/refinedstorage/tile/controller/ClientSlave.java rename to src/main/java/refinedstorage/tile/controller/ClientNode.java index 92879ef6b..7b97be51e 100755 --- a/src/main/java/refinedstorage/tile/controller/ClientSlave.java +++ b/src/main/java/refinedstorage/tile/controller/ClientNode.java @@ -3,7 +3,7 @@ package refinedstorage.tile.controller; import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageUtils; -public final class ClientSlave { +public final class ClientNode { public ItemStack stack; public int amount; public int energyUsage; @@ -14,11 +14,11 @@ public final class ClientSlave { return true; } - if (!(other instanceof ClientSlave)) { + if (!(other instanceof ClientNode)) { return false; } - return energyUsage == ((ClientSlave) other).energyUsage && RefinedStorageUtils.compareStack(stack, ((ClientSlave) other).stack); + return energyUsage == ((ClientNode) other).energyUsage && RefinedStorageUtils.compareStack(stack, ((ClientNode) other).stack); } @Override diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 4c49131d1..169465229 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -22,7 +22,7 @@ import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.autocrafting.ICraftingTask; import refinedstorage.api.network.IGridHandler; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkSlave; +import refinedstorage.api.network.INetworkNode; import refinedstorage.api.network.IWirelessGridHandler; import refinedstorage.api.storage.IGroupedStorage; import refinedstorage.api.storage.IStorage; @@ -84,9 +84,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } }; - private List slaves = new ArrayList(); - private List slavesToAdd = new ArrayList(); - private List slavesToRemove = new ArrayList(); + private List nodes = new ArrayList(); + private List nodesToAdd = new ArrayList(); + private List nodesToRemove = new ArrayList(); private List patterns = new ArrayList(); @@ -107,7 +107,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR private RedstoneMode redstoneMode = RedstoneMode.IGNORE; - private List clientSlaves = new ArrayList(); + private List clientNodes = new ArrayList(); @Override public BlockPos getPosition() { @@ -127,25 +127,25 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void update() { if (!worldObj.isRemote) { - for (INetworkSlave slave : slavesToAdd) { - slaves.add(slave); + for (INetworkNode node : nodesToAdd) { + nodes.add(node); - if (slave instanceof IConnectionHandler) { - ((IConnectionHandler) slave).onConnected(this); + if (node instanceof IConnectionHandler) { + ((IConnectionHandler) node).onConnected(this); } } - slavesToAdd.clear(); + nodesToAdd.clear(); - for (INetworkSlave slave : slavesToRemove) { - slaves.remove(slave); + for (INetworkNode node : nodesToRemove) { + nodes.remove(node); - if (slave instanceof IConnectionHandler) { - ((IConnectionHandler) slave).onDisconnected(this); + if (node instanceof IConnectionHandler) { + ((IConnectionHandler) node).onDisconnected(this); } } - slavesToRemove.clear(); + nodesToRemove.clear(); if (canRun()) { Collections.sort(storage.getStorages(), sizeComparator); @@ -195,8 +195,8 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR energy.setEnergyStored(energy.getMaxEnergyStored()); } - if (!canRun() && !slaves.isEmpty()) { - disconnectSlaves(); + if (!canRun() && !nodes.isEmpty()) { + disconnectNodes(); } if (couldRun != canRun()) { @@ -222,30 +222,30 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR } @Override - public List getSlaves() { - return slaves; + public List getNodes() { + return nodes; } - public List getClientSlaves() { - return clientSlaves; + public List getClientNodes() { + return clientNodes; } @Override - public void addSlave(INetworkSlave slave) { - slavesToAdd.add(slave); + public void addNode(INetworkNode node) { + nodesToAdd.add(node); } @Override - public void removeSlave(INetworkSlave slave) { - slavesToRemove.add(slave); + public void removeNode(INetworkNode node) { + nodesToRemove.add(node); } - public void disconnectSlaves() { - for (INetworkSlave slave : getSlaves()) { - slave.disconnect(worldObj); + public void disconnectNodes() { + for (INetworkNode node : getNodes()) { + node.disconnect(worldObj); } - slaves.clear(); + nodes.clear(); } @Override @@ -260,7 +260,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void onChunkUnload() { - disconnectSlaves(); + disconnectNodes(); } public IGroupedStorage getStorage() { @@ -356,9 +356,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR public void rebuildPatterns() { patterns.clear(); - for (INetworkSlave slave : slaves) { - if (slave instanceof TileCrafter && slave.canUpdate()) { - TileCrafter crafter = (TileCrafter) slave; + for (INetworkNode node : nodes) { + if (node instanceof TileCrafter && node.canUpdate()) { + TileCrafter crafter = (TileCrafter) node; for (int i = 0; i < crafter.getPatterns().getSlots(); ++i) { ItemStack pattern = crafter.getPatterns().getStackInSlot(i); @@ -596,9 +596,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR if (!worldObj.isRemote) { int usage = 0; - for (INetworkSlave slave : slaves) { - if (slave.canUpdate()) { - usage += slave.getEnergyUsage(); + for (INetworkNode node : nodes) { + if (node.canUpdate()) { + usage += node.getEnergyUsage(); } } @@ -622,21 +622,21 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR this.energyUsage = buf.readInt(); this.redstoneMode = RedstoneMode.getById(buf.readInt()); - List slaves = new ArrayList(); + List nodes = new ArrayList(); int size = buf.readInt(); for (int i = 0; i < size; ++i) { - ClientSlave slave = new ClientSlave(); + ClientNode node = new ClientNode(); - slave.energyUsage = buf.readInt(); - slave.amount = buf.readInt(); - slave.stack = ByteBufUtils.readItemStack(buf); + node.energyUsage = buf.readInt(); + node.amount = buf.readInt(); + node.stack = ByteBufUtils.readItemStack(buf); - slaves.add(slave); + nodes.add(node); } - this.clientSlaves = slaves; + this.clientNodes = nodes; } @Override @@ -646,40 +646,40 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR buf.writeInt(redstoneMode.id); - List clientSlaves = new ArrayList(); + List clientNodes = new ArrayList(); - for (INetworkSlave slave : slaves) { - if (slave.canUpdate()) { - IBlockState state = worldObj.getBlockState(slave.getPosition()); + for (INetworkNode node : nodes) { + if (node.canUpdate()) { + IBlockState state = worldObj.getBlockState(node.getPosition()); - ClientSlave clientSlave = new ClientSlave(); + ClientNode clientNode = new ClientNode(); - clientSlave.energyUsage = slave.getEnergyUsage(); - clientSlave.amount = 1; - clientSlave.stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); + clientNode.energyUsage = node.getEnergyUsage(); + clientNode.amount = 1; + clientNode.stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); - if (clientSlave.stack.getItem() != null) { - if (clientSlaves.contains(clientSlave)) { - for (ClientSlave other : clientSlaves) { - if (other.equals(clientSlave)) { + if (clientNode.stack.getItem() != null) { + if (clientNodes.contains(clientNode)) { + for (ClientNode other : clientNodes) { + if (other.equals(clientNode)) { other.amount++; break; } } } else { - clientSlaves.add(clientSlave); + clientNodes.add(clientNode); } } } } - buf.writeInt(clientSlaves.size()); + buf.writeInt(clientNodes.size()); - for (ClientSlave slave : clientSlaves) { - buf.writeInt(slave.energyUsage); - buf.writeInt(slave.amount); - ByteBufUtils.writeItemStack(buf, slave.stack); + for (ClientNode node : clientNodes) { + buf.writeInt(node.energyUsage); + buf.writeInt(node.amount); + ByteBufUtils.writeItemStack(buf, node.stack); } } diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 3ad7d3e0d..cd05e7147 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -18,7 +18,7 @@ import refinedstorage.inventory.BasicItemHandler; import refinedstorage.network.MessagePriorityUpdate; import refinedstorage.tile.IConnectionHandler; import refinedstorage.tile.IStorageGui; -import refinedstorage.tile.TileSlave; +import refinedstorage.tile.TileNode; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.IRedstoneModeConfig; @@ -27,7 +27,7 @@ import refinedstorage.tile.config.ModeConstants; import java.util.ArrayList; import java.util.List; -public class TileExternalStorage extends TileSlave implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { +public class TileExternalStorage extends TileNode implements IStorageProvider, IStorageGui, ICompareConfig, IModeConfig, IConnectionHandler { private static final String NBT_PRIORITY = "Priority"; private static final String NBT_COMPARE = "Compare"; private static final String NBT_MODE = "Mode"; @@ -50,7 +50,7 @@ public class TileExternalStorage extends TileSlave implements IStorageProvider, } @Override - public void updateSlave() { + public void updateNode() { } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index b6ec98d72..2f1df2178 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -22,13 +22,13 @@ import refinedstorage.inventory.BasicItemHandler; import refinedstorage.inventory.BasicItemValidator; import refinedstorage.item.ItemPattern; import refinedstorage.network.MessageGridSettingsUpdate; -import refinedstorage.tile.TileSlave; +import refinedstorage.tile.TileNode; import refinedstorage.tile.config.IRedstoneModeConfig; import java.util.ArrayList; import java.util.List; -public class TileGrid extends TileSlave implements IGrid { +public class TileGrid extends TileNode implements IGrid { private static final String NBT_SORTING_DIRECTION = "SortingDirection"; private static final String NBT_SORTING_TYPE = "SortingType"; private static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode"; @@ -81,7 +81,7 @@ public class TileGrid extends TileSlave implements IGrid { } @Override - public void updateSlave() { + public void updateNode() { } public EnumGridType getType() {