mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Better text field management
This commit is contained in:
1 parent
9005e589e0
commit
ae77ce0e19
15 files changed
+37
-20
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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<Character> SPECIAL_CHARS = Arrays.asList('-', ' ', '|', '\'', '\"', '_', '+', ':', '(', ')',
|
||||
'?', '!', '/', '@', '$', '`', '~', ',', '.', '#');
|
||||
|
||||
public static boolean loaded;
|
||||
|
||||
private static Set<FrequencyManager> managers = new HashSet<FrequencyManager>();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user