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

Rename slave to node.

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-03 00:56:20 +02:00
parent cffb936d48
commit 8c73eebaeb
44 changed files with 172 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/refinedstorage/api/RefinedStorageCapabilities.java
View File

@@ -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<INetworkSlave> NETWORK_SLAVE_CAPABILITY = null;
@CapabilityInject(INetworkNode.class)
public static final Capability<INetworkNode> NETWORK_NODE_CAPABILITY = null;
}

12
src/main/java/refinedstorage/api/network/INetworkMaster.java
View File

@@ -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<INetworkSlave> getSlaves();
List<INetworkNode> 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

14
src/main/java/refinedstorage/api/network/INetworkSlave.java → src/main/java/refinedstorage/api/network/INetworkNode.java
View File

@@ -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();

2
src/main/java/refinedstorage/api/storage/IStorageProvider.java
View File

@@ -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 {
/**

8
src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java
View File

@@ -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();
}
}

8
src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
View File

@@ -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);
}
}

4
src/main/java/refinedstorage/block/BlockCable.java
View File

@@ -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

2
src/main/java/refinedstorage/block/BlockConstructor.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockController.java
View File

@@ -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);

2
src/main/java/refinedstorage/block/BlockCrafter.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockCraftingMonitor.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockDestructor.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockDetector.java
View File

@@ -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() {

2
src/main/java/refinedstorage/block/BlockDiskDrive.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockExporter.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockExternalStorage.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockGrid.java
View File

@@ -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() {

2
src/main/java/refinedstorage/block/BlockImporter.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockInterface.java
View File

@@ -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");
}

18
src/main/java/refinedstorage/block/BlockSlave.java → src/main/java/refinedstorage/block/BlockNode.java
View File

@@ -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);
}
}
}

2
src/main/java/refinedstorage/block/BlockRelay.java
View File

@@ -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");
}

2
src/main/java/refinedstorage/block/BlockSolderer.java
View File

@@ -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() {

2
src/main/java/refinedstorage/block/BlockStorage.java
View File

@@ -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() {

2
src/main/java/refinedstorage/block/BlockWirelessTransmitter.java
View File

@@ -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");
}

24
src/main/java/refinedstorage/gui/GuiController.java
View File

@@ -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<ClientSlave> slaves = controller.getClientSlaves();
List<ClientNode> 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;
}

4
src/main/java/refinedstorage/tile/TileCable.java
View File

@@ -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
}

4
src/main/java/refinedstorage/tile/TileConstructor.java
View File

@@ -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());

4
src/main/java/refinedstorage/tile/TileCrafter.java
View File

@@ -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

4
src/main/java/refinedstorage/tile/TileCraftingMonitor.java
View File

@@ -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<ClientSideCraftingTask> tasks = new ArrayList<ClientSideCraftingTask>();
@Override
@@ -21,7 +21,7 @@ public class TileCraftingMonitor extends TileSlave {
}
@Override
public void updateSlave() {
public void updateNode() {
}
@Override

6
src/main/java/refinedstorage/tile/TileDestructor.java
View File

@@ -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);

4
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -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);

4
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -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

4
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -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;

4
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -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) {

4
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -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;
}

18
src/main/java/refinedstorage/tile/TileSlave.java → src/main/java/refinedstorage/tile/TileNode.java
View File

@@ -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> T getCapability(Capability<T> 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());
}
}

4
src/main/java/refinedstorage/tile/TileRelay.java
View File

@@ -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() {

4
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -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) {

4
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -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

4
src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
View File

@@ -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

6
src/main/java/refinedstorage/tile/controller/ClientSlave.java → src/main/java/refinedstorage/tile/controller/ClientNode.java
View File

@@ -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

122
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -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<INetworkSlave> slaves = new ArrayList<INetworkSlave>();
private List<INetworkSlave> slavesToAdd = new ArrayList<INetworkSlave>();
private List<INetworkSlave> slavesToRemove = new ArrayList<INetworkSlave>();
private List<INetworkNode> nodes = new ArrayList<INetworkNode>();
private List<INetworkNode> nodesToAdd = new ArrayList<INetworkNode>();
private List<INetworkNode> nodesToRemove = new ArrayList<INetworkNode>();
private List<ICraftingPattern> patterns = new ArrayList<ICraftingPattern>();
@@ -107,7 +107,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
private RedstoneMode redstoneMode = RedstoneMode.IGNORE;
private List<ClientSlave> clientSlaves = new ArrayList<ClientSlave>();
private List<ClientNode> clientNodes = new ArrayList<ClientNode>();
@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<INetworkSlave> getSlaves() {
return slaves;
public List<INetworkNode> getNodes() {
return nodes;
}
public List<ClientSlave> getClientSlaves() {
return clientSlaves;
public List<ClientNode> 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<ClientSlave> slaves = new ArrayList<ClientSlave>();
List<ClientNode> nodes = new ArrayList<ClientNode>();
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<ClientSlave> clientSlaves = new ArrayList<ClientSlave>();
List<ClientNode> clientNodes = new ArrayList<ClientNode>();
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);
}
}

6
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -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

6
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -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() {