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

Fixed #225 Not returning correct size per type of 8, 32, 128, 512 instead of constant 8 in BytesPerType

Browse Source
This commit is contained in:
thatsIch
2014-10-02 10:11:01 +02:00
parent 33ce5283d0
commit 03047e496a
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/storage/ItemBasicStorageCell.java
+32 -31
View File
@@ -41,61 +41,62 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
public ItemBasicStorageCell(MaterialType whichCell, int Kilobytes) { public ItemBasicStorageCell(MaterialType whichCell, int Kilobytes) {
super( ItemBasicStorageCell.class, Kilobytes + "k" ); super( ItemBasicStorageCell.class, Kilobytes + "k" );
setFeature( EnumSet.of( AEFeature.StorageCells ) );
setMaxStackSize( 1 );
totalBytes = Kilobytes * 1024;
component = whichCell;
switch (component) this.setFeature( EnumSet.of( AEFeature.StorageCells ) );
this.setMaxStackSize( 1 );
this.totalBytes = Kilobytes * 1024;
this.component = whichCell;
switch (this.component)
{ {
case Cell1kPart: case Cell1kPart:
idleDrain = 0.5; this.idleDrain = 0.5;
perType = 8; this.perType = 8;
break; break;
case Cell4kPart: case Cell4kPart:
idleDrain = 1.0; this.idleDrain = 1.0;
perType = 32; this.perType = 32;
break; break;
case Cell16kPart: case Cell16kPart:
idleDrain = 1.5; this.idleDrain = 1.5;
perType = 128; this.perType = 128;
break; break;
case Cell64kPart: case Cell64kPart:
idleDrain = 2.0; this.idleDrain = 2.0;
perType = 512; this.perType = 512;
break; break;
default: default:
idleDrain = 0.0; this.idleDrain = 0.0;
perType = 8; this.perType = 8;
} }
} }
@Override @Override
public void addInformation(ItemStack i, EntityPlayer p, List l, boolean b) public void addInformation(ItemStack i, EntityPlayer p, List l, boolean b)
{ {
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( i, null, StorageChannel.ITEMS ); IMEInventory<IAEItemStack> inventory = AEApi.instance().registries().cell().getCellInventory( i, null, StorageChannel.ITEMS );
if ( cdi instanceof ICellInventoryHandler ) if ( inventory instanceof ICellInventoryHandler )
{ {
ICellInventoryHandler CI = (ICellInventoryHandler) cdi; ICellInventoryHandler handler = (ICellInventoryHandler) inventory;
ICellInventory cellInventory = handler.getCellInv();
ICellInventory cd = ((ICellInventoryHandler) cdi).getCellInv(); if (cellInventory != null)
if (cd != null)
{ {
l.add(cd.getUsedBytes() + " " + GuiText.Of.getLocal() + " " l.add(cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + " "
+ cd.getTotalBytes() + " " + cellInventory.getTotalBytes() + " "
+ GuiText.BytesUsed.getLocal()); + GuiText.BytesUsed.getLocal());
l.add(cd.getStoredItemTypes() + " " + GuiText.Of.getLocal() l.add(cellInventory.getStoredItemTypes() + " " + GuiText.Of.getLocal()
+ " " + cd.getTotalItemTypes() + " " + " " + cellInventory.getTotalItemTypes() + " "
+ GuiText.Types.getLocal()); + GuiText.Types.getLocal());
if ( CI.isPreformatted() ) if ( handler.isPreformatted() )
{ {
String List = (CI.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included String List = (handler.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included
: GuiText.Excluded ).getLocal(); : GuiText.Excluded ).getLocal();
if ( CI.isFuzzy() ) if ( handler.isFuzzy() )
l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Fuzzy.getLocal() ); l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Fuzzy.getLocal() );
else else
l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Precise.getLocal() ); l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Precise.getLocal() );
@@ -107,13 +108,13 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
@Override @Override
public int getBytes(ItemStack cellItem) { public int getBytes(ItemStack cellItem) {
return totalBytes; return this.totalBytes;
} }
@Override @Override
public int BytePerType(ItemStack cell) public int BytePerType(ItemStack cell)
{ {
return 8; return this.perType;
} }
@Override @Override
@@ -143,7 +144,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
@Override @Override
public double getIdleDrain() public double getIdleDrain()
{ {
return idleDrain; return this.idleDrain;
} }
@Override @Override
@@ -207,7 +208,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
{ {
playerInventory.setInventorySlotContents( playerInventory.currentItem, null ); playerInventory.setInventorySlotContents( playerInventory.currentItem, null );
ItemStack extraB = ia.addItems( component.stack( 1 ) ); ItemStack extraB = ia.addItems( this.component.stack( 1 ) );
ItemStack extraA = ia.addItems( AEApi.instance().materials().materialEmptyStorageCell.stack( 1 ) ); ItemStack extraA = ia.addItems( AEApi.instance().materials().materialEmptyStorageCell.stack( 1 ) );
if ( extraA != null ) if ( extraA != null )