tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #372 from yueh/fix-366

Browse source 
Prevent anything but boosters inside WAPs
This commit is contained in:
thatsIch 2014-11-02 12:18:36 +01:00
commit fc973d965e
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/appeng/tile/networking/TileWireless.java
View file

@ -1,12 +1,16 @@
package appeng.tile.networking; package appeng.tile.networking;
import io.netty.buffer.ByteBuf;
import java.util.EnumSet; import java.util.EnumSet;
import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.tiles.IWirelessAccessPoint; import appeng.api.implementations.tiles.IWirelessAccessPoint;
import appeng.api.networking.GridFlags; import appeng.api.networking.GridFlags;
@ -25,6 +29,7 @@ import appeng.tile.inventory.AppEngInternalInventory;
import appeng.tile.inventory.InvOperation; import appeng.tile.inventory.InvOperation;
import appeng.util.Platform; import appeng.util.Platform;
public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoint, IPowerChannelState public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoint, IPowerChannelState
{ {
@ -36,32 +41,33 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
public int clientFlags = 0; public int clientFlags = 0;
public TileWireless() { public TileWireless()
{
gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
} }
@Override @Override
public void setOrientation(ForgeDirection inForward, ForgeDirection inUp) public void setOrientation( ForgeDirection inForward, ForgeDirection inUp )
{ {
super.setOrientation( inForward, inUp ); super.setOrientation( inForward, inUp );
gridProxy.setValidSides( EnumSet.of( getForward().getOpposite() ) ); gridProxy.setValidSides( EnumSet.of( getForward().getOpposite() ) );
} }
@MENetworkEventSubscribe @MENetworkEventSubscribe
public void chanRender(MENetworkChannelsChanged c) public void chanRender( MENetworkChannelsChanged c )
{ {
markForUpdate(); markForUpdate();
} }
@MENetworkEventSubscribe @MENetworkEventSubscribe
public void powerRender(MENetworkPowerStatusChange c) public void powerRender( MENetworkPowerStatusChange c )
{ {
markForUpdate(); markForUpdate();
} }
@TileEvent(TileEventType.NETWORK_READ) @TileEvent( TileEventType.NETWORK_READ )
public boolean readFromStream_TileWireless(ByteBuf data) public boolean readFromStream_TileWireless( ByteBuf data )
{ {
int old = clientFlags; int old = clientFlags;
clientFlags = data.readByte(); clientFlags = data.readByte();
@ -69,8 +75,8 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
return old != clientFlags; return old != clientFlags;
} }
@TileEvent(TileEventType.NETWORK_WRITE) @TileEvent( TileEventType.NETWORK_WRITE )
public void writeToStream_TileWireless(ByteBuf data) public void writeToStream_TileWireless( ByteBuf data )
{ {
clientFlags = 0; clientFlags = 0;
@ -82,16 +88,16 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
if ( gridProxy.getNode().meetsChannelRequirements() ) if ( gridProxy.getNode().meetsChannelRequirements() )
clientFlags |= CHANNEL_FLAG; clientFlags |= CHANNEL_FLAG;
} }
catch (GridAccessException e) catch ( GridAccessException e )
{ {
// meh // meh
} }
data.writeByte( (byte) clientFlags ); data.writeByte( ( byte ) clientFlags );
} }
@Override @Override
public AECableType getCableConnectionType(ForgeDirection dir) public AECableType getCableConnectionType( ForgeDirection dir )
{ {
return AECableType.SMART; return AECableType.SMART;
} }
@ -127,7 +133,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
} }
@Override @Override
public int[] getAccessibleSlotsBySide(ForgeDirection side) public int[] getAccessibleSlotsBySide( ForgeDirection side )
{ {
return sides; return sides;
} }
@ -142,7 +148,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
public boolean isActive() public boolean isActive()
{ {
if ( Platform.isClient() ) if ( Platform.isClient() )
return isPowered() && (CHANNEL_FLAG == (clientFlags & CHANNEL_FLAG)); return isPowered() && ( CHANNEL_FLAG == ( clientFlags & CHANNEL_FLAG ) );
return gridProxy.isActive(); return gridProxy.isActive();
} }
@ -154,7 +160,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
{ {
return gridProxy.getGrid(); return gridProxy.getGrid();
} }
catch (GridAccessException e) catch ( GridAccessException e )
{ {
return null; return null;
} }
@ -167,7 +173,13 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
} }
@Override @Override
public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added) public boolean isItemValidForSlot( int i, ItemStack itemstack )
{
return AEApi.instance().materials().materialWirelessBooster.sameAsStack( itemstack );
}
@Override
public void onChangeInventory( IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added )
{ {
// :P // :P
} }
@ -175,7 +187,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
@Override @Override
public boolean isPowered() public boolean isPowered()
{ {
return POWERED_FLAG == (clientFlags & POWERED_FLAG); return POWERED_FLAG == ( clientFlags & POWERED_FLAG );
} }
} }