From de0ec9c05079d89f2ca7a6d43074da6228f4d78f Mon Sep 17 00:00:00 2001 From: 90 Date: Thu, 5 Oct 2023 23:27:16 +0300 Subject: [PATCH] Lower non-item portable type count to 18 to match base AE2 count --- .../java/gripe/_90/megacells/item/cell/MEGABulkCell.java | 2 +- .../gripe/_90/megacells/item/cell/MEGAPortableCell.java | 8 +++++++- .../_90/megacells/integration/appmek/AppMekItems.java | 3 +-- 3 files changed, 9 insertions(+), 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 index f4f873f7..f0aa3c91 100644 --- 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 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 index 7750721a..91fb346f 100644 --- 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 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 index 23b642d6..fa602937 100644 --- 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 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)); } }