Some small fixes

This commit is contained in:
modmuss50 2015-06-17 17:33:57 +01:00
parent 598badc375
commit da4d56ac0f
3 changed files with 30 additions and 8 deletions

View file

@ -8,6 +8,7 @@ import net.minecraft.world.World;
import techreborn.client.container.ContainerIDSU;
import techreborn.cofhLib.gui.GuiBase;
import techreborn.cofhLib.gui.element.ElementListBox;
import techreborn.cofhLib.gui.element.ElementTextField;
import techreborn.cofhLib.gui.element.ElementTextFieldLimited;
import techreborn.cofhLib.gui.element.listbox.ListBoxElementText;
import techreborn.packets.PacketHandler;
@ -15,6 +16,7 @@ import techreborn.packets.PacketIdsu;
import techreborn.tiles.idsu.ClientSideIDSUManager;
import techreborn.tiles.idsu.IDSUManager;
import techreborn.tiles.idsu.TileIDSU;
import techreborn.util.LogHelper;
public class GuiIDSU extends GuiBase {
@ -26,6 +28,7 @@ public class GuiIDSU extends GuiBase {
ElementListBox listBox;
ElementTextFieldLimited idFeild;
ElementTextField nameFeild;
public GuiIDSU(EntityPlayer player,
@ -83,6 +86,9 @@ public class GuiIDSU extends GuiBase {
addElement(idFeild);
nameFeild = new ElementTextField(this, 10, 100, 50, 10);
addElement(nameFeild);
}
@ -90,7 +96,28 @@ public class GuiIDSU extends GuiBase {
@Override
protected void actionPerformed(GuiButton button) {
super.actionPerformed(button);
PacketHandler.sendPacketToServer(new PacketIdsu(button.id, idsu, Integer.parseInt(idFeild.getText()), "TestName"));
if(isInteger(idFeild.getText())){
PacketHandler.sendPacketToServer(new PacketIdsu(button.id, idsu, Integer.parseInt(idFeild.getText()), nameFeild.getText()));
} else {
LogHelper.info("There was an issue in the gui!, Please report this to the TechReborn Devs");
}
}
public static boolean isInteger(String s) {
return isInteger(s,10);
}
public static boolean isInteger(String s, int radix) {
if(s.isEmpty()) return false;
for(int i = 0; i < s.length(); i++) {
if(i == 0 && s.charAt(i) == '-') {
if(s.length() == 1) return false;
else continue;
}
if(Character.digit(s.charAt(i),radix) < 0) return false;
}
return true;
}
}

View file

@ -26,9 +26,6 @@ public class PacketIdsu extends SimplePacket {
this.buttonID = buttonID;
this.channel = channel;
this.newName = newName;
if(this.newName.equals("")){
this.newName = "BLANK!!!";
}
}
@Override

View file

@ -11,10 +11,8 @@ public class TileIDSU extends TileMachineBase {
public void handleGuiInputFromClient(int buttonID, int channel, EntityPlayer player, String name) {
if(buttonID == 4){
channelID = channel;
IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, channel);//Do this to init the save data :)
if(name != "BLANK!!!"){
IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, channel).name = name;
}
IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, channel).name = name;
IDSUManager.INSTANCE.getWorldDataFormWorld(worldObj).save();
if(worldObj.isRemote){
PacketHandler.sendPacketToPlayer(IDSUManager.INSTANCE.getPacket(worldObj, player), player);
}