Lower non-item portable type count to 18 to match base AE2 count

62832 · Oct 5, 2023 · de0ec9c · de0ec9c
1 parent db81bb2
commit de0ec9c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/common/src/main/java/gripe/_90/megacells/item/cell/MEGABulkCell.java b/common/src/main/java/gripe/_90/megacells/item/cell/MEGABulkCell.java
@@ -81,7 +81,7 @@ public void appendHoverText(ItemStack is, Level level, @NotNull List<Component>
                 if (storedItem != null) {
                     lines.add(MEGATranslations.MismatchedFilter.text().withStyle(ChatFormatting.DARK_RED));
                 } else {
-                    lines.add(MEGATranslations.NotPartitioned.text());
+                    lines.add(Tooltips.of(MEGATranslations.NotPartitioned.text()));
                 }
             }
 

diff --git a/common/src/main/java/gripe/_90/megacells/item/cell/MEGAPortableCell.java b/common/src/main/java/gripe/_90/megacells/item/cell/MEGAPortableCell.java
@@ -18,7 +18,13 @@ public class MEGAPortableCell extends PortableCellItem {
 
     public MEGAPortableCell(
             Properties props, StorageTier tier, AEKeyType keyType, MenuType<MEStorageMenu> menu, int defaultColour) {
-        super(keyType, 18 + tier.index() * 9, menu, tier, props.stacksTo(1), defaultColour);
+        super(
+                keyType,
+                18 + (keyType.equals(AEKeyType.items()) ? tier.index() * 9 : 0),
+                menu,
+                tier,
+                props.stacksTo(1),
+                defaultColour);
         this.tier = tier;
     }
 

diff --git a/forge/src/main/java/gripe/_90/megacells/integration/appmek/AppMekItems.java b/forge/src/main/java/gripe/_90/megacells/integration/appmek/AppMekItems.java
@@ -70,7 +70,6 @@ private static ItemDefinition<ChemicalPortableCellItem> portable(StorageTier tie
         return MEGAItems.item(
                 tier.namePrefix().toUpperCase() + " Portable Chemical Cell",
                 "portable_chemical_cell_" + tier.namePrefix(),
-                p -> new ChemicalPortableCellItem(
-                        18 + tier.index() * 9, AMMenus.PORTABLE_CHEMICAL_CELL_TYPE, tier, p, 0x33528D));
+                p -> new ChemicalPortableCellItem(18, AMMenus.PORTABLE_CHEMICAL_CELL_TYPE, tier, p, 0x33528D));
     }
 }