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
2020-06-26 15:59:54 -04:00
parent fdf7c88083
commit 0df4e26736
52 changed files with 110 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -263,7 +263,7 @@ public class JoinDialog extends BaseDialog{
Core.settings.put("name", text);
}).grow().pad(8).get().setMaxLength(maxNameLength);
}else{
t.add(player.name()).update(l -> l.setColor(player.color())).grow().pad(8);
t.add(player.name).update(l -> l.setColor(player.color())).grow().pad(8);
}
ImageButton button = t.button(Tex.whiteui, Styles.clearFulli, 40, () -> {
@@ -379,7 +379,7 @@ public class JoinDialog extends BaseDialog{
}
public void connect(String ip, int port){
if(player.name().trim().isEmpty()){
if(player.name.trim().isEmpty()){
ui.showInfo("$noname");
return;
}

2
core/src/mindustry/ui/dialogs/TraceDialog.java
View File

@@ -22,7 +22,7 @@ public class TraceDialog extends BaseDialog{
table.defaults().pad(1);
table.defaults().left();
table.add(Core.bundle.format("trace.playername", player.name()));
table.add(Core.bundle.format("trace.playername", player.name));
table.row();
table.add(Core.bundle.format("trace.ip", info.ip));
table.row();

4
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -672,12 +672,12 @@ public class HudFragment extends Fragment{
}
private boolean canSkipWave(){
return state.rules.waves && ((net.server() || player.admin()) || !net.active()) && state.enemies == 0 && !spawner.isSpawning() && !state.rules.tutorial;
return state.rules.waves && ((net.server() || player.admin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning() && !state.rules.tutorial;
}
private void addPlayButton(Table table){
table.right().button(Icon.play, Styles.righti, 30f, () -> {
if(net.client() && player.admin()){
if(net.client() && player.admin){
Call.onAdminRequest(player, AdminAction.wave);
}else if(inLaunchWave()){
ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> state.wavetime = 0f);

26
core/src/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -77,7 +77,7 @@ public class PlayerListFragment extends Fragment{
Groups.player.sort(Structs.comparing(Player::team));
Groups.player.each(user -> {
found = true;
NetConnection connection = user.con();
NetConnection connection = user.con;
if(connection == null && net.server() && !user.isLocal()) return;
if(sField.getText().length() > 0 && !user.name().toLowerCase().contains(sField.getText().toLowerCase()) && !Strings.stripColors(user.name().toLowerCase()).contains(sField.getText().toLowerCase())) return;
@@ -104,9 +104,9 @@ public class PlayerListFragment extends Fragment{
button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).width(170f).pad(10);
button.add().grow();
button.image(Icon.admin).visible(() -> user.admin() && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility();
button.image(Icon.admin).visible(() -> user.admin && !(!user.isLocal() && net.server())).padRight(5).get().updateVisibility();
if((net.server() || player.admin()) && !user.isLocal() && (!user.admin() || net.server())){
if((net.server() || player.admin) && !user.isLocal() && (!user.admin || net.server())){
button.add().growY();
float bs = (h) / 2f;
@@ -115,9 +115,13 @@ public class PlayerListFragment extends Fragment{
t.defaults().size(bs);
t.button(Icon.hammer, Styles.clearPartiali,
() -> ui.showConfirm("$confirm", Core.bundle.format("confirmban", user.name()), () -> Call.onAdminRequest(user, AdminAction.ban)));
() -> {
ui.showConfirm("$confirm", Core.bundle.format("confirmban", user.name()), () -> Call.onAdminRequest(user, AdminAction.ban));
});
t.button(Icon.cancel, Styles.clearPartiali,
() -> ui.showConfirm("$confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.onAdminRequest(user, AdminAction.kick)));
() -> {
ui.showConfirm("$confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.onAdminRequest(user, AdminAction.kick));
});
t.row();
@@ -131,19 +135,23 @@ public class PlayerListFragment extends Fragment{
}else{
ui.showConfirm("$confirm", Core.bundle.format("confirmadmin", user.name()), () -> netServer.admins.adminPlayer(id, user.usid()));
}
}).update(b -> b.setChecked(user.admin()))
}).update(b -> b.setChecked(user.admin))
.disabled(b -> net.client())
.touchable(() -> net.client() ? Touchable.disabled : Touchable.enabled)
.checked(user.admin());
.checked(user.admin);
t.button(Icon.zoom, Styles.clearPartiali, () -> Call.onAdminRequest(user, AdminAction.trace));
}).padRight(12).size(bs + 10f, bs);
}else if(!user.isLocal() && !user.admin() && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick
}else if(!user.isLocal() && !user.admin && net.client() && Groups.player.size() >= 3 && player.team() == user.team()){ //votekick
button.add().growY();
button.button(Icon.hammer, Styles.clearPartiali,
() -> ui.showConfirm("$confirm", Core.bundle.format("confirmvotekick", user.name()), () -> Call.sendChatMessage("/votekick " + user.name()))).size(h);
() -> {
ui.showConfirm("$confirm", Core.bundle.format("confirmvotekick", user.name()), () -> {
Call.sendChatMessage("/votekick " + user.name());
});
}).size(h);
}
content.add(button).padBottom(-6).width(350f).maxHeight(h + 14);