Merge branch 'jei-transfer-highlight' into AE2-Omnifactory

This commit is contained in:
PrototypeTrousers
2022-10-18 23:58:58 -03:00
16 changed files with 298 additions and 20 deletions
@@ -81,6 +81,7 @@ public class GuiCraftConfirm extends AEBaseGui {
this.setScrollBar(scrollbar);
this.ccc = (ContainerCraftConfirm) this.inventorySlots;
this.ccc.setGui(this);
if (te instanceof WirelessTerminalGuiObject) {
this.OriginalGui = GuiBridge.GUI_WIRELESS_TERM;
@@ -95,6 +95,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource {
protected GuiCraftingCPU(final ContainerCraftingCPU container) {
super(container);
this.craftingCpu = container;
this.craftingCpu.setGui(this);
this.ySize = GUI_HEIGHT;
this.xSize = GUI_WIDTH;
@@ -23,6 +23,7 @@ import appeng.api.config.ActionItems;
import appeng.api.config.Settings;
import appeng.api.storage.ITerminalHost;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.me.ItemRepo;
import appeng.container.implementations.ContainerCraftingTerm;
import appeng.container.slot.SlotCraftingMatrix;
import appeng.core.localization.GuiText;
@@ -81,4 +82,8 @@ public class GuiCraftingTerm extends GuiMEMonitorable {
protected String getBackground() {
return "guis/crafting.png";
}
public ItemRepo getRepo() {
return this.repo;
}
}
@@ -31,7 +31,11 @@ import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.client.ActionKey;
import appeng.client.gui.AEBaseMEGui;
import appeng.client.gui.widgets.*;
import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.gui.widgets.GuiScrollbar;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.client.gui.widgets.ISortSource;
import appeng.client.gui.widgets.MEGuiTextField;
import appeng.client.me.InternalSlotME;
import appeng.client.me.ItemRepo;
import appeng.client.me.SlotME;
@@ -73,7 +77,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
private static int craftingGridOffsetY;
private static String memoryText = "";
private final ItemRepo repo;
protected final ItemRepo repo;
private final int offsetX = 9;
private final int lowerTextureOffset = 0;
private final IConfigManager configSrc;
@@ -51,6 +51,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource {
private final ItemRepo repo;
private final int rows = 4;
private final ContainerNetworkStatus cns;
private GuiImgButton units;
private int tooltip = -1;
@@ -65,6 +66,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource {
this.ySize = 153;
this.xSize = 195;
this.repo.setRowSize(5);
this.cns = (ContainerNetworkStatus) this.inventorySlots;
this.cns.setGui(this);
}
@Override
@@ -268,4 +268,8 @@ public class ItemRepo {
this.updateJEI(this.searchString);
}
}
public IItemList<IAEItemStack> getList() {
return list;
}
}