mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-12 10:59:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Revert "Revert "Repurpose branch to be played""""

Browse Source 
This reverts commit 8caa9ed548.
This commit is contained in:
Patrick 'Quezler' Mounier 2020-03-16 09:15:44 +01:00
parent 8caa9ed548
commit 164dd0c405
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
4 changed files with 43 additions and 1 deletions
Show Stats 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"; 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. */ /** 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"; 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.*/ /** URL of the github issue report template.*/
public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?template=bug_report.md"; public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?template=bug_report.md";
/** list of built-in servers.*/ /** list of built-in servers.*/

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

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

5
servers_crater.json Normal file
View File

@ -0,0 +1,5 @@
[
{
"address": "mindustry.nydus.app:6565"
}
]

35
tools/crater-deploy.sh Executable file
View File

@ -0,0 +1,35 @@
#!/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