mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 12:19:55 +00:00
Now sending power.
This commit is contained in:
1 parent
1a29d24d09
commit
0a41647899
8 files changed
+267
-30
No files matched your search
@@ -24,7 +24,7 @@ import crazypants.enderio.machine.IoMode;
|
||||
import crazypants.enderio.machine.RedstoneControlMode;
|
||||
import crazypants.enderio.machine.capbank.network.CapBankClientNetwork;
|
||||
import crazypants.enderio.machine.capbank.network.ClientNetworkManager;
|
||||
import crazypants.enderio.machine.capbank.network.NetworkClientState;
|
||||
import crazypants.enderio.machine.capbank.network.NetworkState;
|
||||
import crazypants.enderio.machine.capbank.packet.PacketGuiChange;
|
||||
import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest;
|
||||
import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest;
|
||||
@@ -39,7 +39,7 @@ import crazypants.vecmath.VecmathUtil;
|
||||
|
||||
public class GuiCapBank extends GuiContainerBase {
|
||||
|
||||
private static final NetworkClientState EMPTY_STATE = new NetworkClientState();
|
||||
private static final NetworkState EMPTY_STATE = new NetworkState();
|
||||
|
||||
private static final CapBankClientNetwork NULL_NETWORK = new CapBankClientNetwork(-1);
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package crazypants.enderio.machine.capbank;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
@@ -22,6 +24,7 @@ import crazypants.enderio.machine.IoMode;
|
||||
import crazypants.enderio.machine.RedstoneControlMode;
|
||||
import crazypants.enderio.machine.capbank.network.CapBankNetwork;
|
||||
import crazypants.enderio.machine.capbank.network.ClientNetworkManager;
|
||||
import crazypants.enderio.machine.capbank.network.EnergyReceptor;
|
||||
import crazypants.enderio.machine.capbank.network.NetworkUtil;
|
||||
import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
@@ -46,6 +49,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor
|
||||
private boolean redstoneStateDirty = true;
|
||||
private boolean isRecievingRedstoneSignal;
|
||||
|
||||
private final List<EnergyReceptor> receptors = new ArrayList<EnergyReceptor>();
|
||||
private boolean receptorsDirty = true;
|
||||
|
||||
private CapBankNetwork network;
|
||||
|
||||
//Client side refernce to look up network state
|
||||
@@ -66,6 +72,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor
|
||||
|
||||
public void onNeighborBlockChange(Block blockId) {
|
||||
redstoneStateDirty = true;
|
||||
receptorsDirty = true;
|
||||
}
|
||||
|
||||
//---------- Multiblock
|
||||
@@ -136,6 +143,10 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor
|
||||
network.updateRedstoneSignal(this, recievingSignal);
|
||||
redstoneStateDirty = false;
|
||||
}
|
||||
|
||||
if(receptorsDirty) {
|
||||
updateReceptors();
|
||||
}
|
||||
}
|
||||
|
||||
private void updateNetwork(World world) {
|
||||
@@ -194,15 +205,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor
|
||||
faceModes = new EnumMap<ForgeDirection, IoMode>(ForgeDirection.class);
|
||||
}
|
||||
faceModes.put(faceHit, mode);
|
||||
|
||||
//TODO
|
||||
// if(updateReceptors) {
|
||||
// receptorsDirty = true;
|
||||
// getController().masterReceptorsDirty = true;
|
||||
// notifyNeighbours = true;
|
||||
// }
|
||||
// render = true;
|
||||
// updateBlock();
|
||||
if(updateReceptors) {
|
||||
receptorsDirty = true;
|
||||
}
|
||||
if(worldObj != null) {
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
|
||||
@@ -250,6 +255,36 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor
|
||||
|
||||
//----------- Power
|
||||
|
||||
public List<EnergyReceptor> getReceptors() {
|
||||
if(receptorsDirty) {
|
||||
updateReceptors();
|
||||
}
|
||||
return receptors;
|
||||
}
|
||||
|
||||
private void updateReceptors() {
|
||||
|
||||
if(network == null) {
|
||||
return;
|
||||
}
|
||||
network.removeReceptors(receptors);
|
||||
|
||||
receptors.clear();
|
||||
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
|
||||
IoMode ioMode = getIoMode(dir);
|
||||
if(ioMode != IoMode.DISABLED && ioMode != IoMode.PULL) {
|
||||
IPowerInterface pi = getReceptorForFace(dir);
|
||||
if(pi != null) {
|
||||
EnergyReceptor er = new EnergyReceptor(this, pi, dir);
|
||||
receptors.add(er);
|
||||
}
|
||||
}
|
||||
}
|
||||
network.addReceptors(receptors);
|
||||
|
||||
receptorsDirty = false;
|
||||
}
|
||||
|
||||
public void addEnergy(int energy) {
|
||||
if(network == null) {
|
||||
setEnergyStored(getEnergyStored() + energy);
|
||||
|
||||
@@ -31,7 +31,7 @@ public class CapBankClientNetwork implements ICapBankNetwork {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setState(NetworkClientState state) {
|
||||
public void setState(NetworkState state) {
|
||||
maxEnergyRecieved = state.getMaxInput();
|
||||
maxEnergySent = state.getMaxOutput();
|
||||
maxIO = state.getMaxIO();
|
||||
|
||||
@@ -3,22 +3,34 @@ package crazypants.enderio.machine.capbank.network;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.ConduitNetworkTickHandler;
|
||||
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.power.IPowerConduit;
|
||||
import crazypants.enderio.machine.IoMode;
|
||||
import crazypants.enderio.machine.RedstoneControlMode;
|
||||
import crazypants.enderio.machine.capbank.CapBankType;
|
||||
import crazypants.enderio.machine.capbank.TileCapBank;
|
||||
import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse;
|
||||
import crazypants.enderio.power.IPowerInterface;
|
||||
import crazypants.util.BlockCoord;
|
||||
import crazypants.util.RoundRobinIterator;
|
||||
|
||||
public class CapBankNetwork implements ICapBankNetwork {
|
||||
|
||||
private static final int IO_CAP = 2000000000;
|
||||
|
||||
protected final List<TileCapBank> capBanks = new ArrayList<TileCapBank>();
|
||||
private final List<TileCapBank> capBanks = new ArrayList<TileCapBank>();
|
||||
|
||||
private final Set<EnergyReceptor> receptors = new HashSet<EnergyReceptor>();
|
||||
private RoundRobinIterator<EnergyReceptor> receptorIterator;
|
||||
|
||||
private final int id;
|
||||
|
||||
@@ -45,6 +57,7 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
private boolean inputRedstoneConditionMet = true;
|
||||
private boolean outputRedstoneConditionMet = true;
|
||||
|
||||
private TickListener tickListener;
|
||||
|
||||
public CapBankNetwork(int id) {
|
||||
this.id = id;
|
||||
@@ -57,6 +70,8 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
tickListener = new TickReciever();
|
||||
|
||||
type = cap.getType();
|
||||
inputControlMode = cap.getInputControlMode();
|
||||
outputControlMode = cap.getOutputControlMode();
|
||||
@@ -94,7 +109,7 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
|
||||
@Override
|
||||
public void destroyNetwork() {
|
||||
distributeEnergy();
|
||||
distributeEnergyToBanks();
|
||||
TileCapBank cap = null;
|
||||
for (TileCapBank cb : capBanks) {
|
||||
cb.setNetwork(null);
|
||||
@@ -132,6 +147,12 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
}
|
||||
cap.setInputControlMode(inputControlMode);
|
||||
cap.setOutputControlMode(outputControlMode);
|
||||
|
||||
List<EnergyReceptor> recs = cap.getReceptors();
|
||||
if(!recs.isEmpty()) {
|
||||
addReceptors(recs);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,8 +161,8 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
return id;
|
||||
}
|
||||
|
||||
public NetworkClientState getClientState() {
|
||||
return new NetworkClientState(this);
|
||||
public NetworkState getClientState() {
|
||||
return new NetworkState(this);
|
||||
}
|
||||
|
||||
//--------- Tick Handling
|
||||
@@ -157,18 +178,71 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
long curTime = world.getTotalWorldTime();
|
||||
if(curTime != timeAtLastApply) {
|
||||
timeAtLastApply = curTime;
|
||||
doNetworkTick();
|
||||
ConduitNetworkTickHandler.instance.addListener(tickListener);
|
||||
}
|
||||
}
|
||||
|
||||
private void doNetworkTick() {
|
||||
transmitEnergy();
|
||||
|
||||
if(energyStored != prevEnergyStored) {
|
||||
distributeEnergy();
|
||||
distributeEnergyToBanks();
|
||||
}
|
||||
prevEnergyStored = energyStored;
|
||||
}
|
||||
|
||||
private void distributeEnergy() {
|
||||
private void transmitEnergy() {
|
||||
|
||||
if(!outputRedstoneConditionMet) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(receptors.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
int available;
|
||||
if(energyStored > getMaxEnergySent()) {
|
||||
available = getMaxEnergySent();
|
||||
} else {
|
||||
available = (int) energyStored;
|
||||
}
|
||||
if(available <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(receptorIterator == null) {
|
||||
List<EnergyReceptor> rl = new ArrayList<EnergyReceptor>(receptors);
|
||||
receptorIterator = new RoundRobinIterator<EnergyReceptor>(rl);
|
||||
}
|
||||
|
||||
int totalSent = 0;
|
||||
Iterator<EnergyReceptor> iter = receptorIterator.iterator();
|
||||
while (available > 0 && iter.hasNext()) {
|
||||
int sent = sendPowerTo(iter.next(), available);
|
||||
totalSent += sent;
|
||||
available -= sent;
|
||||
}
|
||||
addEnergy(-totalSent);
|
||||
|
||||
}
|
||||
|
||||
private int sendPowerTo(EnergyReceptor next, int available) {
|
||||
//Can only send to power conduits if we are in push mode or the conduit is in pull mode
|
||||
//With default setting interaction between conduits and Cap Banks is handled by NetworkPowerManager
|
||||
IPowerConduit con = next.getConduit();
|
||||
if(con != null && next.getMode() == IoMode.NONE && con.getConnectionMode(next.getDir().getOpposite()) == ConnectionMode.IN_OUT) {
|
||||
return 0;
|
||||
}
|
||||
IPowerInterface inf = next.getReceptor();
|
||||
int result = inf.recieveEnergy(next.getDir().getOpposite(), available);
|
||||
if(result < 0) {
|
||||
result = 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void distributeEnergyToBanks() {
|
||||
if(capBanks.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
@@ -181,7 +255,7 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
cb.setEnergyStored(cb.getEnergyStored() + remaining);
|
||||
}
|
||||
|
||||
//------ Power
|
||||
//------ Power
|
||||
|
||||
public int recieveEnergy(int maxReceive, boolean simulate) {
|
||||
if(maxReceive <= 0 || !inputRedstoneConditionMet) {
|
||||
@@ -209,6 +283,31 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
}
|
||||
}
|
||||
|
||||
public void addEnergyReceptor(EnergyReceptor rec) {
|
||||
receptors.add(rec);
|
||||
receptorIterator = null;
|
||||
}
|
||||
|
||||
public void addReceptors(Collection<EnergyReceptor> rec) {
|
||||
if(rec.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
receptors.addAll(rec);
|
||||
receptorIterator = null;
|
||||
}
|
||||
|
||||
public void removeReceptors(Collection<EnergyReceptor> rec) {
|
||||
if(rec.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
receptors.removeAll(rec);
|
||||
receptorIterator = null;
|
||||
}
|
||||
|
||||
public void removeReceptor(EnergyReceptor rec) {
|
||||
receptors.remove(rec);
|
||||
receptorIterator = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getEnergyStored() {
|
||||
@@ -325,4 +424,17 @@ public class CapBankNetwork implements ICapBankNetwork {
|
||||
|
||||
}
|
||||
|
||||
private class TickReciever implements TickListener {
|
||||
|
||||
@Override
|
||||
public void tickStart(ServerTickEvent evt) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tickEnd(ServerTickEvent evt) {
|
||||
doNetworkTick();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,7 +25,7 @@ public class ClientNetworkManager {
|
||||
}
|
||||
}
|
||||
|
||||
public void updateState(int id, NetworkClientState state) {
|
||||
public void updateState(int id, NetworkState state) {
|
||||
CapBankClientNetwork network = getOrCreateNetwork(id);
|
||||
network.setState(state);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
package crazypants.enderio.machine.capbank.network;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.conduit.IConduitBundle;
|
||||
import crazypants.enderio.conduit.power.IPowerConduit;
|
||||
import crazypants.enderio.machine.IoMode;
|
||||
import crazypants.enderio.machine.capbank.TileCapBank;
|
||||
import crazypants.enderio.power.IPowerInterface;
|
||||
import crazypants.util.BlockCoord;
|
||||
|
||||
public class EnergyReceptor {
|
||||
|
||||
private final IPowerInterface receptor;
|
||||
private final ForgeDirection fromDir;
|
||||
private final IoMode mode;
|
||||
private final BlockCoord location;
|
||||
|
||||
private final IPowerConduit conduit;
|
||||
|
||||
public EnergyReceptor(TileCapBank cb, IPowerInterface receptor, ForgeDirection dir) {
|
||||
this.receptor = receptor;
|
||||
fromDir = dir;
|
||||
mode = cb.getIoMode(dir);
|
||||
if(receptor.getDelegate() instanceof IConduitBundle) {
|
||||
conduit = ((IConduitBundle) receptor.getDelegate()).getConduit(IPowerConduit.class);
|
||||
} else {
|
||||
conduit = null;
|
||||
}
|
||||
location = cb.getLocation();
|
||||
}
|
||||
|
||||
public IPowerConduit getConduit() {
|
||||
return conduit;
|
||||
}
|
||||
|
||||
public IPowerInterface getReceptor() {
|
||||
return receptor;
|
||||
}
|
||||
|
||||
public ForgeDirection getDir() {
|
||||
return fromDir;
|
||||
}
|
||||
|
||||
public IoMode getMode() {
|
||||
return mode;
|
||||
}
|
||||
|
||||
//NB: Special impl of equals and hash code based solely on the location and dir
|
||||
//This is done to ensure the receptors in the Networks Set are added / removed correctly
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((fromDir == null) ? 0 : fromDir.hashCode());
|
||||
result = prime * result + ((location == null) ? 0 : location.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if(this == obj) {
|
||||
return true;
|
||||
}
|
||||
if(obj == null) {
|
||||
return false;
|
||||
}
|
||||
if(getClass() != obj.getClass()) {
|
||||
return false;
|
||||
}
|
||||
EnergyReceptor other = (EnergyReceptor) obj;
|
||||
if(fromDir != other.fromDir) {
|
||||
return false;
|
||||
}
|
||||
if(location == null) {
|
||||
if(other.location != null) {
|
||||
return false;
|
||||
}
|
||||
} else if(!location.equals(other.location)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "EnergyReceptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + ", conduit=" + conduit + "]";
|
||||
}
|
||||
|
||||
}
|
||||
+6
-6
@@ -3,7 +3,7 @@ package crazypants.enderio.machine.capbank.network;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import crazypants.enderio.machine.RedstoneControlMode;
|
||||
|
||||
public class NetworkClientState {
|
||||
public class NetworkState {
|
||||
|
||||
private final long energyStored;
|
||||
private final long maxEnergyStored;
|
||||
@@ -13,11 +13,11 @@ public class NetworkClientState {
|
||||
private final RedstoneControlMode inputMode;
|
||||
private final RedstoneControlMode outputMode;
|
||||
|
||||
public NetworkClientState() {
|
||||
public NetworkState() {
|
||||
this(0, 0, 0, 0, 0, RedstoneControlMode.IGNORE, RedstoneControlMode.IGNORE);
|
||||
}
|
||||
|
||||
public NetworkClientState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode,
|
||||
public NetworkState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode,
|
||||
RedstoneControlMode ouputMode) {
|
||||
this.energyStored = energyStored;
|
||||
this.maxEnergyStored = maxEnergyStored;
|
||||
@@ -28,7 +28,7 @@ public class NetworkClientState {
|
||||
outputMode = ouputMode;
|
||||
}
|
||||
|
||||
public NetworkClientState(ICapBankNetwork network) {
|
||||
public NetworkState(ICapBankNetwork network) {
|
||||
energyStored = network.getEnergyStored();
|
||||
maxEnergyStored = network.getMaxEnergyStored();
|
||||
maxIO = network.getMaxIO();
|
||||
@@ -76,8 +76,8 @@ public class NetworkClientState {
|
||||
buf.writeShort(outputMode.ordinal());
|
||||
}
|
||||
|
||||
public static NetworkClientState readFromBuf(ByteBuf buf) {
|
||||
return new NetworkClientState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(),
|
||||
public static NetworkState readFromBuf(ByteBuf buf) {
|
||||
return new NetworkState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(),
|
||||
RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()]);
|
||||
}
|
||||
|
||||
+3
-3
@@ -6,12 +6,12 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.machine.capbank.network.CapBankNetwork;
|
||||
import crazypants.enderio.machine.capbank.network.ClientNetworkManager;
|
||||
import crazypants.enderio.machine.capbank.network.NetworkClientState;
|
||||
import crazypants.enderio.machine.capbank.network.NetworkState;
|
||||
|
||||
public class PacketNetworkStateResponse implements IMessage, IMessageHandler<PacketNetworkStateResponse, IMessage> {
|
||||
|
||||
private int id;
|
||||
private NetworkClientState state;
|
||||
private NetworkState state;
|
||||
|
||||
public PacketNetworkStateResponse() {
|
||||
}
|
||||
@@ -43,7 +43,7 @@ public class PacketNetworkStateResponse implements IMessage, IMessageHandler<Pac
|
||||
id = buf.readInt();
|
||||
boolean hasState = buf.readBoolean();
|
||||
if(hasState) {
|
||||
state = NetworkClientState.readFromBuf(buf);
|
||||
state = NetworkState.readFromBuf(buf);
|
||||
} else {
|
||||
state = null;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user