fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fabric/master

Browse Source 
# Conflicts:
#	src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
This commit is contained in:
Sebastian Hartte
2020-08-24 22:34:26 +02:00
parent 07dfa3db2e 159f4c7f14
commit 4e86c92720
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
+6 -11
View File
@@ -89,7 +89,9 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
this.searchField.setMaxLength(25); this.searchField.setMaxLength(25);
this.searchField.setEditableColor(0xFFFFFF); this.searchField.setEditableColor(0xFFFFFF);
this.searchField.setVisible(true); this.searchField.setVisible(true);
this.searchField.setFocused(true); this.searchField.setChangedListener(str -> this.refreshList());
this.addChild(this.searchField);
this.changeFocus(true);
} }
@Override @Override
@@ -128,11 +130,8 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
@Override @Override
public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) { public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
if (this.searchField.mouseClicked(xCoord, yCoord, btn)) { if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) { this.searchField.setText("");
this.searchField.setText("");
this.refreshList();
}
return true; return true;
} }
@@ -170,11 +169,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
if (character == ' ' && this.searchField.getText().isEmpty()) { if (character == ' ' && this.searchField.getText().isEmpty()) {
return true; return true;
} }
if (this.searchField.charTyped(character, key)) { return super.charTyped(character, key);
this.refreshList();
return true;
}
return false;
} }
@Override @Override