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

Fixed Crash with Extra Utilities.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
items/materials/MaterialType.java
View file

@ -49,7 +49,7 @@ public enum MaterialType
Cell1kPart(35, AEFeature.StorageCells), Cell4kPart(36, AEFeature.StorageCells), Cell16kPart(37, AEFeature.StorageCells), Cell64kPart(38,
AEFeature.StorageCells), EmptyStorageCell(39, AEFeature.StorageCells),
WoodenGear(39, AEFeature.GrindStone, "gearWood"),
WoodenGear(40, AEFeature.GrindStone, "gearWood"),
Wireless(41, AEFeature.WirelessAccessTerminal), WirelessBooster(42, AEFeature.WirelessAccessTerminal),

22
migration/OldItemMaterial.java
View file

@ -150,9 +150,6 @@ public class OldItemMaterial extends AEBaseItem implements IStorageComponent, IU
dmgToMaterial.put( newMaterialNum, mat );
if ( mat.getOreName() != null )
OreDictionary.registerOre( mat.getOreName(), output.stack( 1 ) );
return output;
}
@ -177,22 +174,15 @@ public class OldItemMaterial extends AEBaseItem implements IStorageComponent, IU
return new MissingIcon( this );
}
private String nameOf(ItemStack is)
{
if ( is == null )
return "null";
OldMaterialType mt = getTypeByStack( is );
if ( mt == null )
return "null";
return AEFeatureHandler.getName( OldItemMaterial.class, mt.name() );
}
@Override
public String getUnlocalizedName(ItemStack is)
{
return "item.appliedenergistics2." + nameOf( is );
return "AE2-OLD-ITEM";
}
@Override
public String getItemStackDisplayName(ItemStack par1ItemStack) {
return "AE2-OLD-ITEM";
}
@Override

26
migration/OldItemPart.java
View file

@ -148,30 +148,12 @@ public class OldItemPart extends AEBaseItem implements IPartItem, IItemGroup, II
@Override
public String getUnlocalizedName(ItemStack is)
{
return "item.appliedenergistics2." + getname( is );
return "PART";
}
public String getname(ItemStack is)
{
return AEFeatureHandler.getName( OldItemPart.class, getTypeByStack( is ).name() );
}
@Override
public String getItemStackDisplayName(ItemStack is)
{
OldPartType pt = getTypeByStack( is );
if ( pt == null )
return "Unnamed";
Enum[] varients = pt.getVarients();
if ( varients != null )
return super.getItemStackDisplayName( is ) + " - " + varients[dmgToPart.get( is.getItemDamage() ).varient].toString();
if ( pt.getExtraName() != null )
return super.getItemStackDisplayName( is ) + " - " + pt.getExtraName().getLocal();
return super.getItemStackDisplayName( is );
public String getItemStackDisplayName(ItemStack par1ItemStack) {
return "AE2-OLD-PART";
}
@Override

4
migration/OldMaterialType.java
View file

@ -88,8 +88,6 @@ public enum OldMaterialType
OldMaterialType(AEFeature part, String oreDictionary, Class<? extends Entity> c) {
features = EnumSet.of( part );
oreName = oreDictionary;
if ( OreDictionary.getOres( oreDictionary ).size() > 0 )
features.add( AEFeature.DuplicateItems );
droppedEntity = c;
EntityRegistry.registerModEntity( droppedEntity, droppedEntity.getSimpleName(), EntityIds.get( droppedEntity ), AppEng.instance, 16, 4, true );
@ -98,8 +96,6 @@ public enum OldMaterialType
OldMaterialType(AEFeature part, String oreDictionary) {
features = EnumSet.of( part );
oreName = oreDictionary;
if ( OreDictionary.getOres( oreDictionary ).size() > 0 )
features.add( AEFeature.DuplicateItems );
}
public ItemStack stack(int size)

10
recipes/AEItemResolver.java
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() );
}
}