Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
This commit is contained in:
commit
f807f18239
2 changed files with 8 additions and 5 deletions
|
@ -26,6 +26,7 @@ import appeng.core.features.AEFeature;
|
||||||
import appeng.helpers.LocationRotation;
|
import appeng.helpers.LocationRotation;
|
||||||
import appeng.helpers.NullRotation;
|
import appeng.helpers.NullRotation;
|
||||||
import appeng.integration.abstraction.IRB;
|
import appeng.integration.abstraction.IRB;
|
||||||
|
import appeng.util.Platform;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
@ -161,6 +162,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
public void onBlockAdded(World w, int x, int y, int z)
|
public void onBlockAdded(World w, int x, int y, int z)
|
||||||
{
|
{
|
||||||
super.onBlockAdded( w, x, y, z );
|
super.onBlockAdded( w, x, y, z );
|
||||||
|
if ( Platform.isServer() )
|
||||||
WorldSettings.getInstance().getCompass().updateArea( w, x, y, z );
|
WorldSettings.getInstance().getCompass().updateArea( w, x, y, z );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,6 +170,7 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
|
||||||
public void breakBlock(World w, int x, int y, int z, Block b, int WTF)
|
public void breakBlock(World w, int x, int y, int z, Block b, int WTF)
|
||||||
{
|
{
|
||||||
super.breakBlock( w, x, y, z, b, WTF );
|
super.breakBlock( w, x, y, z, b, WTF );
|
||||||
|
if ( Platform.isServer() )
|
||||||
WorldSettings.getInstance().getCompass().updateArea( w, x, y, z );
|
WorldSettings.getInstance().getCompass().updateArea( w, x, y, z );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,8 +78,8 @@ public class AEItemResolver implements ISubItemResolver
|
||||||
{
|
{
|
||||||
String materialName = itemName.substring( itemName.indexOf( "." ) + 1 );
|
String materialName = itemName.substring( itemName.indexOf( "." ) + 1 );
|
||||||
MaterialType mt = MaterialType.valueOf( materialName );
|
MaterialType mt = MaterialType.valueOf( materialName );
|
||||||
//itemName = itemName.substring( 0, itemName.indexOf( "." ) );
|
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
|
||||||
if ( mt.damageValue >= 0 )
|
if ( mt.damageValue >= 0 && mt.isRegistered() )
|
||||||
return new ResolverResult( "ItemMultiMaterial", mt.damageValue );
|
return new ResolverResult( "ItemMultiMaterial", mt.damageValue );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ public class AEItemResolver implements ISubItemResolver
|
||||||
{
|
{
|
||||||
String partName = itemName.substring( itemName.indexOf( "." ) + 1 );
|
String partName = itemName.substring( itemName.indexOf( "." ) + 1 );
|
||||||
PartType pt = PartType.valueOf( partName );
|
PartType pt = PartType.valueOf( partName );
|
||||||
//itemName = itemName.substring( 0, itemName.indexOf( "." ) );
|
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
|
||||||
int dVal = ItemMultiPart.instance.getDamageByType( pt );
|
int dVal = ItemMultiPart.instance.getDamageByType( pt );
|
||||||
if ( dVal >= 0 )
|
if ( dVal >= 0 )
|
||||||
return new ResolverResult( "ItemMultiPart", dVal );
|
return new ResolverResult( "ItemMultiPart", dVal );
|
||||||
|
|
Loading…
Reference in a new issue