tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Universal cable support for accepting from UE machines. change *Network* to *TransmitterNetwork* in ITransmitter to avoid method name conflicts.

Browse source 
Not all IConductor methods are properly implemented, doesn't seem to cause problems in my testing. Could probably implement IElectricityNetwork in EnergyNetwork but this seems to work.
This commit is contained in:
Ben Spiers 2013-08-27 00:04:00 +01:00
parent 86b8499bb5
commit 9755b47833
17 changed files with 216 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/api/gas/GasNetwork.java
View file

@ -126,7 +126,7 @@ public class GasNetwork extends DynamicNetwork<IGasAcceptor, GasNetwork>
transmitters.remove(conductor);
}
else {
conductor.setNetwork(this);
conductor.setTransmitterNetwork(this);
}
}

4
common/mekanism/api/gas/GasTransmission.java
View file

@ -96,7 +96,7 @@ public final class GasTransmission
if(TransmissionType.checkTransmissionType(pointer, TransmissionType.GAS, sender))
{
return ((ITransmitter<GasNetwork>)pointer).getNetwork().emit(amount, type, sender);
return ((ITransmitter<GasNetwork>)pointer).getTransmitterNetwork().emit(amount, type, sender);
}
return amount;
@ -122,7 +122,7 @@ public final class GasTransmission
if(TransmissionType.checkTransmissionType(sideTile, TransmissionType.GAS, pointer))
{
networks.add(((ITransmitter<GasNetwork>)sideTile).getNetwork());
networks.add(((ITransmitter<GasNetwork>)sideTile).getTransmitterNetwork());
}
}

2
common/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -111,7 +111,7 @@ public abstract class DynamicNetwork<A, N> implements ITransmitterNetwork<A, N>
if(TransmissionType.checkTransmissionType(nodeTile, getTransmissionType(), (TileEntity) transmitter))
{
((ITransmitter<N>)nodeTile).removeFromNetwork();
((ITransmitter<N>)nodeTile).removeFromTransmitterNetwork();
newTransporters.add((ITransmitter<N>)nodeTile);
}
}

22
common/mekanism/api/transmitters/ITransmitter.java
View file

@ -15,7 +15,7 @@ public interface ITransmitter<N>
* Gets the network currently in use by this transmitter segment.
* @return network this transmitter is using
*/
public N getNetwork();
public N getTransmitterNetwork();
/**
* Gets the network currently in use by this transmitter segment.
@ -24,37 +24,37 @@ public interface ITransmitter<N>
* if none is available
* @return network this transmitter is using
*/
public N getNetwork(boolean createIfNull);
public N getTransmitterNetwork(boolean createIfNull);
/**
* Sets this transmitter segment's network to a new value.
* @param network - network to set to
*/
public void setNetwork(N network);
public void setTransmitterNetwork(N network);
/**
* Refreshes the transmitter's network.
*/
public void refreshNetwork();
public void refreshTransmitterNetwork();
/**
* Remove this transmitter from its network.
*/
public void removeFromNetwork();
public void removeFromTransmitterNetwork();
/**
* Call this if you're worried a transmitter's network is messed up and you want
* it to try and fix itself.
*/
public void fixNetwork();
public void fixTransmitterNetwork();
public boolean areNetworksEqual(TileEntity tileEntity);
public boolean areTransmitterNetworksEqual(TileEntity tileEntity);
public int getNetworkSize();
public int getTransmitterNetworkSize();
public int getNetworkAcceptorSize();
public int getTransmitterNetworkAcceptorSize();
public String getNetworkNeeded();
public String getTransmitterNetworkNeeded();
public String getNetworkFlow();
public String getTransmitterNetworkFlow();
}

2
common/mekanism/api/transmitters/TransmitterNetworkRegistry.java
View file

