Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed 'text.*' prefix

Browse Source
This commit is contained in:
Anuken
2019-01-09 16:58:06 -05:00
parent daa7b20e4a
commit b9618d66f2
68 changed files with 6895 additions and 6895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/io/anuke/mindustry/net/Net.java
View File

@@ -61,22 +61,22 @@ public class Net{
String type = t.getClass().toString().toLowerCase();
if(e instanceof BufferUnderflowException || e instanceof BufferOverflowException){
error = Core.bundle.get("text.error.io");
error = Core.bundle.get("error.io");
}else if(error.equals("mismatch")){
error = Core.bundle.get("text.error.mismatch");
error = Core.bundle.get("error.mismatch");
}else if(error.contains("port out of range") || error.contains("invalid argument") || (error.contains("invalid") && error.contains("address"))){
error = Core.bundle.get("text.error.invalidaddress");
error = Core.bundle.get("error.invalidaddress");
}else if(error.contains("connection refused") || error.contains("route to host") || type.contains("unknownhost")){
error = Core.bundle.get("text.error.unreachable");
error = Core.bundle.get("error.unreachable");
}else if(type.contains("timeout")){
error = Core.bundle.get("text.error.timedout");
error = Core.bundle.get("error.timedout");
}else if(error.equals("alreadyconnected")){
error = Core.bundle.get("text.error.alreadyconnected");
error = Core.bundle.get("error.alreadyconnected");
}else if(!error.isEmpty()){
error = Core.bundle.get("text.error.any");
error = Core.bundle.get("error.any");
}
ui.showText("", Core.bundle.format("text.connectfail", error));
ui.showText("", Core.bundle.format("connectfail", error));
ui.loadfrag.hide();
if(Net.client()){

4
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -28,11 +28,11 @@ public class Packets{
@Override
public String toString(){
return Core.bundle.get("text.server.kicked." + name());
return Core.bundle.get("server.kicked." + name());
}
public String extraText(){
return Core.bundle.getOrNull("text.server.kicked." + name() + ".text");
return Core.bundle.getOrNull("server.kicked." + name() + ".text");
}
}