Fix keybinds in component GUI

OpenMods · Sep 16, 2018 · 5ce0a1c · 5ce0a1c
1 parent a8c86f6
commit 5ce0a1c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/openmods/gui/BaseGuiContainer.java b/src/main/java/openmods/gui/BaseGuiContainer.java
@@ -28,9 +28,9 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
 		super.drawGuiContainerForegroundLayer(mouseX, mouseY);
 		String machineName = TranslationUtils.translateToLocal(name);
 		int x = this.xSize / 2 - (fontRenderer.getStringWidth(machineName) / 2);
-		fontRenderer.drawString(machineName, x, 6, 4210752);
+		fontRenderer.drawString(machineName, x, 6, 0x404040);
 		String translatedName = TranslationUtils.translateToLocal("container.inventory");
-		fontRenderer.drawString(translatedName, 8, this.ySize - 96 + 2, 4210752);
+		fontRenderer.drawString(translatedName, 8, this.ySize - 96 + 2, 0x404040);
 	}
 
 	public void sendButtonClick(int buttonId) {

diff --git a/src/main/java/openmods/gui/ComponentGui.java b/src/main/java/openmods/gui/ComponentGui.java
@@ -16,6 +16,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import openmods.gui.component.BaseComposite;
+import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
 public abstract class ComponentGui extends GuiContainer {
@@ -88,6 +89,13 @@ public void bindTexture(ResourceLocation texture) {
 	public void initGui() {
 		super.initGui();
 		root.init(createParent());
+		Keyboard.enableRepeatEvents(true);
+	}
+
+	@Override
+	public void onGuiClosed() {
+		super.onGuiClosed();
+		Keyboard.enableRepeatEvents(false);
 	}
 
 	protected abstract BaseComposite createRoot();
@@ -120,9 +128,13 @@ protected void mouseClickMove(int x, int y, int button, long time) {
 	}
 
 	@Override
-	protected void keyTyped(char par1, int par2) throws IOException {
-		super.keyTyped(par1, par2);
-		root.keyTyped(par1, par2);
+	protected void keyTyped(char typedChar, int keyCode) {
+		// no super call!
+		if (keyCode == Keyboard.KEY_ESCAPE) {
+			this.mc.player.closeScreen();
+		} else {
+			root.keyTyped(typedChar, keyCode);
+		}
 	}
 
 	public void preRender(float mouseX, float mouseY) {}