From 658e0387f9fa04dbba7df22ca699b89f69b5741c Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 8 Jul 2015 12:15:08 +0200 Subject: [PATCH] Changed the ESD's Keytyping because canitzp annoyed me with it --- src/main/java/ellpeck/actuallyadditions/PLANNED.txt | 3 --- .../actuallyadditions/inventory/gui/GuiInputter.java | 10 ++++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt index 84c7e0f5f..4fecdc3d0 100644 --- a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt +++ b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt @@ -7,9 +7,6 @@ -Follows you around -Has an Inventory, a Crafting Table and a Furnace --Instant Teleport Device - -Teleports Players to where they look (Much like the Bukkit Compass) - -Ender Attractor / Repulsor -Attracts/Repulses Mobs -Has an aggressive and a friendly version diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java index 664d853a9..22671ef42 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java @@ -139,23 +139,21 @@ public class GuiInputter extends GuiContainer{ @Override public void keyTyped(char theChar, int key){ - if((!fieldPutStart.isFocused() && !fieldPutEnd.isFocused() && !fieldPullStart.isFocused() && !fieldPullEnd.isFocused())){ - super.keyTyped(theChar, key); - } - if(key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER){ if(this.fieldPutStart.isFocused()) this.setVariable(this.fieldPutStart, 0); if(this.fieldPutEnd.isFocused()) this.setVariable(this.fieldPutEnd, 1); if(this.fieldPullStart.isFocused()) this.setVariable(this.fieldPullStart, 2); if(this.fieldPullEnd.isFocused()) this.setVariable(this.fieldPullEnd, 3); } - - if(Character.isDigit(theChar) || key == Keyboard.KEY_BACK || key == Keyboard.KEY_DELETE || key == Keyboard.KEY_LEFT || key == Keyboard.KEY_RIGHT){ + else if(Character.isDigit(theChar) || key == Keyboard.KEY_BACK || key == Keyboard.KEY_DELETE || key == Keyboard.KEY_LEFT || key == Keyboard.KEY_RIGHT){ this.fieldPutStart.textboxKeyTyped(theChar, key); this.fieldPutEnd.textboxKeyTyped(theChar, key); this.fieldPullStart.textboxKeyTyped(theChar, key); this.fieldPullEnd.textboxKeyTyped(theChar, key); } + else{ + super.keyTyped(theChar, key); + } } public void setVariable(GuiTextField field, int sendInt){