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

Repurpose branch to be played

Browse Source 
When anuke shows more interest in this branch the changes that stem from this can be reversed and squashed, but people want to play it, and keeping 2 crater related branches in sync is frankly a pain 😗
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-28 14:31:32 +01:00
parent 445126ea65
commit ff578c8540
4 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/Vars.java
View File

@@ -59,6 +59,8 @@ public class Vars implements Loadable{
public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json";
/** URL to the JSON file containing all the BE servers. Only queried in BE. */
public static final String serverJsonBeURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
/** URL to the JSON file containing all the crater servers. */
public static final String serverJsonCraterURL = "https://raw.githubusercontent.com/Quezler/Mindustry/craters/servers_crater.json";
/** URL of the github issue report template.*/
public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?template=bug_report.md";
/** list of built-in servers.*/

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

@@ -376,7 +376,7 @@ public class JoinDialog extends FloatingDialog{
servers = Core.settings.getObject("server-list", Array.class, Array::new);
//get servers
Core.net.httpGet(becontrol.active() ? serverJsonBeURL : serverJsonURL, result -> {
Core.net.httpGet(serverJsonCraterURL, result -> {
try{
Jval val = Jval.read(result.getResultAsString());
Core.app.post(() -> {