Merge branch 'db-improve' into authme-process

This commit is contained in:
DNx5 2015-12-02 04:11:21 +07:00
commit 3d8e63699d

View File

@ -23,9 +23,8 @@ public class PlayerAuth {
/**
*
*/
public PlayerAuth(String serialized)
{
this.unserialize(serialized);
public PlayerAuth(String serialized) {
this.deserialize(serialized);
}
/**
@ -455,34 +454,32 @@ public class PlayerAuth {
}
/**
* Method to serialize playerauth
* Method to serialize PlayerAuth
*
* @return String
*/
public String serialize()
{
public String serialize() {
StringBuilder str = new StringBuilder();
str.append(this.nickname).append(';');
str.append(this.realName).append(';');
str.append(this.ip).append(';');
str.append(this.email).append(';');
str.append(this.hash).append(';');
str.append(this.salt).append(';');
str.append(this.groupId).append(';');
str.append(this.lastLogin).append(';');
str.append(this.world).append(';');
str.append(this.x).append(';');
str.append(this.y).append(';');
char d = ';';
str.append(this.nickname).append(d);
str.append(this.realName).append(d);
str.append(this.ip).append(d);
str.append(this.email).append(d);
str.append(this.hash).append(d);
str.append(this.salt).append(d);
str.append(this.groupId).append(d);
str.append(this.lastLogin).append(d);
str.append(this.world).append(d);
str.append(this.x).append(d);
str.append(this.y).append(d);
str.append(this.z);
return str.toString();
}
/**
* Method to unserialize playerauth
*
* Method to deserialize PlayerAuth
*/
public void unserialize(String str)
{
public void deserialize(String str) {
String[] args = str.split(";");
this.nickname = args[0];
this.realName = args[1];
@ -497,4 +494,97 @@ public class PlayerAuth {
this.y = Double.parseDouble(args[10]);
this.z = Double.parseDouble(args[11]);
}
public static Builder builder() {
return new Builder();
}
public static final class Builder {
private String name;
private String realName = "Player";
private String hash = "";
private String salt = "";
private String ip = "127.0.0.1";
private String world = "world";
private double x = 0.0f;
private double y = 0.0f;
private double z = 0.0f;
private long lastLogin = System.currentTimeMillis();
private int groupId = -1;
private String email = "your@email.com";
public PlayerAuth build() {
return new PlayerAuth(
name,
hash,
salt,
groupId,
ip,
lastLogin,
x, y, z, world,
email,
realName
);
}
public Builder name(String name) {
this.name = name.toLowerCase();
return this;
}
public Builder realName(String realName) {
this.realName = realName;
return this;
}
public Builder hash(String hash) {
this.hash = hash;
return this;
}
public Builder salt(String salt) {
this.salt = salt;
return this;
}
public Builder ip(String ip) {
this.ip = ip;
return this;
}
public Builder locWorld(String world) {
this.world = world;
return this;
}
public Builder locX(double x) {
this.x = x;
return this;
}
public Builder locY(double y) {
this.y = y;
return this;
}
public Builder locZ(double z) {
this.z = z;
return this;
}
public Builder lastLogin(long lastLogin) {
this.lastLogin = lastLogin;
return this;
}
public Builder groupId(int groupId) {
this.groupId = groupId;
return this;
}
public Builder email(String email) {
this.email = email;
return this;
}
}
}