Reduce interface terminal TPS impact + break some backends + new gui

src/main/java/appeng/api/config/ActionItems.java

@@ -28,5 +28,6 @@ public enum ActionItems {
     TOGGLE_SHOW_FULL_INTERFACES_OFF,
     TOGGLE_SHOW_ONLY_INVALID_PATTERN_ON,
     TOGGLE_SHOW_ONLY_INVALID_PATTERN_OFF,
-    HIGHLIGHT_INTERFACE
+    HIGHLIGHT_INTERFACE,
+    EXTRA_OPTIONS,
 }

src/main/java/appeng/api/features/IIfaceTermRegistry.java

@@ -0,0 +1,14 @@
+package appeng.api.features;
+
+import appeng.api.util.IIfaceTermViewable;
+
+/**
+ * Registry for interface terminal support.
+ */
+public interface IIfaceTermRegistry {
+
+    /**
+     * Registers a class to be considered supported in interface terminals.
+     */
+    void register(Class<? extends IIfaceTermViewable> clazz);
+}

src/main/java/appeng/api/features/IRegistryContainer.java

@@ -73,6 +73,8 @@ public interface IRegistryContainer {
      */
     IInscriberRegistry inscriber();
 
+    IIfaceTermRegistry ifaceTerm();
+
     /**
      * get access to the locatable registry
      */

src/main/java/appeng/api/networking/events/MENetworkBootingStatusChange.java

@@ -22,4 +22,13 @@
  * Note: Most machines just need to check {@link IGridNode}.isActive()
  */
 public class MENetworkBootingStatusChange extends MENetworkEvent {
+
+    /**
+     * Indicates whether the network has changed to this state when the event is posted.
+     */
+    public final boolean isBooting;
+
+    public MENetworkBootingStatusChange(boolean isBooting) {
+        this.isBooting = isBooting;
+    }
 }

src/main/java/appeng/api/util/IIfaceTermViewable.java

@@ -0,0 +1,51 @@
+package appeng.api.util;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+
+import appeng.api.networking.IGridHost;
+
+/**
+ * Replacement for {@code IInterfaceTerminalSupport} in API.
+ */
+public interface IIfaceTermViewable extends IGridHost {
+
+    DimensionalCoord getLocation();
+
+    /**
+     * Number of rows to expect. This is used with {@link #rowSize()} to determine how to render the slots.
+     */
+    int rows();
+
+    /**
+     * Number of slots per row.
+     */
+    int rowSize();
+
+    /**
+     * Get the patterns. If multiple rows are supported, this is assumed to be tightly packed. Use {@link #rowSize()}
+     * with {@link #rows()} to determine where a row starts.
+     */
+    IInventory getPatterns();
+
+    String getName();
+
+    TileEntity getTileEntity();
+
+    boolean shouldDisplay();
+
+    /**
+     * Self representation
+     */
+    default ItemStack getSelfRep() {
+        return null;
+    }
+
+    /**
+     * "Target" Display representation
+     */
+    default ItemStack getDisplayRep() {
+        return null;
+    }
+}

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -50,6 +50,7 @@
 import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
 import appeng.client.render.AppEngRenderItem;
+import appeng.client.render.TranslatedRenderItem;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.AppEngCraftingSlot;
 import appeng.container.slot.AppEngSlot;
@@ -85,7 +86,8 @@ public abstract class AEBaseGui extends GuiContainer {
     private final List<InternalSlotME> meSlots = new LinkedList<>();
     // drag y
     private final Set<Slot> drag_click = new HashSet<>();
-    private final AppEngRenderItem aeRenderItem = new AppEngRenderItem();
+    public static final AppEngRenderItem aeRenderItem = new AppEngRenderItem();
+    public static final TranslatedRenderItem translatedRenderItem = new TranslatedRenderItem();
     private GuiScrollbar scrollBar = null;
     private boolean disableShiftClick = false;
     private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
@@ -784,8 +786,10 @@ public void drawItem(final int x, final int y, final ItemStack is) {
         GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         GL11.glEnable(GL11.GL_DEPTH_TEST);
+        GL11.glTranslatef(0.0f, 0.0f, 101.0f);
         RenderHelper.enableGUIStandardItemLighting();
         itemRender.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.renderEngine, is, x, y);
+        GL11.glTranslatef(0.0f, 0.0f, -101.0f);
         GL11.glPopAttrib();
 
         itemRender.zLevel = 0.0F;
@@ -817,10 +821,9 @@ private void drawSlot(final Slot s) {
 
             RenderItem pIR = this.setItemRender(this.aeRenderItem);
             try {
-                this.zLevel = 100.0F;
-                itemRender.zLevel = 100.0F;
-
                 if (!this.isPowered()) {
+                    this.zLevel = 100.0F;
+                    itemRender.zLevel = 100.0F;
                     GL11.glDisable(GL11.GL_LIGHTING);
                     drawRect(
                             s.xDisplayPosition,
@@ -829,14 +832,14 @@ private void drawSlot(final Slot s) {
                             16 + s.yDisplayPosition,
                             GuiColors.ItemSlotOverlayUnpowered.getColor());
                     GL11.glEnable(GL11.GL_LIGHTING);
-                }
-
-                this.zLevel = 0.0F;
-                itemRender.zLevel = 0.0F;
+                    this.zLevel = 0.0F;
+                    itemRender.zLevel = 0.0F;
+                } else {
+                    this.aeRenderItem.setAeStack(Platform.getAEStackInSlot(s));
 
-                this.aeRenderItem.setAeStack(Platform.getAEStackInSlot(s));
+                    this.drawAESlot(s);
+                }
 
-                this.safeDrawSlot(s);
             } catch (final Exception err) {
                 AELog.warn("[AppEng] AE prevented crash while drawing slot: " + err.toString());
             }
@@ -940,7 +943,7 @@ private void drawSlot(final Slot s) {
 
                 if (s instanceof AppEngSlot) {
                     ((AppEngSlot) s).setDisplay(true);
-                    this.safeDrawSlot(s);
+                    this.drawMCSlot(s);
                 } else {
                     this.safeDrawSlot(s);
                 }
@@ -954,6 +957,39 @@ private void drawSlot(final Slot s) {
         this.safeDrawSlot(s);
     }
 
+    public void drawMCSlot(Slot slotIn) {
+        int i = slotIn.xDisplayPosition;
+        int j = slotIn.yDisplayPosition;
+        ItemStack itemstack = slotIn.getStack();
+        String s = null;
+
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        translatedRenderItem.zLevel = 100.0f;
+        translatedRenderItem
+                .renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), itemstack, i, j);
+        translatedRenderItem.zLevel = 200.0f;
+        translatedRenderItem
+                .renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), itemstack, i, j, s);
+        translatedRenderItem.zLevel = 0.0f;
+    }
+
+    public void drawAESlot(Slot slotIn) {
+        int i = slotIn.xDisplayPosition;
+        int j = slotIn.yDisplayPosition;
+        ItemStack itemstack = slotIn.getStack();
+        String s = null;
+
+        this.zLevel = 100.0F;
+        itemRender.zLevel = 100.0F;
+        itemRender.renderItemAndEffectIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), itemstack, i, j);
+        itemRender.zLevel = 0.0F;
+
+        this.zLevel = 0.0F;
+        GL11.glTranslatef(0.0f, 0.0f, 200.0f);
+        aeRenderItem.renderItemOverlayIntoGUI(this.fontRendererObj, this.mc.getTextureManager(), itemstack, i, j, s);
+        GL11.glTranslatef(0.0f, 0.0f, -200.0f);
+    }
+
     private RenderItem setItemRender(final RenderItem item) {
         if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI)) {
             return ((INEI) IntegrationRegistry.INSTANCE.getInstance(IntegrationType.NEI)).setItemRender(item);
@@ -979,6 +1015,10 @@ public void bindTexture(final String file) {
         this.mc.getTextureManager().bindTexture(loc);
     }
 
+    public void bindTexture(final ResourceLocation loc) {
+        mc.getTextureManager().bindTexture(loc);
+    }
+
     public void func_146977_a(final Slot s) {
         this.drawSlot(s);
     }

src/main/java/appeng/client/gui/AEBaseMEGui.java

@@ -25,12 +25,13 @@
 import appeng.core.localization.ButtonToolTips;
 import appeng.util.Platform;
 
-public abstract class AEBaseMEGui extends AEBaseGui {
+public abstract class AEBaseMEGui extends AEBaseGui implements IGuiTooltipHandler {
 
     public AEBaseMEGui(final Container container) {
         super(container);
     }
 
+    @Override
     public List<String> handleItemTooltip(final ItemStack stack, final int mouseX, final int mouseY,
             final List<String> currentToolTip) {
         if (stack != null) {

src/main/java/appeng/client/gui/IGuiTooltipHandler.java

@@ -0,0 +1,20 @@
+package appeng.client.gui;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+/**
+ * Interface for handling tooltips from NEIGuiContainerManager.
+ */
+public interface IGuiTooltipHandler {
+
+    default List<String> handleItemTooltip(final ItemStack stack, final int mouseX, final int mouseY,
+            final List<String> currentToolTip) {
+        return currentToolTip;
+    }
+
+    default ItemStack getHoveredStack() {
+        return null;
+    }
+}

src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java

@@ -35,6 +35,7 @@
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.client.gui.AEBaseGui;
+import appeng.client.gui.IGuiTooltipHandler;
 import appeng.client.gui.widgets.GuiCraftingCPUTable;
 import appeng.client.gui.widgets.GuiCraftingTree;
 import appeng.client.gui.widgets.GuiImgButton;
@@ -63,7 +64,7 @@
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
 
-public class GuiCraftConfirm extends AEBaseGui implements ICraftingCPUTableHolder {
+public class GuiCraftConfirm extends AEBaseGui implements ICraftingCPUTableHolder, IGuiTooltipHandler {
 
     public static final int TREE_VIEW_TEXTURE_WIDTH = 238;
     public static final int TREE_VIEW_TEXTURE_HEIGHT = 238;

src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java

@@ -38,6 +38,7 @@
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.WorldCoord;
 import appeng.client.gui.AEBaseGui;
+import appeng.client.gui.IGuiTooltipHandler;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.client.gui.widgets.ITooltip;
@@ -55,7 +56,7 @@
 import appeng.util.Platform;
 import appeng.util.ReadableNumberConverter;
 
-public class GuiCraftingCPU extends AEBaseGui implements ISortSource {
+public class GuiCraftingCPU extends AEBaseGui implements ISortSource, IGuiTooltipHandler {
 
     private static final int GUI_HEIGHT = 184;
     private static final int GUI_WIDTH = 238;
@@ -616,6 +617,7 @@ public Enum getSortDisplay() {
         return ViewItems.ALL;
     }
 
+    @Override
     public ItemStack getHoveredStack() {
         return hoveredStack;
     }