From ae77ce0e19dd74faa1044eb36ff4142e37a34169 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 10 Jul 2016 13:53:13 -0400 Subject: [PATCH] Better text field management --- .../mekanism/client/gui/GuiDigitalMinerConfig.java | 2 +- .../java/mekanism/client/gui/GuiLaserAmplifier.java | 2 +- .../java/mekanism/client/gui/GuiMModIDFilter.java | 2 +- .../java/mekanism/client/gui/GuiMOreDictFilter.java | 2 +- src/main/java/mekanism/client/gui/GuiMekanism.java | 13 +++++++++++++ .../client/gui/GuiOredictionificatorFilter.java | 2 +- .../client/gui/GuiQuantumEntangloporter.java | 7 +++---- .../mekanism/client/gui/GuiResistiveHeater.java | 2 +- .../java/mekanism/client/gui/GuiSecurityDesk.java | 2 +- .../mekanism/client/gui/GuiTItemStackFilter.java | 2 +- .../java/mekanism/client/gui/GuiTModIDFilter.java | 2 +- .../java/mekanism/client/gui/GuiTOreDictFilter.java | 2 +- .../java/mekanism/client/gui/GuiTeleporter.java | 9 ++++----- .../mekanism/common/frequency/FrequencyManager.java | 6 ++++++ .../generators/client/gui/GuiReactorFuel.java | 2 +- 15 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 258092596..1d35a4df8 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -671,7 +671,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism } } - if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || isTextboxKey(c, i)) { radiusField.textboxKeyTyped(c, i); minField.textboxKeyTyped(c, i); diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 67716429c..93c8b2130 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -148,7 +148,7 @@ public class GuiLaserAmplifier extends GuiMekanism } } - if(Character.isDigit(c) || c == '.' || c == 'E' || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || c == '.' || c == 'E' || isTextboxKey(c, i)) { minField.textboxKeyTyped(c, i); maxField.textboxKeyTyped(c, i); diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 25eadd27b..ee49b66e4 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -112,7 +112,7 @@ public class GuiMModIDFilter extends GuiMekanism return; } - if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || isTextboxKey(c, i)) { modIDText.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index fa4037469..f4c55c396 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -112,7 +112,7 @@ public class GuiMOreDictFilter extends GuiMekanism return; } - if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || isTextboxKey(c, i)) { oreDictText.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 70768b9f7..7faec85d0 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -18,6 +18,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper @@ -73,6 +74,18 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper GL11.glPopMatrix(); } } + + public static boolean isTextboxKey(char c, int i) + { + if(i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT || + i == Keyboard.KEY_END || i == Keyboard.KEY_HOME || i == Keyboard.KEY_BACK || c == 1 || c == 3 || c == 22 + || c == 24) + { + return true; + } + + return false; + } @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index a9b8c0a34..5535de6b6 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -248,7 +248,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism return; } - if(Character.isLetter(c) || Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isLetter(c) || Character.isDigit(c) || isTextboxKey(c, i)) { filterText.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 275de0d4d..59450192c 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; import mekanism.common.inventory.container.ContainerQuantumEntangloporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; @@ -34,8 +35,6 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiQuantumEntangloporter extends GuiMekanism { - public static int MAX_LENGTH = 16; - public ResourceLocation resource; public TileEntityQuantumEntangloporter tileEntity; @@ -89,7 +88,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); - frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setMaxStringLength(FrequencyManager.MAX_FREQ_LENGTH); frequencyField.setEnableBackgroundDrawing(false); updateButtons(); @@ -231,7 +230,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism } } - if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || Character.isLetter(c) || isTextboxKey(c, i) || FrequencyManager.SPECIAL_CHARS.contains(c)) { frequencyField.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 857058ffe..0fbf6800c 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -179,7 +179,7 @@ public class GuiResistiveHeater extends GuiMekanism return; } - if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || isTextboxKey(c, i)) { energyUsageField.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 0a26ada75..fa9fa0a9d 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -213,7 +213,7 @@ public class GuiSecurityDesk extends GuiMekanism } } - if(SPECIAL_CHARS.contains(c) || Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(SPECIAL_CHARS.contains(c) || Character.isDigit(c) || Character.isLetter(c) || isTextboxKey(c, i)) { trustedField.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 62938c7c6..e56c4f9bd 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -153,7 +153,7 @@ public class GuiTItemStackFilter extends GuiMekanism super.keyTyped(c, i); } - if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || isTextboxKey(c, i)) { minField.textboxKeyTyped(c, i); maxField.textboxKeyTyped(c, i); diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 112ffe817..de19a598f 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -112,7 +112,7 @@ public class GuiTModIDFilter extends GuiMekanism return; } - if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || isTextboxKey(c, i)) { modIDText.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 9594490c7..b0b22e6c3 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -112,7 +112,7 @@ public class GuiTOreDictFilter extends GuiMekanism return; } - if(Character.isLetter(c) || Character.isDigit(c) || TransporterFilter.SPECIAL_CHARS.contains(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isLetter(c) || Character.isDigit(c) || isTextboxKey(c, i)) { oreDictText.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 3da5c177f..ac4884eaf 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.item.ItemPortableTeleporter; @@ -42,8 +43,6 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiTeleporter extends GuiMekanism { - public static int MAX_LENGTH = 16; - public ResourceLocation resource; public TileEntityTeleporter tileEntity; @@ -162,7 +161,7 @@ public class GuiTeleporter extends GuiMekanism } frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); - frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setMaxStringLength(FrequencyManager.MAX_FREQ_LENGTH); frequencyField.setEnableBackgroundDrawing(false); updateButtons(); @@ -326,7 +325,7 @@ public class GuiTeleporter extends GuiMekanism { super.keyTyped(c, i); } - + if(i == Keyboard.KEY_RETURN) { if(frequencyField.isFocused()) @@ -336,7 +335,7 @@ public class GuiTeleporter extends GuiMekanism } } - if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || Character.isLetter(c) || isTextboxKey(c, i) || FrequencyManager.SPECIAL_CHARS.contains(c)) { frequencyField.textboxKeyTyped(c, i); } diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 110a99245..a8d46c96c 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -4,8 +4,10 @@ import io.netty.buffer.ByteBuf; import java.lang.reflect.Constructor; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; import mekanism.api.Coord4D; @@ -18,6 +20,10 @@ import net.minecraftforge.common.util.Constants.NBT; public class FrequencyManager { + public static final int MAX_FREQ_LENGTH = 16; + public static final List SPECIAL_CHARS = Arrays.asList('-', ' ', '|', '\'', '\"', '_', '+', ':', '(', ')', + '?', '!', '/', '@', '$', '`', '~', ',', '.', '#'); + public static boolean loaded; private static Set managers = new HashSet(); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 737348932..a7d41e704 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -180,7 +180,7 @@ public class GuiReactorFuel extends GuiMekanism } } - if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(Character.isDigit(c) || isTextboxKey(c, i)) { injectionRateField.textboxKeyTyped(c, i); }