tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Keep Search when switching between crafting and normal view.

Browse source
This commit is contained in:
AlgorithmX2 2014-06-02 21:04:47 -05:00
parent a1af4443b7
commit fe74989563
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/gui/AEBaseGui.java
View file

@ -56,9 +56,18 @@ public abstract class AEBaseGui extends GuiContainer
protected List<InternalSlotME> meSlots = new LinkedList<InternalSlotME>(); protected List<InternalSlotME> meSlots = new LinkedList<InternalSlotME>();
protected GuiScrollbar myScrollBar = null; protected GuiScrollbar myScrollBar = null;
static public boolean switchingGuis;
final private boolean subGui;
public AEBaseGui(Container container) { public AEBaseGui(Container container) {
super( container ); super( container );
subGui = switchingGuis;
switchingGuis = false;
}
public boolean isSubGui()
{
return subGui;
} }
@Override @Override

17
client/gui/implementations/GuiMEMonitorable.java
View file

@ -44,6 +44,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
{ {
MEGuiTextField searchField; MEGuiTextField searchField;
private static String memoryText = "";
ItemRepo repo; ItemRepo repo;
GuiText myName; GuiText myName;
@ -127,6 +129,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.initGui(); this.initGui();
} }
@Override
public void onGuiClosed()
{
super.onGuiClosed();
memoryText = searchField.getText();
}
@Override @Override
public void initGui() public void initGui()
{ {
@ -213,7 +222,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ); Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting ); searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting );
setScrollBar(); if ( isSubGui() )
{
searchField.setText( memoryText );
repo.searchString = memoryText;
repo.updateView();
setScrollBar();
}
for (Object s : inventorySlots.inventorySlots) for (Object s : inventorySlots.inventorySlots)
{ {

3
core/sync/packets/PacketSwitchGuis.java
View file

@ -8,6 +8,7 @@ import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import appeng.client.gui.AEBaseGui;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.ContainerOpenContext; import appeng.container.ContainerOpenContext;
import appeng.core.sync.AppEngPacket; import appeng.core.sync.AppEngPacket;
@ -46,6 +47,8 @@ public class PacketSwitchGuis extends AppEngPacket
this.newGui = newGui; this.newGui = newGui;
AEBaseGui.switchingGuis = true;
ByteBuf data = Unpooled.buffer(); ByteBuf data = Unpooled.buffer();
data.writeInt( getPacketID() ); data.writeInt( getPacketID() );