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

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-24 23:32:39 -06:00
parent ca64bacd17 76aed4f4a8
commit 8d44d01fc0
3 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api
+1 -1
Submodule api updated: 2c9d87df82...28e318ff1a
client/render/WorldRender.java
+15 -7
View File
@@ -7,6 +7,7 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
import appeng.core.AELog;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@@ -58,13 +59,20 @@ public class WorldRender implements ISimpleBlockRenderingHandler
public void renderItemBlock(ItemStack item) public void renderItemBlock(ItemStack item)
{ {
AEBaseBlock block = (AEBaseBlock) Block.getBlockFromItem( item.getItem() ); Block blk = Block.getBlockFromItem( item.getItem() );
renderer.setRenderBoundsFromBlock( block ); if ( blk instanceof AEBaseBlock )
{
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; AEBaseBlock block = (AEBaseBlock)blk;
getRender( block ).renderInventory( block, item, renderer ); renderer.setRenderBoundsFromBlock( block );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
getRender( block ).renderInventory( block, item, renderer );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
}
else
{
AELog.severe( "Invalid render: "+item.getUnlocalizedName() +" as ae block" );
}
} }
private BaseBlockRender getRender(AEBaseBlock block) private BaseBlockRender getRender(AEBaseBlock block)
container/implementations/ContainerSecurity.java
+12 -4
View File
@@ -8,6 +8,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions; import appeng.api.config.SecurityPermissions;
import appeng.api.features.INetworkEncodable;
import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermHandler;
import appeng.api.implementations.items.IBiometricCard; import appeng.api.implementations.items.IBiometricCard;
import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalHost;
@@ -136,11 +137,18 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE
if ( wirelessIn.getHasStack() ) if ( wirelessIn.getHasStack() )
{ {
ItemStack term = wirelessIn.getStack().copy(); ItemStack term = wirelessIn.getStack().copy();
IWirelessTermHandler h = AEApi.instance().registries().wireless().getWirelessTerminalHandler( term ); INetworkEncodable netEncodeable = null;
if ( h != 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 ); wirelessIn.putStack( null );
wirelessOut.putStack( term ); wirelessOut.putStack( term );