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

Memory Card Removed Block ( some more )

Browse source
This commit is contained in:
AlgorithmX2 2014-01-30 18:48:30 -06:00
parent ae6ba6a071
commit cedff21e7a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
block/AEBaseBlock.java
View file

@ -94,8 +94,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
try try
{ {
ResourceLocation resLoc = new ResourceLocation( Name ); ResourceLocation resLoc = new ResourceLocation( Name );
resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", new Object[] { "textures/blocks", resLoc = new ResourceLocation( resLoc.getResourceDomain(), String.format( "%s/%s%s", new Object[] { "textures/blocks", resLoc.getResourcePath(), ".png" } ) );
resLoc.getResourcePath(), ".png" } ) );
Resource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc ); Resource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
if ( res != null ) if ( res != null )
@ -647,7 +646,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
if ( data != null ) if ( data != null )
{ {
memc.setMemoryCardContents( is, name, data ); memc.setMemoryCardContents( is, name, data );
memc.notifyUser( this, player, MemoryCardMessages.SETTINGS_SAVED ); memc.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
return false; return false;
} }
} }
@ -660,10 +659,10 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{ {
AEBaseTile t = getTileEntity( w, x, y, z ); AEBaseTile t = getTileEntity( w, x, y, z );
t.uploadSettings( SettingsFrom.MEMORY_CARD, data ); t.uploadSettings( SettingsFrom.MEMORY_CARD, data );
memc.notifyUser( this, player, MemoryCardMessages.SETTINGS_LOADED ); memc.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
} }
else else
memc.notifyUser( this, player, MemoryCardMessages.INVALID_MACHINE ); memc.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
return false; return false;
} }
} }