https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11102 (#1289)

3 files changed, 39 insertions, 16 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 58e7131f43..7d4cbae063 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -1,5 +1,7 @@
 package gregtech.api.metatileentity;
 
+import appeng.api.networking.energy.IEnergyGrid;
+import appeng.api.networking.pathing.IPathingGrid;
 import appeng.api.util.AECableType;
 import appeng.me.helpers.AENetworkProxy;
 import cpw.mods.fml.common.Optional;
@@ -1028,4 +1030,27 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac
         /* Empty */
     }
 
+    @Optional.Method(modid = "appliedenergistics2")
+    protected String getAEDiagnostics() {
+        try {
+            if (getProxy() == null)
+                return "(proxy)";
+            if (getProxy().getNode() == null)
+                return "(node)";
+            if (getProxy().getNode().getGrid() == null)
+                return "(grid)";
+            if (!getProxy().getNode().meetsChannelRequirements())
+                return "(channels)";
+            IPathingGrid pg = getProxy().getNode().getGrid().getCache(IPathingGrid.class);
+            if (!pg.isNetworkBooting())
+                return "(booting)";
+            IEnergyGrid eg = getProxy().getNode().getGrid().getCache(IEnergyGrid.class);
+            if (!eg.isNetworkPowered())
+                return "(power)";
+        }
+        catch(Throwable ex) {
+            ex.printStackTrace();
+        }
+        return "";
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
index 62c01b7b73..613e97e911 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java
@@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagIntArray;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
@@ -20,7 +19,6 @@ import appeng.api.util.AECableType;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.IGridProxyable;
-import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 import cpw.mods.fml.common.Optional;
 import gregtech.api.GregTech_API;
@@ -32,7 +30,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input
 import gregtech.api.render.TextureFactory;
 import gregtech.common.gui.GT_Container_InputBus_ME;
 import gregtech.common.gui.GT_GUIContainer_InputBus_ME;
-import gregtech.api.util.GT_Utility;
 
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_HATCH;
 import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_HATCH_ACTIVE;
@@ -113,10 +110,6 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
     @Override
     @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {
-        if (getBaseMetaTileEntity() != null && getBaseMetaTileEntity().getTimer() > 1) {
-            gridProxy = null;
-            getProxy();
-        }
     }
 
     @Override
@@ -159,11 +152,16 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch
 
     @Override
     public String[] getInfoData() {
-        return new String[]{
-            "The bus is " + ((getProxy() != null && getProxy().isActive()) ?
-            EnumChatFormatting.GREEN + "online" : EnumChatFormatting.RED + "offline")
-                + EnumChatFormatting.RESET};
+        if (GregTech_API.mAE2) {
+            return new String[] {
+                "The bus is " + ((getProxy() != null && getProxy().isActive()) ?
+                    EnumChatFormatting.GREEN + "online" : EnumChatFormatting.RED + "offline" + getAEDiagnostics())
+                    + EnumChatFormatting.RESET};
+        }
+        else
+            return new String[] {};
     }
+    
     @Override
     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
         return false;
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
index f9b902e27a..4389156191 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java
@@ -140,6 +140,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
                 if (getBaseMetaTileEntity().getWorld() != null)
                     gridProxy.setOwner(getBaseMetaTileEntity().getWorld().getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName()));
             }
+
         }
         return this.gridProxy;
     }
@@ -147,10 +148,6 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
     @Override
     @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {
-        if (getBaseMetaTileEntity() != null && getBaseMetaTileEntity().getTimer() > 1) {
-            gridProxy = null;
-            getProxy();
-        }
     }
 
     @Optional.Method(modid = "appliedenergistics2")
@@ -253,9 +250,12 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc
 
     @Override
     public String[] getInfoData() {
+        if (!GregTech_API.mAE2)
+            return new String[]{};
         List<String> ss = new ArrayList<>();
         ss.add("The bus is " + ((getProxy() != null && getProxy().isActive())?
-            EnumChatFormatting.GREEN + "online" : EnumChatFormatting.RED + "offline") + EnumChatFormatting.RESET);
+            EnumChatFormatting.GREEN + "online" : EnumChatFormatting.RED + "offline"
+            + getAEDiagnostics() ) + EnumChatFormatting.RESET);
         if (itemCache.isEmpty()) {
             ss.add("The bus has no cached items");
         }