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

Merge pull request #1695 from yueh/b-prevents-crafting-of-disabled-parts

Browse Source 
Prevents crafting of disabled parts
This commit is contained in:
yueh
2015-07-24 22:27:21 +02:00
parent 48d1a5aa88 c823e1464b
commit 15993eb3c7
29 changed files with 488 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseTile.java
+4 -4
View File
@@ -51,7 +51,7 @@ import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.api.util.IOrientable;
import appeng.core.AELog;
import appeng.core.features.ItemStackSrc;
import appeng.core.features.IStackSrc;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost;
import appeng.tile.events.AETileEventHandler;
@@ -66,14 +66,14 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
public static final ThreadLocal<WeakReference<AEBaseTile>> DROP_NO_ITEMS = new ThreadLocal<WeakReference<AEBaseTile>>();
private static final Map<Class<? extends AEBaseTile>, Map<TileEventType, List<AETileEventHandler>>> HANDLERS = new HashMap<Class<? extends AEBaseTile>, Map<TileEventType, List<AETileEventHandler>>>();
private static final Map<Class<? extends TileEntity>, ItemStackSrc> ITEM_STACKS = new HashMap<Class<? extends TileEntity>, ItemStackSrc>();
private static final Map<Class<? extends TileEntity>, IStackSrc> ITEM_STACKS = new HashMap<Class<? extends TileEntity>, IStackSrc>();
private int renderFragment = 0;
@Nullable
public String customName;
private ForgeDirection forward = ForgeDirection.UNKNOWN;
private ForgeDirection up = ForgeDirection.UNKNOWN;
public static void registerTileItem( Class<? extends TileEntity> c, ItemStackSrc wat )
public static void registerTileItem( Class<? extends TileEntity> c, IStackSrc wat )
{
ITEM_STACKS.put( c, wat );
}
@@ -98,7 +98,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Nullable
protected ItemStack getItemFromTile( Object obj )
{
ItemStackSrc src = ITEM_STACKS.get( obj.getClass() );
IStackSrc src = ITEM_STACKS.get( obj.getClass() );
if( src == null )
{
return null;