@ -140,7 +140,7 @@ public class TransmitterNetworkRegistry implements ITickHandler
if(tileEntity instanceof ITransmitter)
{
((ITransmitter)tileEntity).refreshNetwork();
((ITransmitter)tileEntity).refreshTransmitterNetwork();
}
}
}

2
common/mekanism/common/EnergyNetwork.java
View file

@ -220,7 +220,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
transmitters.remove(conductor);
}
else {
conductor.setNetwork(this);
conductor.setTransmitterNetwork(this);
}
}

2
common/mekanism/common/FluidNetwork.java
View file

@ -150,7 +150,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
transmitters.remove(conductor);
}
else {
conductor.setNetwork(this);
conductor.setTransmitterNetwork(this);
}
}

2
common/mekanism/common/InventoryNetwork.java
View file

@ -70,7 +70,7 @@ public class InventoryNetwork extends DynamicNetwork<IInventory, InventoryNetwor
transmitters.remove(conductor);
}
else {
conductor.setNetwork(this);
conductor.setTransmitterNetwork(this);
}
}

4
common/mekanism/common/block/BlockTransmitter.java
View file

@ -271,7 +271,7 @@ public class BlockTransmitter extends Block
if(!world.isRemote)
{
((ITransmitter)tileEntity).refreshNetwork();
((ITransmitter)tileEntity).refreshTransmitterNetwork();
}
}
@ -282,7 +282,7 @@ public class BlockTransmitter extends Block
if(!world.isRemote)
{
((ITransmitter)tileEntity).refreshNetwork();
((ITransmitter)tileEntity).refreshTransmitterNetwork();
}
}

2
common/mekanism/common/item/ItemConfigurator.java
View file

@ -77,7 +77,7 @@ public class ItemConfigurator extends ItemEnergized
}
else if(world.getBlockTileEntity(x, y, z) instanceof ITransmitter)
{
((ITransmitter)world.getBlockTileEntity(x, y, z)).fixNetwork();
((ITransmitter)world.getBlockTileEntity(x, y, z)).fixTransmitterNetwork();
}
if(getState(stack) == 0)

8
common/mekanism/common/item/ItemNetworkReader.java
View file

@ -35,10 +35,10 @@ public class ItemNetworkReader extends ItemEnergized
ITransmitter transmitter = (ITransmitter)tileEntity;
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getNetworkSize()));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + transmitter.getNetworkAcceptorSize()));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Needed: " + EnumColor.DARK_GREY + transmitter.getNetworkNeeded()));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Power: " + EnumColor.DARK_GREY + transmitter.getNetworkFlow() ));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkSize()));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkAcceptorSize()));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Needed: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkNeeded()));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + " *Power: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkFlow() ));
player.sendChatToPlayer(ChatMessageComponent.func_111066_d(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
}
}

36
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
View file

