TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 09:07:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add an ability to sync to multiple version repositories (not accessible to the user)

Browse Source
This commit is contained in:
artdeell 2021-02-20 14:49:27 +03:00
parent 6957bcff4a
commit 8e3d35290d
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
View File

@ -23,6 +23,7 @@ public class LauncherPreferences
public static String PREF_CUSTOM_JAVA_ARGS; public static String PREF_CUSTOM_JAVA_ARGS;
public static String PREF_CUSTOM_OPENGL_LIBNAME = "libgl4es_114.so"; public static String PREF_CUSTOM_OPENGL_LIBNAME = "libgl4es_114.so";
public static String PREF_LANGUAGE = "default"; public static String PREF_LANGUAGE = "default";
public static String PREF_VERSION_REPOS = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json";
public static boolean PREF_CHECK_LIBRARY_SHA = true; public static boolean PREF_CHECK_LIBRARY_SHA = true;
public static boolean PREF_DISABLE_GESTURES = false; public static boolean PREF_DISABLE_GESTURES = false;
public static void loadPreferences() { public static void loadPreferences() {

23
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java
View File

@ -4,6 +4,8 @@ import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.*; import android.os.*;
import androidx.appcompat.widget.*; import androidx.appcompat.widget.*;
import android.util.Log;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import android.widget.AdapterView.*; import android.widget.AdapterView.*;
@ -20,7 +22,6 @@ import androidx.appcompat.widget.PopupMenu;
public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<String>> public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<String>>
{ {
private BaseLauncherActivity mActivity; private BaseLauncherActivity mActivity;
public RefreshVersionListTask(BaseLauncherActivity activity) { public RefreshVersionListTask(BaseLauncherActivity activity) {
mActivity = activity; mActivity = activity;
} }
@ -29,7 +30,21 @@ public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<Stri
protected ArrayList<String> doInBackground(Void[] p1) protected ArrayList<String> doInBackground(Void[] p1)
{ {
try { try {
mActivity.mVersionList = Tools.GLOBAL_GSON.fromJson(DownloadUtils.downloadString("https://launchermeta.mojang.com/mc/game/version_manifest_v2.json"), JMinecraftVersionList.class); //mActivity.mVersionList = Tools.GLOBAL_GSON.fromJson(DownloadUtils.downloadString(""), JMinecraftVersionList.class);
{
ArrayList<JMinecraftVersionList.Version> versions = new ArrayList<>();
String[] repositories = LauncherPreferences.PREF_VERSION_REPOS.split(";");
for (String url : repositories) {
JMinecraftVersionList list;
Log.i("ExtVL", "Syncing to external: " + url);
list = Tools.GLOBAL_GSON.fromJson(DownloadUtils.downloadString(url), JMinecraftVersionList.class);
Log.i("ExtVL","Downloaded the version list, len="+list.versions.length);
Collections.addAll(versions,list.versions);
}
mActivity.mVersionList = new JMinecraftVersionList();
mActivity.mVersionList.versions = versions.toArray(new JMinecraftVersionList.Version[versions.size()]);
Log.i("ExtVL","Final list size: " + mActivity.mVersionList.versions.length);
}
ArrayList<String> versionStringList = filter(mActivity.mVersionList.versions, new File(Tools.DIR_HOME_VERSION).listFiles()); ArrayList<String> versionStringList = filter(mActivity.mVersionList.versions, new File(Tools.DIR_HOME_VERSION).listFiles());
return versionStringList; return versionStringList;
@ -43,7 +58,6 @@ public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<Stri
protected void onPostExecute(ArrayList<String> result) protected void onPostExecute(ArrayList<String> result)
{ {
super.onPostExecute(result); super.onPostExecute(result);
final PopupMenu popup = new PopupMenu(mActivity, mActivity.mVersionSelector); final PopupMenu popup = new PopupMenu(mActivity, mActivity.mVersionSelector);
popup.getMenuInflater().inflate(R.menu.menu_versionopt, popup.getMenu()); popup.getMenuInflater().inflate(R.menu.menu_versionopt, popup.getMenu());
@ -153,7 +167,8 @@ public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<Stri
if ((value1.type.equals("release") && LauncherPreferences.PREF_VERTYPE_RELEASE) || if ((value1.type.equals("release") && LauncherPreferences.PREF_VERTYPE_RELEASE) ||
(value1.type.equals("snapshot") && LauncherPreferences.PREF_VERTYPE_SNAPSHOT) || (value1.type.equals("snapshot") && LauncherPreferences.PREF_VERTYPE_SNAPSHOT) ||
(value1.type.equals("old_alpha") && LauncherPreferences.PREF_VERTYPE_OLDALPHA) || (value1.type.equals("old_alpha") && LauncherPreferences.PREF_VERTYPE_OLDALPHA) ||
(value1.type.equals("old_beta") && LauncherPreferences.PREF_VERTYPE_OLDBETA)) { (value1.type.equals("old_beta") && LauncherPreferences.PREF_VERTYPE_OLDBETA) ||
(value1.type.equals("modified"))) {
output.add(value1.id); output.add(value1.id);
} }
} }