Fixed Crash with Extra Utilities.

Items in the ore dictionary values no longer fail to migrate.
Fixed "Meta Overlap detected" error.
Recipes now work with new Materials/Parts.
This commit is contained in:
AlgorithmX2
2014-05-06 12:08:48 -05:00
parent e60faf5ab0
commit 93aad6c53b
5 changed files with 16 additions and 48 deletions
+5 -5
View File
@@ -78,19 +78,19 @@ public class AEItemResolver implements ISubItemResolver
{
String materialName = itemName.substring( itemName.indexOf( "." ) + 1 );
MaterialType mt = MaterialType.valueOf( materialName );
itemName = itemName.substring( 0, itemName.indexOf( "." ) );
//itemName = itemName.substring( 0, itemName.indexOf( "." ) );
if ( mt.damageValue >= 0 )
return new ResolverResult( itemName, mt.damageValue );
return new ResolverResult( "ItemMultiMaterial", mt.damageValue );
}
if ( itemName.startsWith( "ItemPart." ) )
{
String partName = itemName.substring( itemName.indexOf( "." ) + 1 );
PartType pt = PartType.valueOf( partName );
itemName = itemName.substring( 0, itemName.indexOf( "." ) );
//itemName = itemName.substring( 0, itemName.indexOf( "." ) );
int dVal = ItemMultiPart.instance.getDamageByType( pt );
if ( dVal >= 0 )
return new ResolverResult( itemName, dVal );
return new ResolverResult( "ItemMultiPart", dVal );
}
}
@@ -111,6 +111,6 @@ public class AEItemResolver implements ISubItemResolver
}
ItemStack is = partType.stack( col, 1 );
return new ResolverResult( "ItemPart", is.getItemDamage() );
return new ResolverResult( "ItemMultiPart", is.getItemDamage() );
}
}