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

Static steam names

Browse Source
This commit is contained in:
Anuken
2019-09-15 13:03:29 -04:00
parent 369c3b569c
commit 69bfd8f54d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,11 +231,15 @@ public class JoinDialog extends FloatingDialog{
cont.clear(); cont.clear();
cont.table(t -> { cont.table(t -> {
t.add("$name").padRight(10); t.add("$name").padRight(10);
t.addField(Core.settings.getString("name"), text -> { if(!steam){
player.name = text; t.addField(Core.settings.getString("name"), text -> {
Core.settings.put("name", text); player.name = text;
Core.settings.save(); Core.settings.put("name", text);
}).grow().pad(8).get().setMaxLength(maxNameLength); Core.settings.save();
}).grow().pad(8).get().setMaxLength(maxNameLength);
}else{
t.add(player.name).update(l -> l.setColor(player.color)).grow().pad(8);
}
ImageButton button = t.addImageButton(Tex.whiteui, Styles.clearFulli, 40, () -> { ImageButton button = t.addImageButton(Tex.whiteui, Styles.clearFulli, 40, () -> {
new ColorPickDialog().show(color -> { new ColorPickDialog().show(color -> {

1
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@@ -130,6 +130,7 @@ public class DesktopLauncher extends ClientLauncher{
SVars.user = new SUser(); SVars.user = new SUser();
Events.on(ClientLoadEvent.class, event -> { Events.on(ClientLoadEvent.class, event -> {
player.name = SVars.net.friends.getPersonaName();
Core.settings.defaults("name", SVars.net.friends.getPersonaName()); Core.settings.defaults("name", SVars.net.friends.getPersonaName());
//update callbacks //update callbacks
Core.app.addListener(new ApplicationListener(){ Core.app.addListener(new ApplicationListener(){

2
desktop/src/io/anuke/mindustry/desktop/steam/SNet.java
View File

@@ -442,7 +442,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
@Override @Override
public boolean isConnected(){ public boolean isConnected(){
snet.getP2PSessionState(sid, state); snet.getP2PSessionState(sid, state);
return state.isConnectionActive(); return true;//state.isConnectionActive();
} }
@Override @Override