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

Redstone sensitivity on transmitters.

Browse source
This commit is contained in:
Ben Spiers 2014-01-12 21:27:23 +00:00
parent 9895caaadc
commit 2717f6fd4a
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/mekanism/common/block/BlockBasic.java
View file

@ -64,6 +64,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* 12: Copper Block
* 13: Tin Block
* 14: Salination Controller
* 15: Salination Valve
* @author AidanBrady
*
*/

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

@ -742,6 +742,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
@Override
public boolean onRightClick(EntityPlayer player, int side)
{
super.onRightClick(player, side);
player.sendChatToPlayer(ChatMessageComponent.createFromText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.viewColor") + ": " + (color != null ? color.getName() : "None")));
return true;
}

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

@ -26,6 +26,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatMessageComponent;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.ForgeDirection;
@ -67,6 +68,8 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
public boolean sendDesc = false;
public boolean redstonePowered = false;
public boolean redstoneReactive = true;
public ConnectionType[] connectionTypes = {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL};
@ -166,7 +169,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
{
byte connections = 0x00;
if(world().isBlockIndirectlyGettingPowered(x(), y(), z()))
if(redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()))
{
return connections;
}
@ -191,7 +194,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
{
byte connections = 0x00;
if(world().isBlockIndirectlyGettingPowered(x(), y(), z()))
if(redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()))
{
return connections;
}
@ -330,7 +333,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
@Override
public boolean canConnect(ForgeDirection side)
{
if(world().isBlockIndirectlyGettingPowered(x(), y(), z()))
if(redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()))
{
return false;
}
@ -438,7 +441,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
if(possibleTransmitters != currentTransmitterConnections)
{
boolean nowPowered = world().isBlockIndirectlyGettingPowered(x(), y(), z());
boolean nowPowered = redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z());
if(nowPowered != redstonePowered)
{
@ -571,6 +574,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
sendDesc = true;
onModeChange(ForgeDirection.getOrientation(side));
player.sendChatToPlayer(ChatMessageComponent.createFromText("Connection type changed to " + connectionTypes[hit.subHit].toString()));
return true;
}
@ -592,7 +596,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
@Override
public boolean onRightClick(EntityPlayer player, int side)
{
return false;
redstoneReactive ^= true;
refreshConnections();
tile().notifyPartChange(this);
player.sendChatToPlayer(ChatMessageComponent.createFromText("Redstone sensitivity turned " + (redstoneReactive ? "on." : "off.")));
return true;
}
public boolean canConnectToAcceptor(ForgeDirection side, boolean ignoreActive)

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

@ -218,13 +218,6 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends Pa
}
}
@Override
public boolean onRightClick(EntityPlayer player, int side)
{
fixTransmitterNetwork();
return true;
}
@Override
public void chunkLoad() {}
}