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

Move getBlock dep

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-24 20:56:23 +02:00
parent 08235e9142
commit 95c7dfe5fd
11 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/refinedstorage/block/BlockNode.java
View File

@@ -26,10 +26,6 @@ public abstract class BlockNode extends BlockBase {
return true;
}
public boolean hasConnectivityState() {
return false;
}
@Override
protected BlockStateContainer.Builder createBlockStateBuilder() {
BlockStateContainer.Builder builder = super.createBlockStateBuilder();
@@ -90,4 +86,8 @@ public abstract class BlockNode extends BlockBase {
NetworkUtils.rebuildGraph(network);
}
}
public boolean hasConnectivityState() {
return false;
}
}

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

@@ -98,6 +98,11 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
return new CombinedInvWrapper(patterns, upgrades);
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && facing != getDirection()) {

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

@@ -39,4 +39,9 @@ public class TileCraftingMonitor extends TileNode {
@Override
public void updateNode() {
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

25
src/main/java/refinedstorage/tile/TileFluidInterface.java
View File

@@ -137,6 +137,16 @@ public class TileFluidInterface extends TileNode implements IComparable {
return RefinedStorage.INSTANCE.fluidInterfaceUsage;
}
@Override
public int getCompare() {
return compare;
}
@Override
public void setCompare(int compare) {
this.compare = compare;
}
@Override
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
@@ -186,6 +196,11 @@ public class TileFluidInterface extends TileNode implements IComparable {
return out;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
@@ -199,14 +214,4 @@ public class TileFluidInterface extends TileNode implements IComparable {
return super.getCapability(capability, facing);
}
@Override
public int getCompare() {
return compare;
}
@Override
public void setCompare(int compare) {
this.compare = compare;
}
}

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

@@ -154,6 +154,11 @@ public class TileInterface extends TileNode implements IComparable {
return new CombinedInvWrapper(importItems, exportItems, upgrades);
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {

5
src/main/java/refinedstorage/tile/TileNetworkReceiver.java
View File

@@ -17,4 +17,9 @@ public class TileNetworkReceiver extends TileNode {
public void setRedstoneMode(RedstoneMode mode) {
// NO OP
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

5
src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
View File

@@ -148,4 +148,9 @@ public class TileNetworkTransmitter extends TileNode {
public boolean isDimensionSupported() {
return isSameDimension() || upgrades.hasUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL);
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

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

@@ -1,6 +1,5 @@
package refinedstorage.tile;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -8,7 +7,6 @@ import net.minecraft.world.World;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.INetworkNode;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.block.BlockNode;
import refinedstorage.tile.config.IRedstoneConfigurable;
import refinedstorage.tile.config.RedstoneMode;
import refinedstorage.tile.data.TileDataParameter;
@@ -39,12 +37,6 @@ public abstract class TileNode extends TileBase implements INetworkNode, IRedsto
return isConnected() && canUpdate();
}
private boolean canSendConnectivityUpdate() {
Block block = getBlockType();
return block instanceof BlockNode ? ((BlockNode) block).hasConnectivityState() : false;
}
@Override
public void update() {
if (!worldObj.isRemote) {
@@ -58,7 +50,7 @@ public abstract class TileNode extends TileBase implements INetworkNode, IRedsto
}
}
if (active != isActive() && canSendConnectivityUpdate()) {
if (active != isActive() && hasConnectivityState()) {
updateBlock();
active = isActive();
@@ -155,7 +147,7 @@ public abstract class TileNode extends TileBase implements INetworkNode, IRedsto
public NBTTagCompound writeUpdate(NBTTagCompound tag) {
super.writeUpdate(tag);
if (canSendConnectivityUpdate()) {
if (hasConnectivityState()) {
tag.setBoolean(NBT_CONNECTED, isActive());
}
@@ -163,10 +155,14 @@ public abstract class TileNode extends TileBase implements INetworkNode, IRedsto
}
public void readUpdate(NBTTagCompound tag) {
if (canSendConnectivityUpdate()) {
if (hasConnectivityState()) {
connected = tag.getBoolean(NBT_CONNECTED);
}
super.readUpdate(tag);
}
public boolean hasConnectivityState() {
return false;
}
}

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

@@ -24,4 +24,9 @@ public class TileRelay extends TileNode {
public boolean canConduct(EnumFacing direction) {
return canUpdate();
}
@Override
public boolean hasConnectivityState() {
return true;
}
}

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

@@ -78,6 +78,11 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
return false;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {

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

@@ -418,6 +418,11 @@ public class TileGrid extends TileNode implements IGrid {
return REDSTONE_MODE;
}
@Override
public boolean hasConnectivityState() {
return true;
}
@Override
public void read(NBTTagCompound tag) {
super.read(tag);