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

Added admins with in-game icons and permissions; untested

Browse Source
This commit is contained in:
Anuken
2018-02-25 23:44:35 -05:00
parent 9f5f6ae382
commit 7429d029f3
16 changed files with 278 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/io/anuke/mindustry/ui/dialogs/AdminsDialog.java
View File

@@ -1,10 +1,13 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetConnection;
import io.anuke.mindustry.net.NetEvents;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Table;
import static io.anuke.mindustry.Vars.netServer;
import static io.anuke.mindustry.Vars.ui;
import static io.anuke.mindustry.Vars.*;
public class AdminsDialog extends FloatingDialog {
@@ -40,6 +43,13 @@ public class AdminsDialog extends FloatingDialog {
res.addImageButton("icon-cancel", 14*3, () -> {
ui.showConfirm("$text.confirm", "$text.confirmunadmin", () -> {
netServer.admins.unAdminPlayer(ip);
for(Player player : playerGroup.all()){
NetConnection c = Net.getConnection(player.clientid);
if(c != null){
NetEvents.handleAdminSet(player, false);
break;
}
}
setup();
});
}).size(h).pad(-14f);

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

@@ -50,6 +50,7 @@ public class HostDialog extends FloatingDialog{
Timers.runTask(5f, () -> {
try{
Net.host(Vars.port);
player.isAdmin = true;
}catch (IOException e){
ui.showError(Bundles.format("text.server.error", Strings.parseException(e, false)));
}
@@ -58,19 +59,4 @@ public class HostDialog extends FloatingDialog{
});
}).width(w).height(70f);
}
/*
showTextInput("$text.hostserver", "$text.server.port", Vars.port + "", new DigitsOnlyFilter(), text -> {
int result = Strings.parseInt(text);
if(result == Integer.MIN_VALUE || result >= 65535){
ui.showError("$text.server.invalidport");
}else{
try{
Net.host(result);
}catch (IOException e){
ui.showError(Bundles.format("text.server.error", Strings.parseException(e, false)));
}
}
});
*/
}

37
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -1,10 +1,12 @@
package io.anuke.mindustry.ui.fragments;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.NetConnection;
import io.anuke.mindustry.net.NetEvents;
import io.anuke.mindustry.net.Packets.AdminAction;
import io.anuke.mindustry.net.Packets.KickReason;
import io.anuke.mindustry.ui.BorderImage;
import io.anuke.ucore.core.Inputs;
@@ -86,7 +88,7 @@ public class PlayerListFragment implements Fragment{
for(Player player : playerGroup.all()){
NetConnection connection = Net.getConnection(player.clientid);
if(connection == null && !player.isLocal) continue;
if(connection == null && Net.server() && !player.isLocal) continue;
Table button = new Table("button");
button.left();
@@ -113,7 +115,9 @@ public class PlayerListFragment implements Fragment{
button.labelWrap("[#" + player.getColor().toString().toUpperCase() + "]" + player.name).width(170f).pad(10);
button.add().grow();
if(Net.server() && !player.isLocal){
button.addImage("icon-admin").size(14*2).visible(() -> player.isAdmin && !(!player.isLocal && Net.server())).padRight(5);
if((Net.server() || Vars.player.isAdmin) && !player.isLocal && !player.isAdmin){
button.add().growY();
float bs = (h + 14)/2f;
@@ -123,30 +127,45 @@ public class PlayerListFragment implements Fragment{
t.addImageButton("icon-ban", 14*2, () -> {
ui.showConfirm("$text.confirm", "$text.confirmban", () -> {
netServer.admins.banPlayer(connection.address);
Net.kickConnection(player.clientid, KickReason.banned);
if(Net.server()) {
netServer.admins.banPlayer(connection.address);
Net.kickConnection(player.clientid, KickReason.banned);
}else{
NetEvents.handleAdministerRequest(player, AdminAction.ban);
}
});
}).padBottom(-5.1f);
t.addImageButton("icon-cancel", 14*2, () -> Net.kickConnection(player.clientid, KickReason.kick)).padBottom(-5.1f);
t.addImageButton("icon-cancel", 14*2, () -> {
if(Net.server()) {
Net.kickConnection(player.clientid, KickReason.kick);
}else{
NetEvents.handleAdministerRequest(player, AdminAction.kick);
}
}).padBottom(-5.1f);
t.row();
t.addImageButton("icon-admin", "toggle", 14*2, () -> {
if(Net.client()) return;
if(netServer.admins.isAdmin(connection.address)){
ui.showConfirm("$text.confirm", "$text.confirmunadmin", () -> {
netServer.admins.unAdminPlayer(connection.address);
//TODO send aproppriate packets.
NetEvents.handleAdminSet(player, false);
});
}else{
ui.showConfirm("$text.confirm", "$text.confirmadmin", () -> {
netServer.admins.adminPlayer(connection.address);
//TODO send aproppriate packets.
NetEvents.handleAdminSet(player, true);
});
}
}).update(b -> b.setChecked(netServer.admins.isAdmin(connection.address)));
}).update(b -> b.setChecked(connection != null && netServer.admins.isAdmin(connection.address)))
.disabled(Net.client());
//TODO unused?
t.addImageButton("icon-cancel", 14*2, () -> {});
t.addImageButton("icon-cancel", 14*2, () -> Net.kickConnection(player.clientid, KickReason.kick));
}).padRight(12).padTop(-5).padLeft(0).padBottom(-10).size(bs + 10f, bs);