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

Facades should use names, not ids.

Browse Source
This commit is contained in:
AlgorithmX2
2014-05-11 11:41:31 -05:00
parent f7e638c172
commit bd5e80fba1
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
items/parts/ItemFacade.java
+15 -3
View File
@@ -27,6 +27,8 @@ import appeng.facade.FacadePart;
import appeng.facade.IFacadeItem; import appeng.facade.IFacadeItem;
import appeng.items.AEBaseItem; import appeng.items.AEBaseItem;
import appeng.util.Platform; import appeng.util.Platform;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@@ -158,6 +160,9 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
ds[0] = Item.getIdFromItem( l.getItem() ); ds[0] = Item.getIdFromItem( l.getItem() );
ds[1] = metadata; ds[1] = metadata;
data.setIntArray( "x", ds ); data.setIntArray( "x", ds );
UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor( l.getItem() );
data.setString( "modid", ui.modId );
data.setString( "itemname", ui.name );
is.setTagCompound( data ); is.setTagCompound( data );
return is; return is;
} }
@@ -170,9 +175,16 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
NBTTagCompound data = is.getTagCompound(); NBTTagCompound data = is.getTagCompound();
if ( data != null ) if ( data != null )
{ {
int[] blk = data.getIntArray( "x" ); if ( data.hasKey( "modid" ) && data.hasKey( "itemname" ) )
if ( blk != null && blk.length == 2 ) {
return Block.getBlockById( blk[0] ); return GameRegistry.findBlock( data.getString( "modid" ), data.getString( "itemname" ) );
}
else
{
int[] blk = data.getIntArray( "x" );
if ( blk != null && blk.length == 2 )
return Block.getBlockById( blk[0] );
}
} }
return Blocks.glass; return Blocks.glass;
} }