use latest Netty and Guava
This commit is contained in:
parent
7f32e87ef4
commit
3af1b1f5b6
463 changed files with 611 additions and 68249 deletions
|
@ -46,7 +46,7 @@ import game.renderer.GlState;
|
|||
import game.renderer.texture.DynamicTexture;
|
||||
import game.renderer.texture.EntityTexManager;
|
||||
import game.renderer.texture.TextureUtil;
|
||||
import java.util.function.Predicate;
|
||||
import com.google.common.base.Predicate;
|
||||
|
||||
public class GuiSkin extends GuiList
|
||||
{
|
||||
|
@ -666,7 +666,7 @@ import game.gui.element.Button;
|
|||
import game.gui.element.TextField;
|
||||
import game.network.NetHandlerPlayServer;
|
||||
|
||||
import java.util.function.Predicate;
|
||||
import com.google.common.base.Predicate;
|
||||
import game.world.Region;
|
||||
|
||||
public class GuiEdit extends GuiScreen {
|
||||
|
@ -739,14 +739,14 @@ public class GuiEdit extends GuiScreen {
|
|||
if(this.player) {
|
||||
this.nameField.setMaxStringLength(16);
|
||||
this.nameField.setValidator(new Predicate<String>() {
|
||||
public boolean test(String name) {
|
||||
public boolean apply(String name) {
|
||||
return NetHandlerPlayServer.isValidUser(name);
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.nameField.setValidator(new Predicate<String>() {
|
||||
public boolean test(String name) {
|
||||
public boolean apply(String name) {
|
||||
for(int z = 0; z < name.length(); z++) {
|
||||
if(GuiCreate.DISALLOWED_CHARS.contains(name.charAt(z)))
|
||||
return false;
|
||||
|
@ -821,7 +821,7 @@ import game.gui.element.Button;
|
|||
import game.init.UniverseRegistry;
|
||||
import game.network.NetHandlerPlayServer;
|
||||
|
||||
import java.util.function.Predicate;
|
||||
import com.google.common.base.Predicate;
|
||||
import game.world.Region;
|
||||
|
||||
public class GuiCreate extends GuiScreen
|
||||
|
@ -856,7 +856,7 @@ public class GuiCreate extends GuiScreen
|
|||
this.worldNameField = new TextField(this.width / 2 - 100, 60, 200, 20);
|
||||
this.worldNameField.setFocused(true);
|
||||
this.worldNameField.setValidator(new Predicate<String>() {
|
||||
public boolean test(String name) {
|
||||
public boolean apply(String name) {
|
||||
for(int z = 0; z < name.length(); z++) {
|
||||
if(DISALLOWED_CHARS.contains(name.charAt(z)))
|
||||
return false;
|
||||
|
@ -867,7 +867,7 @@ public class GuiCreate extends GuiScreen
|
|||
this.worldUserField = new TextField(this.width / 2 - 100, 98, 200, 20);
|
||||
this.worldUserField.setMaxStringLength(16);
|
||||
this.worldUserField.setValidator(new Predicate<String>() {
|
||||
public boolean test(String name) {
|
||||
public boolean apply(String name) {
|
||||
return NetHandlerPlayServer.isValidUser(name);
|
||||
}
|
||||
});
|
||||
|
@ -932,7 +932,7 @@ import game.gui.element.Button;
|
|||
import game.gui.server.GuiMultiplayer.ServerEntry;
|
||||
import game.network.NetHandlerPlayServer;
|
||||
|
||||
import java.util.function.Predicate;
|
||||
import com.google.common.base.Predicate;
|
||||
|
||||
public class GuiServer extends GuiScreen {
|
||||
private final GuiScreen parentScreen;
|
||||
|
@ -963,7 +963,7 @@ public class GuiServer extends GuiScreen {
|
|||
this.serverUserField.setMaxStringLength(16);
|
||||
this.serverUserField.setText(this.serverData.user);
|
||||
this.serverUserField.setValidator(new Predicate<String>() {
|
||||
public boolean test(String name) {
|
||||
public boolean apply(String name) {
|
||||
return NetHandlerPlayServer.isValidUser(name);
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue