Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,8 @@ private void parsePacketCmd(PacketInterfaceTerminalUpdate.PacketEntry cmd) {
addCmd.name,
addCmd.rows,
addCmd.rowSize,
addCmd.online).setLocation(addCmd.x, addCmd.y, addCmd.z, addCmd.dim, addCmd.side)
addCmd.online,
addCmd.p2pOutput).setLocation(addCmd.x, addCmd.y, addCmd.z, addCmd.dim, addCmd.side)
.setIcons(addCmd.selfRep, addCmd.dispRep)
.setItems(addCmd.items);
masterList.addEntry(entry);
Expand Down Expand Up @@ -1202,6 +1203,7 @@ public void refreshVisible() {
.toLowerCase();

for (InterfaceWirelessEntry entry : entries) {
if (!entry.online || entry.p2pOutput) continue;
var moleAss = AEApi.instance()
.definitions()
.blocks()
Expand Down Expand Up @@ -1298,13 +1300,14 @@ private class InterfaceWirelessEntry {
int guiHeight;
int dispY = -9999;
boolean online;
boolean p2pOutput;
private Boolean[] brokenRecipes;
int numItems = 0;
/** Should recipe be filtered out/grayed out? */
boolean[] filteredRecipes;
private int hoveredSlotIdx = -1;

InterfaceWirelessEntry(long id, String name, int rows, int rowSize, boolean online) {
InterfaceWirelessEntry(long id, String name, int rows, int rowSize, boolean online, boolean p2pOutput) {
this.id = id;
if (StatCollector.canTranslate(name)) {
this.dispName = StatCollector.translateToLocal(name);
Expand All @@ -1320,6 +1323,7 @@ private class InterfaceWirelessEntry {
this.rows = rows;
this.rowSize = rowSize;
this.online = online;
this.p2pOutput = p2pOutput;
this.optionsButton = new GuiFCImgButton(2, 0, "HIGHLIGHT", "YES");
this.optionsButton.setHalfSize(true);
this.renameButton = new GuiFCImgButton(2, 0, "EDIT", "YES");
Expand Down
15 changes: 10 additions & 5 deletions src/main/java/com/asdflj/ae2thing/client/gui/widget/ItemPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.asdflj.ae2thing.client.me.AdvItemRepo;
import com.asdflj.ae2thing.network.CPacketInventoryAction;
import com.asdflj.ae2thing.util.Ae2ReflectClient;
import com.asdflj.ae2thing.util.GTUtil;
import com.asdflj.ae2thing.util.ModAndClassUtil;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.crossmod.thaumcraft.AspectUtil;
Expand Down Expand Up @@ -82,6 +81,7 @@ public class ItemPanel implements IAEBasePanel, IGuiMonitorTerminal, IConfigMana
private GuiImgButton searchBoxSettings;
private static String memoryText = "";
private final TextHistory history;
private int lastClickTime = 0;

public ItemPanel(IWidgetGui gui, ContainerWirelessDualInterfaceTerminal container, IConfigManager configSrc,
ISortSource source) {
Expand Down Expand Up @@ -276,10 +276,10 @@ public void mouseClicked(int xCoord, int yCoord, int btn) {
setSearchString("", true);
}
this.scrollbar.click(this.parent, xCoord - this.parent.getGuiLeft(), yCoord - this.parent.getGuiTop());

if (ModAndClassUtil.CORE_MOD && GTUtil.compareVersion(GTUtil.CoreModVersion) == 1) {
return;
}
// remove
// if (ModAndClassUtil.CORE_MOD && GTUtil.compareVersion(GTUtil.CoreModVersion) == 1) {
// return;
// }
boolean flag = btn == this.parent.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100;
Slot slot = this.getSlotAtPosition(xCoord, yCoord);
if (slot != null && (btn == 0 || btn == 1 || flag)) {
Expand Down Expand Up @@ -355,6 +355,11 @@ public void setTextFieldValue(String displayName, int mousex, int mousey, ItemSt
@Override
public boolean handleMouseClick(Slot slot, int slotIdx, int ctrlDown, int mouseButton) {
if (slotIdx < 0) return false;
// Temporary solution
if (lastClickTime == Minecraft.getMinecraft().thePlayer.ticksExisted) {
return false;
}
lastClickTime = Minecraft.getMinecraft().thePlayer.ticksExisted;
saveSearchString();
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (this.parent.updateFluidContainer(slot, slotIdx, ctrlDown, mouseButton)) return true;
Expand Down