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

Cleanup

Browse Source
This commit is contained in:
Anuken
2018-02-26 18:42:06 -05:00
parent 32791b4baa
commit 13e592a758
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -41,7 +41,7 @@ text.server.friendlyfire=Friendly Fire
text.trace=Trace Player text.trace=Trace Player
text.trace.playername=Player name: [accent]{0} text.trace.playername=Player name: [accent]{0}
text.trace.ip=IP: [accent]{0} text.trace.ip=IP: [accent]{0}
text.trace.modclient=Modded Client: [accent]{0} text.trace.modclient=Custom Client: [accent]{0}
text.trace.totalblocksbroken=Total blocks broken: [accent]{0} text.trace.totalblocksbroken=Total blocks broken: [accent]{0}
text.trace.structureblocksbroken=Structure blocks broken: [accent]{0} text.trace.structureblocksbroken=Structure blocks broken: [accent]{0}
text.trace.lastblockbroken=Last block broken: [accent]{0} text.trace.lastblockbroken=Last block broken: [accent]{0}

2
core/assets/version.properties
View File

@@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Mon Feb 26 17:17:34 EST 2018 #Mon Feb 26 18:01:50 EST 2018
version=release version=release
androidBuildCode=291 androidBuildCode=291
name=Mindustry name=Mindustry

3
core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
View File

@@ -14,7 +14,6 @@ import java.io.IOException;
import static io.anuke.mindustry.Vars.player; import static io.anuke.mindustry.Vars.player;
import static io.anuke.mindustry.Vars.ui; import static io.anuke.mindustry.Vars.ui;
//TODO add port specification
public class HostDialog extends FloatingDialog{ public class HostDialog extends FloatingDialog{
float w = 300; float w = 300;
@@ -31,7 +30,7 @@ public class HostDialog extends FloatingDialog{
Settings.put("name", text); Settings.put("name", text);
Settings.save(); Settings.save();
ui.listfrag.rebuild(); ui.listfrag.rebuild();
}).grow().pad(8).get().setMaxLength(48); }).grow().pad(8).get().setMaxLength(40);
ImageButton button = t.addImageButton("white", 40, () -> { ImageButton button = t.addImageButton("white", 40, () -> {
new ColorPickDialog().show(color -> { new ColorPickDialog().show(color -> {

3
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -56,7 +56,6 @@ public class JoinDialog extends FloatingDialog {
setupRemote(); setupRemote();
refreshRemote(); refreshRemote();
}else{ }else{
//renaming.port = Strings.parseInt(Settings.getString("port"));
renaming.ip = Settings.getString("ip"); renaming.ip = Settings.getString("ip");
saveServers(); saveServers();
setupRemote(); setupRemote();
@@ -179,7 +178,7 @@ public class JoinDialog extends FloatingDialog {
Vars.player.name = text; Vars.player.name = text;
Settings.put("name", text); Settings.put("name", text);
Settings.save(); Settings.save();
}).grow().pad(8).get().setMaxLength(48); }).grow().pad(8).get().setMaxLength(40);
ImageButton button = t.addImageButton("white", 40, () -> { ImageButton button = t.addImageButton("white", 40, () -> {
new ColorPickDialog().show(color -> { new ColorPickDialog().show(color -> {

4
core/src/io/anuke/mindustry/ui/dialogs/TraceDialog.java
View File

@@ -35,7 +35,7 @@ public class TraceDialog extends FloatingDialog {
table.row(); table.row();
table.add(Bundles.format("text.trace.structureblocksbroken", info.structureBlocksBroken)); table.add(Bundles.format("text.trace.structureblocksbroken", info.structureBlocksBroken));
table.row(); table.row();
table.add(Bundles.format("text.trace.lastblockbroken", info.lastBlockBroken)); table.add(Bundles.format("text.trace.lastblockbroken", info.lastBlockBroken.formalName));
table.row(); table.row();
table.add().pad(5); table.add().pad(5);
@@ -43,7 +43,7 @@ public class TraceDialog extends FloatingDialog {
table.add(Bundles.format("text.trace.totalblocksplaced", info.totalBlocksPlaced)); table.add(Bundles.format("text.trace.totalblocksplaced", info.totalBlocksPlaced));
table.row(); table.row();
table.add(Bundles.format("text.trace.lastblockplaced", info.lastBlockPlaced)); table.add(Bundles.format("text.trace.lastblockplaced", info.lastBlockPlaced.formalName));
table.row(); table.row();
content().add(table); content().add(table);

6
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -504,14 +504,14 @@ public class ServerControl extends Module {
Log.info("&lcTrace info for player '{0}':", target.name); Log.info("&lcTrace info for player '{0}':", target.name);
Log.info(" &lyEntity ID: {0}", info. playerid); Log.info(" &lyEntity ID: {0}", info. playerid);
Log.info(" &lyIP: {0}", info.ip); Log.info(" &lyIP: {0}", info.ip);
Log.info(" &lymodded client: {0}", info.modclient); Log.info(" &lycustom client: {0}", info.modclient);
Log.info(""); Log.info("");
Log.info(" &lytotal blocks broken: {0}", info.totalBlocksBroken); Log.info(" &lytotal blocks broken: {0}", info.totalBlocksBroken);
Log.info(" &lystructure blocks broken: {0}", info.structureBlocksBroken); Log.info(" &lystructure blocks broken: {0}", info.structureBlocksBroken);
Log.info(" &lylast block broken: {0}", info.lastBlockBroken); Log.info(" &lylast block broken: {0}", info.lastBlockBroken.formalName);
Log.info(""); Log.info("");
Log.info(" &lytotal blocks placed: {0}", info.totalBlocksPlaced); Log.info(" &lytotal blocks placed: {0}", info.totalBlocksPlaced);
Log.info(" &lylast block placed: {0}", info.lastBlockPlaced); Log.info(" &lylast block placed: {0}", info.lastBlockPlaced.formalName);
}else{ }else{
info("Nobody with that name could be found."); info("Nobody with that name could be found.");
} }