From 76aed4f4a82fa722f1a0231588006515a71ba4c9 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Mon, 24 Feb 2014 12:01:16 -0600 Subject: [PATCH] Implemented INetworkEncodable --- api | 2 +- container/implementations/ContainerSecurity.java | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/api b/api index 2c9d87df..28e318ff 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 2c9d87df822a15136c7446db0d8d3b72b7feb4e5 +Subproject commit 28e318ff1a990aef0131f3156134d4c8b1502364 diff --git a/container/implementations/ContainerSecurity.java b/container/implementations/ContainerSecurity.java index 11c9601d..0d3d0065 100644 --- a/container/implementations/ContainerSecurity.java +++ b/container/implementations/ContainerSecurity.java @@ -8,6 +8,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; +import appeng.api.features.INetworkEncodable; import appeng.api.features.IWirelessTermHandler; import appeng.api.implementations.items.IBiometricCard; import appeng.api.storage.ITerminalHost; @@ -136,11 +137,18 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE if ( wirelessIn.getHasStack() ) { ItemStack term = wirelessIn.getStack().copy(); - IWirelessTermHandler h = AEApi.instance().registries().wireless().getWirelessTerminalHandler( term ); - - if ( h != null ) + INetworkEncodable netEncodeable = null; + + if ( term.getItem() instanceof INetworkEncodable ) + netEncodeable = (INetworkEncodable) term.getItem(); + + IWirelessTermHandler wTermHandler = AEApi.instance().registries().wireless().getWirelessTerminalHandler( term ); + if ( wTermHandler != null ) + netEncodeable = wTermHandler; + + if ( netEncodeable != null ) { - h.setEncryptionKey( term, "" + securityBox.securityKey, "" ); + netEncodeable.setEncryptionKey( term, "" + securityBox.securityKey, "" ); wirelessIn.putStack( null ); wirelessOut.putStack( term );