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

Fixed Storage Cells within Storage Cells.

Browse Source
This commit is contained in:
AlgorithmX2
2014-01-31 11:32:44 -06:00
parent ecd7ea67b6
commit daa121b5d2
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
items/storage/ItemBasicStorageCell.java
+11 -12
View File
@@ -5,7 +5,6 @@ import java.util.List;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
@@ -70,12 +69,17 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
l.add( cd.usedBytes() + " " + GuiText.Of.getLocal() + " " + cd.totalBytes() + " " + GuiText.BytesUsed.getLocal() ); l.add( cd.usedBytes() + " " + GuiText.Of.getLocal() + " " + cd.totalBytes() + " " + GuiText.BytesUsed.getLocal() );
l.add( cd.storedItemTypes() + " " + GuiText.Of.getLocal() + " " + cd.getTotalItemTypes() + " " + GuiText.Types.getLocal() ); l.add( cd.storedItemTypes() + " " + GuiText.Of.getLocal() + " " + cd.getTotalItemTypes() + " " + GuiText.Types.getLocal() );
/* /*
* if ( cd.isPreformatted() ) { String List = StatCollector.translateToLocal( cd.getListMode() == * if ( cd.isPreformatted() ) { String List =
* ListMode.WHITELIST ? "AppEng.Gui.Whitelisted" : "AppEng.Gui.Blacklisted" ); if ( * StatCollector.translateToLocal( cd.getListMode() ==
* cd.isFuzzyPreformatted() ) l.add( StatCollector.translateToLocal( "Appeng.GuiITooltip.Partitioned" ) * ListMode.WHITELIST ? "AppEng.Gui.Whitelisted" :
* + " - " + List + " " + StatCollector.translateToLocal( "Appeng.GuiITooltip.Fuzzy" ) ); else l.add( * "AppEng.Gui.Blacklisted" ); if ( cd.isFuzzyPreformatted() )
* StatCollector.translateToLocal( "Appeng.GuiITooltip.Partitioned" ) + " - " + List + " " + * l.add( StatCollector.translateToLocal(
* StatCollector.translateToLocal( "Appeng.GuiITooltip.Precise" ) ); } * "Appeng.GuiITooltip.Partitioned" ) + " - " + List + " " +
* StatCollector.translateToLocal( "Appeng.GuiITooltip.Fuzzy" )
* ); else l.add( StatCollector.translateToLocal(
* "Appeng.GuiITooltip.Partitioned" ) + " - " + List + " " +
* StatCollector.translateToLocal( "Appeng.GuiITooltip.Precise"
* ) ); }
*/ */
} }
} }
@@ -102,11 +106,6 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
@Override @Override
public boolean isBlackListed(ItemStack cellItem, IAEItemStack requsetedAddition) public boolean isBlackListed(ItemStack cellItem, IAEItemStack requsetedAddition)
{ {
Item i = requsetedAddition.getItem();
if ( i instanceof IStorageCell )
return !((IStorageCell) i).storableInStorageCell();
return false; return false;
} }