Merge branch 'development' into 1.9.4

* development:
  Better text field management

Conflicts:
	src/main/java/mekanism/client/gui/GuiMekanism.java
	src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
This commit is contained in:
aidancbrady committed 2016-07-10 13:59:20 -04:00
commit ca5047cbf3
15 files changed
+41 -21

No files matched your search

@@ -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);
@@ -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);
@@ -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);
}
@@ -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);
}
@@ -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<GuiElement> guiElements = new HashSet<GuiElement>();
@@ -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)
@@ -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);
}
@@ -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);
}
@@ -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);
}
@@ -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);
}
@@ -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);
@@ -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);
}
@@ -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);
}
@@ -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);
}
@@ -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>();
@@ -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);
}