Removed concept of "ICellGuiHandler". ME chests will now always open …

…a terminal view for all cell types. (AppliedEnergistics#7996)

Fixes AppliedEnergistics#7995

src/main/java/appeng/api/storage/StorageCells.java

@@ -34,7 +34,6 @@
 import net.minecraft.world.item.ItemStack;
 
 import appeng.api.storage.cells.IBasicCellItem;
-import appeng.api.storage.cells.ICellGuiHandler;
 import appeng.api.storage.cells.ICellHandler;
 import appeng.api.storage.cells.ISaveProvider;
 import appeng.api.storage.cells.StorageCell;
@@ -46,7 +45,6 @@
 public final class StorageCells {
 
     private static final List<ICellHandler> handlers = new ArrayList<>();
-    private static final List<ICellGuiHandler> guiHandlers = new ArrayList<>();
 
     private StorageCells() {
     }
@@ -67,15 +65,6 @@ public static synchronized void addCellHandler(ICellHandler handler) {
         handlers.add(handler);
     }
 
-    /**
-     * Register a new handler
-     *
-     * @param handler cell gui handler
-     */
-    public static synchronized void addCellGuiHandler(ICellGuiHandler handler) {
-        guiHandlers.add(handler);
-    }
-
     /**
      * return true, if you can get a InventoryHandler for the item passed.
      *
@@ -114,28 +103,6 @@ public static synchronized ICellHandler getHandler(ItemStack is) {
         return null;
     }
 
-    /**
-     * get the handler, for the requested channel.
-     *
-     * @param is ItemStack
-     * @return the handler registered for this channel.
-     */
-    @Nullable
-    public static synchronized ICellGuiHandler getGuiHandler(ItemStack is) {
-        ICellGuiHandler fallBack = null;
-
-        for (ICellGuiHandler ch : guiHandlers) {
-            if (ch.isSpecializedFor(is)) {
-                return ch;
-            }
-
-            if (fallBack == null) {
-                fallBack = ch;
-            }
-        }
-        return fallBack;
-    }
-
     /**
      * Returns the inventory for the provided storage cell item by querying all registered handlers.
      *

src/main/java/appeng/blockentity/storage/MEChestBlockEntity.java

@@ -86,6 +86,7 @@
 import appeng.menu.MenuOpener;
 import appeng.menu.implementations.MEChestMenu;
 import appeng.menu.locator.MenuLocators;
+import appeng.menu.me.items.BasicCellChestMenu;
 import appeng.util.inv.AppEngInternalInventory;
 import appeng.util.inv.CombinedInternalInventory;
 import appeng.util.inv.filter.IAEItemFilter;
@@ -538,11 +539,8 @@ public boolean openGui(Player p) {
             var ch = StorageCells.getHandler(this.getCell());
 
             if (ch != null) {
-                var chg = StorageCells.getGuiHandler(this.getCell());
-                if (chg != null) {
-                    chg.openChestGui(p, this, ch, this.getCell());
-                    return true;
-                }
+                MenuOpener.open(BasicCellChestMenu.TYPE, p, MenuLocators.forBlockEntity(this));
+                return true;
             }
         }
 

src/main/java/appeng/init/internal/InitStorageCells.java

@@ -26,8 +26,6 @@
 import appeng.api.client.StorageCellModels;
 import appeng.api.storage.StorageCells;
 import appeng.core.definitions.AEItems;
-import appeng.core.registries.cell.BasicFluidCellGuiHandler;
-import appeng.core.registries.cell.BasicItemCellGuiHandler;
 import appeng.me.cells.BasicCellHandler;
 import appeng.me.cells.CreativeCellHandler;
 
@@ -76,8 +74,6 @@ private InitStorageCells() {
     public static void init() {
         StorageCells.addCellHandler(BasicCellHandler.INSTANCE);
         StorageCells.addCellHandler(CreativeCellHandler.INSTANCE);
-        StorageCells.addCellGuiHandler(new BasicItemCellGuiHandler());
-        StorageCells.addCellGuiHandler(new BasicFluidCellGuiHandler());
 
         StorageCellModels.registerModel(AEItems.ITEM_CELL_1K, MODEL_CELL_ITEMS_1K);
         StorageCellModels.registerModel(AEItems.ITEM_CELL_4K, MODEL_CELL_ITEMS_4K);