fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support other Encodeables.

Browse Source
This commit is contained in:
AlgorithmX2
2014-03-25 14:20:51 -05:00
parent e91a3a9cc1
commit c364fa8ccb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container/implementations/ContainerSecurity.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE
addSlotToContainer( configSlot = new SlotRestrictedInput( PlaceableItemType.BIOMETRIC_CARD, securityBox.configSlot, 0, 37, -33 ) ); addSlotToContainer( configSlot = new SlotRestrictedInput( PlaceableItemType.BIOMETRIC_CARD, securityBox.configSlot, 0, 37, -33 ) );
addSlotToContainer( wirelessIn = new SlotRestrictedInput( PlaceableItemType.WIRELESS_TERMINAL, wirelessEncoder, 0, 212, 10 ) ); addSlotToContainer( wirelessIn = new SlotRestrictedInput( PlaceableItemType.ENCODEABLE_ITEM, wirelessEncoder, 0, 212, 10 ) );
addSlotToContainer( wirelessOut = new SlotOutput( wirelessEncoder, 1, 212, 68, -1 ) ); addSlotToContainer( wirelessOut = new SlotOutput( wirelessEncoder, 1, 212, 68, -1 ) );
bindPlayerInventory( ip, 0, 0 ); bindPlayerInventory( ip, 0, 0 );
container/slot/SlotRestrictedInput.java
+5 -3
View File
@@ -11,6 +11,7 @@ import net.minecraftforge.oredict.OreDictionary;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.IAppEngApi; import appeng.api.IAppEngApi;
import appeng.api.crafting.ICraftingPatternMAC; import appeng.api.crafting.ICraftingPatternMAC;
import appeng.api.features.INetworkEncodable;
import appeng.api.implementations.ICraftingPatternItem; import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.implementations.items.IBiometricCard; import appeng.api.implementations.items.IBiometricCard;
import appeng.api.implementations.items.ISpatialStorageCell; import appeng.api.implementations.items.ISpatialStorageCell;
@@ -27,7 +28,7 @@ public class SlotRestrictedInput extends AppEngSlot
{ {
STORAGE_CELLS(15), ORE(1 * 16 + 15), STORAGE_COMPONENT(3 * 16 + 15), STORAGE_CELLS(15), ORE(1 * 16 + 15), STORAGE_COMPONENT(3 * 16 + 15),
WIRELESS_TERMINAL(4 * 16 + 15), TRASH(5 * 16 + 15), VALID_ENCODED_PATTERN_W_OUPUT(7 * 16 + 15), ENCODED_PATTERN_W_OUTPUT(7 * 16 + 15), ENCODEABLE_ITEM(4 * 16 + 15), TRASH(5 * 16 + 15), VALID_ENCODED_PATTERN_W_OUPUT(7 * 16 + 15), ENCODED_PATTERN_W_OUTPUT(7 * 16 + 15),
ENCODED_PATTERN(7 * 16 + 15), BLANK_PATTERN(8 * 16 + 15), POWERED_TOOL(9 * 16 + 15), ENCODED_PATTERN(7 * 16 + 15), BLANK_PATTERN(8 * 16 + 15), POWERED_TOOL(9 * 16 + 15),
@@ -187,8 +188,9 @@ public class SlotRestrictedInput extends AppEngSlot
if ( i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent( i ) ) if ( i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent( i ) )
return false; return false;
return true; return true;
case WIRELESS_TERMINAL: case ENCODEABLE_ITEM:
return AEApi.instance().registries().wireless().isWirelessTerminal( i ); return i.getItem() instanceof INetworkEncodable ||
AEApi.instance().registries().wireless().isWirelessTerminal( i );
case BIOMETRIC_CARD: case BIOMETRIC_CARD:
return i.getItem() instanceof IBiometricCard; return i.getItem() instanceof IBiometricCard;
case UPGRADES: case UPGRADES: