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

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan Brady 2013-12-16 19:08:58 -05:00
commit cd80bfc6cd
5 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -356,10 +356,13 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
if(!iterated.contains(obj) && !toIgnore.contains(obj))
{
TileEntity tileEntity = obj.getTileEntity(worldObj);
if(TransmissionType.checkTransmissionType(tileEntity, transmissionType, location.getTileEntity(worldObj)))
if(!(tileEntity instanceof IBlockableConnection) || ((IBlockableConnection)tileEntity).canConnectMutual(direction.getOpposite()))
{
loopAll(obj);
if(TransmissionType.checkTransmissionType(tileEntity, transmissionType, location.getTileEntity(worldObj)))
{
loopAll(obj);
}
}
}
}

9
common/mekanism/api/transmitters/IBlockableConnection.java Normal file
View file

@ -0,0 +1,9 @@
package mekanism.api.transmitters;
import net.minecraftforge.common.ForgeDirection;
public interface IBlockableConnection
{
public boolean canConnectMutual(ForgeDirection side);
public boolean canConnect(ForgeDirection side);
}

1
common/mekanism/common/multipart/MultipartMekanism.java
View file

@ -26,6 +26,7 @@ public class MultipartMekanism implements IPartFactory, IPartConverter
MultipartGenerator.registerPassThroughInterface("cofh.api.energy.IEnergyHandler");
MultipartGenerator.registerPassThroughInterface("mekanism.common.IConfigurable");
MultipartGenerator.registerPassThroughInterface("mekanism.common.ITileNetwork");
MultipartGenerator.registerPassThroughInterface("mekanism.api.transmitters.IBlockableConnection");
}
@Override

10
common/mekanism/common/multipart/PartSidedPipe.java
View file

@ -13,10 +13,7 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.Object3D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.transmitters.TransmitterNetworkRegistry;
import mekanism.api.transmitters.*;
import mekanism.client.render.RenderPartTransmitter;
import mekanism.common.IConfigurable;
import mekanism.common.ITileNetwork;
@ -32,7 +29,7 @@ import net.minecraftforge.common.ForgeDirection;
import java.util.*;
public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects, ITileNetwork
public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects, ITileNetwork, IBlockableConnection
{
public static IndexedCuboid6[] smallSides = new IndexedCuboid6[7];
public static IndexedCuboid6[] largeSides = new IndexedCuboid6[7];
@ -42,6 +39,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
public byte currentTransmitterConnections = 0x00;
public boolean isActive = false;
public boolean sendDesc;
public boolean redstonePowered = false;
static
{
@ -256,7 +254,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
if(!canConnect(side)) return false;
TileEntity tile = Object3D.get(tile()).getFromSide(side).getTileEntity(world());
return (!(tile instanceof ITransmitter) || ((ITransmitter<?>)tile).canConnect(side.getOpposite()));
return (!(tile instanceof IBlockableConnection) || ((IBlockableConnection)tile).canConnect(side.getOpposite()));
}
public boolean canConnect(ForgeDirection side)

29
common/mekanism/common/multipart/PartTransmitter.java
View file

@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import codechicken.multipart.*;
import mekanism.api.Object3D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.ITransmitter;
@ -33,14 +34,6 @@ import codechicken.lib.raytracer.IndexedCuboid6;
import codechicken.lib.vec.Cuboid6;
import codechicken.lib.vec.Vector3;
import codechicken.microblock.IHollowConnect;
import codechicken.multipart.IconHitEffects;
import codechicken.multipart.JIconHitEffects;
import codechicken.multipart.JNormalOcclusion;
import codechicken.multipart.NormalOcclusionTest;
import codechicken.multipart.PartMap;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TSlottedPart;
import codechicken.multipart.TileMultipart;
import com.google.common.io.ByteArrayDataInput;
@ -102,16 +95,18 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends Pa
if(possibleTransmitters != currentTransmitterConnections)
{
//TODO @unpairedbracket, I don't think this is necessary; I couldn't tell a difference without it,
//and it results in many extra possible recursive calls on the network
/*byte or = (byte)(possibleTransmitters | currentTransmitterConnections);
if(or != possibleTransmitters)
boolean nowPowered = world().isBlockIndirectlyGettingPowered(x(), y(), z());
if(nowPowered != redstonePowered)
{
((DynamicNetwork<?, N>)getTransmitterNetwork()).split((ITransmitter<N>)tile());
setTransmitterNetwork(null);
}*/
if(nowPowered)
{
getTransmitterNetwork().split((ITransmitter<N>)tile());
setTransmitterNetwork(null);
}
tile().notifyPartChange(this);
redstonePowered = nowPowered;
}
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{