From 2407653e9635b63de43fcb28d379fb01a0b7f9eb Mon Sep 17 00:00:00 2001
From: asdflj <854865755@qq.com>
Date: Sat, 25 Feb 2023 11:43:21 +0800
Subject: [PATCH] fix universal terminal infinity connect bug

---
 .../inventory/item/WirelessInterfaceTerminalInventory.java | 6 ++++++
 src/main/java/com/glodblock/github/util/Util.java          | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java
index ceaa08ad..2f5004eb 100644
--- a/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java
+++ b/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java
@@ -1,5 +1,7 @@
 package com.glodblock.github.inventory.item;
 
+import java.util.Objects;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -10,6 +12,7 @@ import appeng.api.config.*;
 import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.api.networking.IGridNode;
 import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AECableType;
@@ -19,6 +22,8 @@ import appeng.tile.inventory.InvOperation;
 import appeng.util.ConfigManager;
 import appeng.util.Platform;
 
+import com.glodblock.github.util.Util;
+
 public class WirelessInterfaceTerminalInventory implements IWirelessInterfaceTerminal {
 
     private final ItemStack target;
@@ -27,6 +32,7 @@ public class WirelessInterfaceTerminalInventory implements IWirelessInterfaceTer
     private final IGridNode grid;
 
     public WirelessInterfaceTerminalInventory(ItemStack is, int slot, IGridNode gridNode, EntityPlayer player) {
+        Objects.requireNonNull(Util.getWirelessInv(is, player, StorageChannel.ITEMS));
         this.ips = (ToolWirelessTerminal) is.getItem();
         this.grid = gridNode;
         this.target = is;
diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java
index c668e509..ead4554b 100644
--- a/src/main/java/com/glodblock/github/util/Util.java
+++ b/src/main/java/com/glodblock/github/util/Util.java
@@ -110,10 +110,11 @@ public final class Util {
     }
 
     public static IMEInventoryHandler<?> getWirelessInv(ItemStack is, EntityPlayer player, StorageChannel channel) {
+        if (Platform.isClient()) return new NullInventory<>();
         IGridNode gridNode = getWirelessGrid(is);
-        if (gridNode == null) return new NullInventory<>();
+        if (gridNode == null) return null;
         IGrid grid = gridNode.getGrid();
-        if (grid == null) return new NullInventory<>();
+        if (grid == null) return null;
         boolean canConnect = false;
         if (hasInfinityBoosterCard(is)) {
             canConnect = true;
@@ -141,7 +142,7 @@ public final class Util {
                 }
             }
         }
-        return new NullInventory<>();
+        return null;
     }
 
     public static ItemStack getWirelessTerminal(EntityPlayer player, int x) {