@ -34,7 +34,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
}
@Override
public InventoryNetwork getNetwork(boolean createIfNull)
public InventoryNetwork getTransmitterNetwork(boolean createIfNull)
{
if(theNetwork == null && createIfNull)
{
@ -44,9 +44,9 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
for(TileEntity transporter : adjacentTransporters)
{
if(TransmissionType.checkTransmissionType(transporter, getTransmissionType()) && ((ITransmitter<InventoryNetwork>)transporter).getNetwork(false) != null)
if(TransmissionType.checkTransmissionType(transporter, getTransmissionType()) && ((ITransmitter<InventoryNetwork>)transporter).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<InventoryNetwork>)transporter).getNetwork());
connectedNets.add(((ITransmitter<InventoryNetwork>)transporter).getTransmitterNetwork());
}
}
@ -69,9 +69,9 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
}
@Override
public void fixNetwork()
public void fixTransmitterNetwork()
{
getNetwork().fixMessedUpNetwork(this);
getTransmitterNetwork().fixMessedUpNetwork(this);
}
@Override
@ -79,14 +79,14 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
{
if(!worldObj.isRemote)
{
getNetwork().split(this);
getTransmitterNetwork().split(this);
}
super.invalidate();
}
@Override
public void removeFromNetwork()
public void removeFromTransmitterNetwork()
{
if(theNetwork != null)
{
@ -95,7 +95,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
}
@Override
public void refreshNetwork()
public void refreshTransmitterNetwork()
{
if(!worldObj.isRemote)
{
@ -105,11 +105,11 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
if(TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()))
{
getNetwork().merge(((ITransmitter<InventoryNetwork>)tileEntity).getNetwork());
getTransmitterNetwork().merge(((ITransmitter<InventoryNetwork>)tileEntity).getTransmitterNetwork());
}
}
getNetwork().refresh();
getTransmitterNetwork().refresh();
}
}
@ -167,26 +167,26 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<Inven
}
@Override
public int getNetworkSize()
public int getTransmitterNetworkSize()
{
return getNetwork().getSize();
return getTransmitterNetwork().getSize();
}
@Override
public int getNetworkAcceptorSize()
public int getTransmitterNetworkAcceptorSize()
{
return getNetwork().getAcceptorSize();
return getTransmitterNetwork().getAcceptorSize();
}
@Override
public String getNetworkNeeded()
public String getTransmitterNetworkNeeded()
{
return getNetwork().getNeeded();
return getTransmitterNetwork().getNeeded();
}
@Override
public String getNetworkFlow()
public String getTransmitterNetworkFlow()
{
return getNetwork().getFlow();
return getTransmitterNetwork().getFlow();
}
}

40
common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
View file

@ -63,7 +63,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
}
@Override
public FluidNetwork getNetwork(boolean createIfNull)
public FluidNetwork getTransmitterNetwork(boolean createIfNull)
{
if(theNetwork == null && createIfNull)
{
@ -72,9 +72,9 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
for(TileEntity pipe : adjacentPipes)
{
if(TransmissionType.checkTransmissionType(pipe, getTransmissionType()) && ((ITransmitter<FluidNetwork>)pipe).getNetwork(false) != null)
if(TransmissionType.checkTransmissionType(pipe, getTransmissionType()) && ((ITransmitter<FluidNetwork>)pipe).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<FluidNetwork>)pipe).getNetwork());
connectedNets.add(((ITransmitter<FluidNetwork>)pipe).getTransmitterNetwork());
}
}
@ -97,9 +97,9 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
}
@Override
public void fixNetwork()
public void fixTransmitterNetwork()
{
getNetwork().fixMessedUpNetwork(this);
getTransmitterNetwork().fixMessedUpNetwork(this);
}
@Override
@ -107,14 +107,14 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
{
if(!worldObj.isRemote)
{
getNetwork().split(this);
getTransmitterNetwork().split(this);
}
super.invalidate();
}
@Override
public void removeFromNetwork()
public void removeFromTransmitterNetwork()
{
if(theNetwork != null)
{
@ -123,7 +123,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
}
@Override
public void refreshNetwork()
public void refreshTransmitterNetwork()
{
if(!worldObj.isRemote)
{
@ -133,11 +133,11 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
if(TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()))
{
getNetwork().merge(((ITransmitter<FluidNetwork>)tileEntity).getNetwork());
getTransmitterNetwork().merge(((ITransmitter<FluidNetwork>)tileEntity).getTransmitterNetwork());
}
}
getNetwork().refresh();
getTransmitterNetwork().refresh();
}
}
@ -169,7 +169,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
if(received != null && received.amount != 0)
{
container.drain(side, getNetwork().emit(received, true, Object3D.get(this).getFromSide(side).getTileEntity(worldObj)), true);
container.drain(side, getTransmitterNetwork().emit(received, true, Object3D.get(this).getFromSide(side).getTileEntity(worldObj)), true);
}
}
}
@ -235,7 +235,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
{
if(!isActive)
{
return getNetwork().emit(resource, doFill, Object3D.get(this).getFromSide(from).getTileEntity(worldObj));
return getTransmitterNetwork().emit(resource, doFill, Object3D.get(this).getFromSide(from).getTileEntity(worldObj));
}
return 0;
@ -272,26 +272,26 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<FluidNetwork
}
@Override
public int getNetworkSize()
public int getTransmitterNetworkSize()
{
return getNetwork().getSize();
return getTransmitterNetwork().getSize();
}
@Override
public int getNetworkAcceptorSize()
public int getTransmitterNetworkAcceptorSize()
{
return getNetwork().getAcceptorSize();
return getTransmitterNetwork().getAcceptorSize();
}
@Override
public String getNetworkNeeded()
public String getTransmitterNetworkNeeded()
{
return getNetwork().getNeeded();
return getTransmitterNetwork().getNeeded();
}
@Override
public String getNetworkFlow()
public String getTransmitterNetworkFlow()
{
return getNetwork().getFlow();
return getTransmitterNetwork().getFlow();
}
}

