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

Fixed stairs

Browse Source
This commit is contained in:
thatsIch
2015-09-29 15:47:55 +02:00
parent 8b921a7b79
commit 59dbfb1452
169 changed files with 1470 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/AEItemResolver.java
+2 -2
View File
@@ -30,7 +30,7 @@ import appeng.api.recipes.ResolverResultSet;
import appeng.api.util.AEColor;
import appeng.api.util.AEColoredItemDefinition;
import appeng.core.AppEng;
import appeng.items.materials.ItemMultiMaterial;
import appeng.items.materials.MultiItem;
import appeng.items.materials.MaterialType;
import appeng.items.misc.ItemCrystalSeed;
import appeng.items.parts.ItemMultiPart;
@@ -123,7 +123,7 @@ public class AEItemResolver implements ISubItemResolver
String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 );
MaterialType mt = MaterialType.valueOf( materialName );
// itemName = itemName.substring( 0, itemName.indexOf( "." ) );
if( mt.itemInstance == ItemMultiMaterial.instance && mt.damageValue >= 0 && mt.isRegistered() )
if( mt.itemInstance == MultiItem.instance && mt.damageValue >= 0 && mt.isRegistered() )
{
return new ResolverResult( "ItemMultiMaterial", mt.damageValue );
}
src/main/java/appeng/recipes/RecipeHandler.java
+3 -3
View File
@@ -54,7 +54,7 @@ import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.core.AppEng;
import appeng.core.features.AEFeature;
import appeng.items.materials.ItemMultiMaterial;
import appeng.items.materials.MultiItem;
import appeng.items.misc.ItemCrystalSeed;
import appeng.items.parts.ItemMultiPart;
import appeng.recipes.handlers.IWebsiteSerializer;
@@ -200,10 +200,10 @@ public class RecipeHandler implements IRecipeHandler
default:
}
}
else if( is.getItem() instanceof ItemMultiMaterial )
else if( is.getItem() instanceof MultiItem )
{
realName = realName.replace( "ItemMultiMaterial", "ItemMaterial" );
realName += '.' + ( (ItemMultiMaterial) is.getItem() ).getTypeByStack( is ).name();
realName += '.' + ( (MultiItem) is.getItem() ).getTypeByStack( is ).name();
}
else if( is.getItem() instanceof ItemMultiPart )
{