From 975221f4ccf337a1d70d15a9da7d3d8ff3ec1104 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Thu, 26 Mar 2020 16:53:34 +0100
Subject: [PATCH] Revert "Revert "Revert "Revert "Revert "Repurpose branch to
 be played"""""

This reverts commit 164dd0c4051293954c6bf9643972b987ba21a9b8.
---
 core/src/mindustry/Vars.java                  |  2 --
 core/src/mindustry/ui/dialogs/JoinDialog.java |  2 +-
 servers_crater.json                           |  5 ---
 tools/crater-deploy.sh                        | 35 -------------------
 4 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 servers_crater.json
 delete mode 100755 tools/crater-deploy.sh

diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index 58bdefbfe1..ab88d572bf 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -59,8 +59,6 @@ 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.*/
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index d207fd4180..2e62161957 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -427,7 +427,7 @@ public class JoinDialog extends FloatingDialog{
         servers = Core.settings.getObject("server-list", Array.class, Array::new);
 
         //get servers
-        Core.net.httpGet(serverJsonCraterURL, result -> {
+        Core.net.httpGet(becontrol.active() ? serverJsonBeURL : serverJsonURL, result -> {
             try{
                 Jval val = Jval.read(result.getResultAsString());
                 Core.app.post(() -> {
diff --git a/servers_crater.json b/servers_crater.json
deleted file mode 100644
index 32faccac11..0000000000
--- a/servers_crater.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  {
-    "address": "mindustry.nydus.app:6565"
-  }
-]
diff --git a/tools/crater-deploy.sh b/tools/crater-deploy.sh
deleted file mode 100755
index c4de2af784..0000000000
--- a/tools/crater-deploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-# use the amount of commits behind master as a version number
-behind=$(git rev-list --right-only --count master...crater) # https://stackoverflow.com/a/27940027/6056864
-
-# configure some android values
-echo "sdk.dir=/Users/quezler/Library/Android/sdk" > local.properties
-sed -i'.original' 's/applicationId "io.anuke.mindustry"/applicationId "io.anuke.mindustry.craters"/g' android/build.gradle
-sed -i'.original' 's/"io.anuke.mindustry"/"io.anuke.mindustry.craters"/g' android/AndroidManifest.xml
-sed -i'.original' 's/Mindustry</Mindustry Craters</g' android/res/values/strings.xml
-
-# delete sed backup files
-rm android/build.gradle.original
-rm android/AndroidManifest.xml.original
-rm android/res/values/strings.xml.original
-
-# build the 3 releases
-./gradlew desktop:dist -Pbuildversion=$behind -PversionType=craters
-./gradlew server:dist -Pbuildversion=$behind -PversionType=craters
-./gradlew android:assembleDebug -Pbuildversion=$behind -PversionType=craters
-
-# reset the android files to default
-git checkout -- "android/build.gradle"
-git checkout -- "android/AndroidManifest.xml"
-git checkout -- "android/res/values/strings.xml"
-
-# rename the output
-mkdir ./.gradle/craters
-mv desktop/build/libs/Mindustry.jar ./.gradle/craters/Mindustry-Craters-Desktop-${behind}.jar
-mv server/build/libs/server-release.jar ./.gradle/craters/Mindustry-Craters-Server-${behind}.jar
-mv android/build/outputs/apk/debug/android-debug.apk ./.gradle/craters/Mindustry-Craters-Android-${behind}.apk
-
-# upload to (web)server
-scp -r ./.gradle/craters root@mindustry.nydus.app:/var/www/html
-scp ./.gradle/craters/Mindustry-Craters-Server-${behind}.jar root@mindustry.nydus.app:/root/crater/Mindustry-Craters-Server.jar