36
common/mekanism/common/tileentity/TileEntityPressurizedTube.java
View file

@ -28,7 +28,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
}
@Override
public GasNetwork getNetwork(boolean createIfNull)
public GasNetwork getTransmitterNetwork(boolean createIfNull)
{
if(theNetwork == null && createIfNull)
{
@ -37,9 +37,9 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
for(TileEntity tube : adjacentTubes)
{
if(TransmissionType.checkTransmissionType(tube, TransmissionType.GAS, this) && ((ITransmitter<GasNetwork>)tube).getNetwork(false) != null)
if(TransmissionType.checkTransmissionType(tube, TransmissionType.GAS, this) && ((ITransmitter<GasNetwork>)tube).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<GasNetwork>)tube).getNetwork());
connectedNets.add(((ITransmitter<GasNetwork>)tube).getTransmitterNetwork());
}
}
@ -62,9 +62,9 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
}
@Override
public void fixNetwork()
public void fixTransmitterNetwork()
{
getNetwork().fixMessedUpNetwork(this);
getTransmitterNetwork().fixMessedUpNetwork(this);
}
@Override
@ -72,14 +72,14 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
{
if(!worldObj.isRemote)
{
getNetwork().split(this);
getTransmitterNetwork().split(this);
}
super.invalidate();
}
@Override
public void removeFromNetwork()
public void removeFromTransmitterNetwork()
{
if(theNetwork != null)
{
@ -88,7 +88,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
}
@Override
public void refreshNetwork()
public void refreshTransmitterNetwork()
{
if(!worldObj.isRemote)
{
@ -98,11 +98,11 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
if(TransmissionType.checkTransmissionType(tileEntity, TransmissionType.GAS, this))
{
getNetwork().merge(((ITransmitter<GasNetwork>)tileEntity).getNetwork());
getTransmitterNetwork().merge(((ITransmitter<GasNetwork>)tileEntity).getTransmitterNetwork());
}
}
getNetwork().refresh();
getTransmitterNetwork().refresh();
}
}
@ -132,27 +132,27 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<GasNetwork>
}
@Override
public int getNetworkSize()
public int getTransmitterNetworkSize()
{
return getNetwork().getSize();
return getTransmitterNetwork().getSize();
}
@Override
public int getNetworkAcceptorSize()
public int getTransmitterNetworkAcceptorSize()
{
return getNetwork().getAcceptorSize();
return getTransmitterNetwork().getAcceptorSize();
}
@Override
public String getNetworkNeeded()
public String getTransmitterNetworkNeeded()
{
return getNetwork().getNeeded();
return getTransmitterNetwork().getNeeded();
}
@Override
public String getNetworkFlow()
public String getTransmitterNetworkFlow()
{
return getNetwork().getFlow();
return getTransmitterNetwork().getFlow();
}
@Override

10
common/mekanism/common/tileentity/TileEntityTransmitter.java
View file

