more useful typeWeight (#1297)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

src/main/java/appeng/api/implementations/items/IStorageCell.java

@@ -128,8 +128,4 @@ public interface IStorageCell extends ICellWorkbenchItem {
     default IAEStackType<?> getStackType() {
         return ITEM_STACK_TYPE;
     }
-
-    default int getTypeWeight() {
-        return 1;
-    }
 }

src/main/java/appeng/api/storage/data/IAEStackType.java

@@ -105,4 +105,6 @@ public interface IAEStackType<T extends IAEStack> {
     IIcon getButtonIcon();
 
     T getTestStack();
+
+    int getAmountPerByte();
 }

src/main/java/appeng/items/AEBaseCell.java

@@ -398,7 +398,7 @@ public abstract class AEBaseCell extends AEBaseItem implements IStorageCell, IIt
 
     @Override
     public CellData getCellData(ItemStack is) {
-        return new CellData(this.totalBytes, this.totalTypes, this.perType, this.getTypeWeight());
+        return new CellData(this.totalBytes, this.totalTypes, this.perType, this.getStackType().getAmountPerByte());
     }
 
     @Override
@@ -422,7 +422,4 @@ public abstract class AEBaseCell extends AEBaseItem implements IStorageCell, IIt
     @Override
     @NotNull
     public abstract IAEStackType<?> getStackType();
-
-    @Override
-    public abstract int getTypeWeight();
 }

src/main/java/appeng/items/AEBasePortableCell.java

@@ -179,9 +179,4 @@ public abstract class AEBasePortableCell extends AEBasePoweredItem implements IS
     public void setOreFilter(ItemStack is, String filter) {
         ItemStackNBT.setString(is, "OreFilter", filter);
     }
-
-    @Override
-    public int getTypeWeight() {
-        return 8;
-    }
 }

src/main/java/appeng/items/storage/ItemBasicStorageCell.java

@@ -35,9 +35,4 @@ public class ItemBasicStorageCell extends AEBaseCell {
     public IAEStackType<?> getStackType() {
         return ITEM_STACK_TYPE;
     }
-
-    @Override
-    public int getTypeWeight() {
-        return 8;
-    }
 }

src/main/java/appeng/items/tools/powered/ToolColorApplicator.java

@@ -668,9 +668,4 @@ public class ToolColorApplicator extends AEBasePoweredItem
     public void setOreFilter(ItemStack is, String filter) {
         ItemStackNBT.setString(is, "OreFilter", filter);
     }
-
-    @Override
-    public int getTypeWeight() {
-        return 8;
-    }
 }

src/main/java/appeng/items/tools/powered/ToolMassCannon.java

@@ -518,9 +518,4 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell {
     public void setOreFilter(ItemStack is, String filter) {
         ItemStackNBT.setString(is, "OreFilter", filter);
     }
-
-    @Override
-    public int getTypeWeight() {
-        return 8;
-    }
 }

src/main/java/appeng/me/storage/CellInventory.java

@@ -69,7 +69,7 @@ public abstract class CellInventory<StackType extends IAEStack<StackType>> imple
         if (this.cellItem.getItem() instanceof IStorageCell type) {
             this.cellType = type;
             this.maxTypes = this.cellType.getTotalTypes(this.cellItem);
-            this.typeWeight = type.getTypeWeight();
+            this.typeWeight = type.getStackType().getAmountPerByte();
         } else this.cellType = null;
 
         if (this.cellType == null) {

src/main/java/appeng/util/item/AEFluidStackType.java

@@ -213,4 +213,9 @@ public class AEFluidStackType implements IAEStackType<IAEFluidStack> {
     public IAEFluidStack getTestStack() {
         return this.testStack.copy();
     }
+
+    @Override
+    public int getAmountPerByte() {
+        return 8 * 256;
+    }
 }

src/main/java/appeng/util/item/AEItemStackType.java

@@ -178,4 +178,9 @@ public class AEItemStackType implements IAEStackType<IAEItemStack> {
     public IAEItemStack getTestStack() {
         return this.testStack.copy();
     }
+
+    @Override
+    public int getAmountPerByte() {
+        return 8;
+    }
 }