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

Fixes #2415: Renaming remaining items/blocks.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-03 23:06:57 +02:00
parent ac0f32b21f
commit 9b51d54403
53 changed files with 696 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/AEItemResolver.java
+6 -6
View File
@@ -31,10 +31,10 @@ import appeng.api.recipes.ResolverResultSet;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
import appeng.core.AppEng;
import appeng.items.materials.ItemMultiItem;
import appeng.items.materials.ItemMaterial;
import appeng.items.materials.MaterialType;
import appeng.items.misc.ItemCrystalSeed;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemPart;
import appeng.items.parts.PartType;
@@ -124,7 +124,7 @@ public class AEItemResolver implements ISubItemResolver
final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 );
final MaterialType mt = MaterialType.valueOf( materialName );
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
if( mt.getItemInstance() == ItemMultiItem.instance && mt.getDamageValue() >= 0 && mt.isRegistered() )
if( mt.getItemInstance() == ItemMaterial.instance && mt.getDamageValue() >= 0 && mt.isRegistered() )
{
return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() );
}
@@ -135,10 +135,10 @@ public class AEItemResolver implements ISubItemResolver
final String partName = itemName.substring( itemName.indexOf( '.' ) + 1 );
final PartType pt = PartType.valueOf( partName );
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
final int dVal = ItemMultiPart.instance.getDamageByType( pt );
final int dVal = ItemPart.instance.getDamageByType( pt );
if( dVal >= 0 )
{
return new ResolverResult( "ItemMultiPart", dVal );
return new ResolverResult( "ItemPart", dVal );
}
}
}
@@ -182,6 +182,6 @@ public class AEItemResolver implements ISubItemResolver
}
final ItemStack is = partType.stack( col, 1 );
return new ResolverResult( "ItemMultiPart", is.getItemDamage() );
return new ResolverResult( "ItemPart", is.getItemDamage() );
}
}
src/main/java/appeng/recipes/RecipeHandler.java
+7 -7
View File
@@ -59,9 +59,9 @@ import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.AppEng;
import appeng.core.features.AEFeature;
import appeng.items.materials.ItemMultiItem;
import appeng.items.materials.ItemMaterial;
import appeng.items.misc.ItemCrystalSeed;
import appeng.items.parts.ItemMultiPart;
import appeng.items.parts.ItemPart;
import appeng.recipes.handlers.IWebsiteSerializer;
import appeng.recipes.handlers.OreRegistration;
@@ -204,15 +204,15 @@ public class RecipeHandler implements IRecipeHandler
default:
}
}
else if( is.getItem() instanceof ItemMultiItem )
else if( is.getItem() instanceof ItemMaterial )
{
realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" );
realName += '.' + ( (ItemMultiItem) is.getItem() ).getTypeByStack( is ).name();
realName += '.' + ( (ItemMaterial) is.getItem() ).getTypeByStack( is ).name();
}
else if( is.getItem() instanceof ItemMultiPart )
else if( is.getItem() instanceof ItemPart )
{
realName = realName.replace( "ItemMultiPart", "ItemPart" );
realName += '.' + ( (ItemMultiPart) is.getItem() ).getTypeByStack( is ).name();
realName = realName.replace( "ItemPart", "ItemPart" );
realName += '.' + ( (ItemPart) is.getItem() ).getTypeByStack( is ).name();
}
else if( is.getItemDamage() > 0 )
{