diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 509c45bb1..5ae12399d 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -674,7 +674,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 824e38f61..495bdec52 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 c2475e106..b7cd628e9 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -115,7 +115,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 d02f25ec2..6fb610f7d 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -115,7 +115,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 eb40fb1ee..e6cc6b8f1 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -20,6 +20,8 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; + public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper { public Set guiElements = new HashSet(); @@ -73,6 +75,18 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper GlStateManager.popMatrix(); } } + + 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 || isKeyComboCtrlA(i) || + isKeyComboCtrlC(i) || isKeyComboCtrlV(i) || isKeyComboCtrlX(i)) + { + 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 6b4b7021b..c75e85c80 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -252,7 +252,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 a3515cad3..bcdb1174d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -12,6 +12,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.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityQuantumEntangloporter; @@ -33,8 +34,6 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiQuantumEntangloporter extends GuiMekanism { - public static int MAX_LENGTH = 16; - public ResourceLocation resource; public TileEntityQuantumEntangloporter tileEntity; @@ -88,7 +87,8 @@ public class GuiQuantumEntangloporter extends GuiMekanism deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); frequencyField = new GuiTextField(4, fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); - frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setMaxStringLength(FrequencyManager.MAX_FREQ_LENGTH); + frequencyField.setEnableBackgroundDrawing(false); updateButtons(); @@ -230,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 8ceaeefdf..2b20a3216 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -180,7 +180,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 0fef195f3..045de868d 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -214,7 +214,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 fe4e92e6b..29a7540c3 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -158,7 +158,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 1562eb88f..18225cbc4 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -116,7 +116,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 a59be58d3..d45ae325d 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -116,7 +116,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 1f54e0e29..edd0dfa11 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -16,6 +16,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; @@ -44,8 +45,6 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiTeleporter extends GuiMekanism { - public static int MAX_LENGTH = 16; - public EnumHand currentHand; public ResourceLocation resource; @@ -165,9 +164,10 @@ public class GuiTeleporter extends GuiMekanism { teleportButton = new GuiButton(4, guiWidth + 42, guiHeight + 140, 92, 20, LangUtils.localize("gui.teleport")); } - + frequencyField = new GuiTextField(5, fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); - frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setMaxStringLength(FrequencyManager.MAX_FREQ_LENGTH); + frequencyField.setEnableBackgroundDrawing(false); updateButtons(); @@ -331,7 +331,7 @@ public class GuiTeleporter extends GuiMekanism { super.keyTyped(c, i); } - + if(i == Keyboard.KEY_RETURN) { if(frequencyField.isFocused()) @@ -341,7 +341,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 f4e67ab6d..c567d965c 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 ad2d0769c..40fcd313f 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -181,7 +181,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); }