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

Merge

Browse Source
This commit is contained in:
Anuken
2020-01-18 11:16:03 -05:00
parent b20e0967fd 95352e1729
commit f044f30829
236 changed files with 6310 additions and 6330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/src/mindustry/desktop/steam/SNet.java
View File

@@ -76,14 +76,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
}
net.handleServerReceived(con, output);
}catch(RuntimeException e){
if(e.getCause() instanceof ValidateException){
ValidateException v = (ValidateException)e.getCause();
Log.err("Validation failed: {0} ({1})", v.player.name, v.getMessage());
}else{
Log.err(e);
}
}catch(Exception e){
}catch(Throwable e){
Log.err(e);
}
}else if(currentServer != null && fromID == currentServer.getAccountID()){
@@ -322,7 +315,8 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
Strings.parseInt(smat.getLobbyData(lobby, "version"), -1),
smat.getLobbyData(lobby, "versionType"),
Gamemode.valueOf(smat.getLobbyData(lobby, "gamemode")),
smat.getLobbyMemberLimit(lobby)
smat.getLobbyMemberLimit(lobby),
""
);
hosts.add(out);
}catch(Exception e){

8
desktop/src/mindustry/desktop/steam/SWorkshop.java
View File

@@ -101,12 +101,12 @@ public class SWorkshop implements SteamUGCCallback{
dialog.cont.add("$workshop.menu").pad(20f);
dialog.addCloseButton();
dialog.buttons.addImageTextButton("$view.workshop", Icon.linkSmall, () -> {
dialog.buttons.addImageTextButton("$view.workshop", Icon.link, () -> {
viewListingID(id);
dialog.hide();
}).size(210f, 64f);
dialog.buttons.addImageTextButton("$workshop.update", Icon.upgradeSmall, () -> {
dialog.buttons.addImageTextButton("$workshop.update", Icon.up, () -> {
new FloatingDialog("$workshop.update"){{
setFillParent(false);
cont.margin(10).add("$changelog").padRight(6f);
@@ -181,11 +181,11 @@ public class SWorkshop implements SteamUGCCallback{
dialog.setFillParent(false);
dialog.cont.add("$publish.confirm").width(600f).wrap();
dialog.addCloseButton();
dialog.buttons.addImageTextButton("$eula", Icon.linkSmall,
dialog.buttons.addImageTextButton("$eula", Icon.link,
() -> SVars.net.friends.activateGameOverlayToWebPage("https://steamcommunity.com/sharedfiles/workshoplegalagreement"))
.size(210f, 64f);
dialog.buttons.addImageTextButton("$ok", Icon.checkSmall, () -> {
dialog.buttons.addImageTextButton("$ok", Icon.ok, () -> {
Log.info("Accepted, publishing item...");
itemHandlers.add(published);
ugc.createItem(SVars.steamID, WorkshopFileType.Community);