@ -26,24 +26,24 @@ public abstract class TileEntityTransmitter<N> extends TileEntity implements ITr
}
@Override
public void setNetwork(N network)
public void setTransmitterNetwork(N network)
{
if(network != theNetwork)
{
removeFromNetwork();
removeFromTransmitterNetwork();
theNetwork = network;
}
}
@Override
public boolean areNetworksEqual(TileEntity tileEntity)
public boolean areTransmitterNetworksEqual(TileEntity tileEntity)
{
return tileEntity instanceof ITransmitter && getTransmissionType() == ((ITransmitter)tileEntity).getTransmissionType();
}
@Override
public N getNetwork()
public N getTransmitterNetwork()
{
return getNetwork(true);
return getTransmitterNetwork(true);
}
}

148
common/mekanism/common/tileentity/TileEntityUniversalCable.java
View file

@ -4,8 +4,13 @@ import ic2.api.energy.tile.IEnergySink;
import ic2.api.energy.tile.IEnergyTile;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import universalelectricity.core.block.IConductor;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.grid.IElectricityNetwork;
import mekanism.api.Object3D;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
@ -19,15 +24,19 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwork> implements IPowerReceptor, IEnergyTile, IEnergySink
public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwork> implements IPowerReceptor, IEnergyTile, IEnergySink, IConductor
{
/** A fake power handler used to initiate energy transfer calculations. */
public PowerHandler powerHandler;
/** A fake UE ElectricityNetwork used to accept power from EU machines */
public IElectricityNetwork ueNetwork;
public double energyScale;
public TileEntityUniversalCable()
{
ueNetwork = new FakeUENetwork();
powerHandler = new PowerHandler(this, PowerHandler.Type.STORAGE);
powerHandler.configure(0, 100, 0, 100);
}
@ -45,7 +54,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
}
@Override
public EnergyNetwork getNetwork(boolean createIfNull)
public EnergyNetwork getTransmitterNetwork(boolean createIfNull)
{
if(theNetwork == null && createIfNull)
{
@ -54,9 +63,9 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
for(TileEntity cable : adjacentCables)
{
if(TransmissionType.checkTransmissionType(cable, TransmissionType.ENERGY) && ((ITransmitter<EnergyNetwork>)cable).getNetwork(false) != null)
if(TransmissionType.checkTransmissionType(cable, TransmissionType.ENERGY) && ((ITransmitter<EnergyNetwork>)cable).getTransmitterNetwork(false) != null)
{
connectedNets.add(((ITransmitter<EnergyNetwork>)cable).getNetwork());
connectedNets.add(((ITransmitter<EnergyNetwork>)cable).getTransmitterNetwork());
}
}
@ -79,9 +88,9 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
}
@Override
public void fixNetwork()
public void fixTransmitterNetwork()
{
getNetwork().fixMessedUpNetwork(this);
getTransmitterNetwork().fixMessedUpNetwork(this);
}
@Override
@ -89,14 +98,14 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
{
if(!worldObj.isRemote)
{
getNetwork().split(this);
getTransmitterNetwork().split(this);
}
super.invalidate();
}
@Override
public void removeFromNetwork()
public void removeFromTransmitterNetwork()
{
if(theNetwork != null)
{
@ -105,7 +114,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
}
@Override
public void refreshNetwork()
public void refreshTransmitterNetwork()
{
if(!worldObj.isRemote)
{
@ -115,11 +124,11 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
if(TransmissionType.checkTransmissionType(tileEntity, TransmissionType.ENERGY))
{
getNetwork().merge(((ITransmitter<EnergyNetwork>)tileEntity).getNetwork());
getTransmitterNetwork().merge(((ITransmitter<EnergyNetwork>)tileEntity).getTransmitterNetwork());
}
}
getNetwork().refresh();
getTransmitterNetwork().refresh();
}
}
@ -157,7 +166,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
@Override
public double demandedEnergyUnits()
{
return getNetwork().getEnergyNeeded(new ArrayList())*Mekanism.TO_IC2;
return getTransmitterNetwork().getEnergyNeeded(new ArrayList())*Mekanism.TO_IC2;
}
@Override
@ -165,7 +174,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
{
ArrayList list = new ArrayList();
list.add(Object3D.get(this).getFromSide(direction).getTileEntity(worldObj));
return getNetwork().emit(i, list);
return getTransmitterNetwork().emit(i, list);
}
@Override
@ -175,26 +184,123 @@ public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyNetwor
}
@Override
public int getNetworkSize()
public int getTransmitterNetworkSize()
{
return getNetwork().getSize();
return getTransmitterNetwork().getSize();
}
@Override
public int getNetworkAcceptorSize()
public int getTransmitterNetworkAcceptorSize()
{
return getNetwork().getAcceptorSize();
return getTransmitterNetwork().getAcceptorSize();
}
@Override
public String getNetworkNeeded()
public String getTransmitterNetworkNeeded()
{
return getNetwork().getNeeded();
return getTransmitterNetwork().getNeeded();
}
@Override
public String getNetworkFlow()
public String getTransmitterNetworkFlow()
{
return getNetwork().getFlow();
return getTransmitterNetwork().getFlow();
}
@Override
public IElectricityNetwork getNetwork()
{
return ueNetwork;
}
@Override
public void setNetwork(IElectricityNetwork network) {}
@Override
public TileEntity[] getAdjacentConnections()
{
return new TileEntity[6];
}
@Override
public void refresh()
{
refreshTransmitterNetwork();
}
@Override
public boolean canConnect(ForgeDirection direction)
{
return true;
}
@Override
public float getResistance()
{
return 0;
}
@Override
public float getCurrentCapacity()
{
return Integer.MAX_VALUE;
}
public class FakeUENetwork implements IElectricityNetwork
{
@Override
public void split(IConductor connection) {}
@Override
public void refresh() {}
@Override
public void merge(IElectricityNetwork network) {}
@Override
public ArrayList<ForgeDirection> getPossibleDirections(TileEntity tile)
{
return new ArrayList<ForgeDirection>();
}
@Override
public Set<IConductor> getConductors()
{
return new HashSet<IConductor>();
}
@Override
public Set<TileEntity> getAcceptors()
{
return getTransmitterNetwork().getAcceptors();
}
@Override
public float produce(ElectricityPack electricityPack, TileEntity... ignoreTiles)
{
ArrayList<TileEntity> ignore = new ArrayList<TileEntity>();
ignore.addAll(Arrays.asList(ignoreTiles));
double energy = electricityPack.getWatts() * Mekanism.FROM_UE;
return (float)getTransmitterNetwork().emit(energy, ignore);
}
@Override
public float getTotalResistance()
{
return 0;
}
@Override
public ElectricityPack getRequest(TileEntity... ignoreTiles)
{
return ElectricityPack.getFromWatts((float)getTransmitterNetwork().getEnergyNeeded(new ArrayList<TileEntity>()), 0.12F);
}
@Override
public float getLowestCurrentCapacity()
{
return Integer.MAX_VALUE;
}
}
}

4
common/mekanism/common/util/CableUtils.java
View file

@ -202,7 +202,7 @@ public final class CableUtils
ArrayList<TileEntity> ignored = new ArrayList<TileEntity>();
ignored.add(sender);
return cable.getNetwork().emit(amount, ignored);
return cable.getTransmitterNetwork().emit(amount, ignored);
}
return amount;
@ -230,7 +230,7 @@ public final class CableUtils
if(TransmissionType.checkTransmissionType(sideTile, TransmissionType.ENERGY) && !ignored.contains(sideTile))
{
networks.add(((ITransmitter<EnergyNetwork>)sideTile).getNetwork());
networks.add(((ITransmitter<EnergyNetwork>)sideTile).getTransmitterNetwork());
}
}