Remove StringCRC64 since its now useless

Move all ExtraCore constants into a separate class
QuestCraftPlusPlus · Mar 20, 2022 · 05cf75e · 05cf75e
1 parent 19037b8
commit 05cf75e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 73 deletions.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
@@ -20,6 +20,7 @@
 import net.kdt.pojavlaunch.multirt.MultiRTConfigDialog;
 import net.kdt.pojavlaunch.multirt.MultiRTUtils;
 import net.kdt.pojavlaunch.prefs.*;
+import net.kdt.pojavlaunch.profiles.ProfileConstants;
 import net.kdt.pojavlaunch.tasks.*;
 
 import androidx.appcompat.app.AlertDialog;
@@ -133,7 +134,7 @@ public void launchGame(View v) {
     }
 
     public static String getVersionId(String input) {
-        Map<String,String> lReleaseMaps = (Map<String,String>)ExtraCore.getValue("release_table");
+        Map<String,String> lReleaseMaps = (Map<String,String>)ExtraCore.getValue(ProfileConstants.RELEASE_TABLE);
         if(lReleaseMaps == null || lReleaseMaps.isEmpty()) return input;
         switch(input) {
             case "latest-release":

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -39,6 +39,7 @@
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
 import net.kdt.pojavlaunch.prefs.screens.LauncherPreferenceFragment;
 import net.kdt.pojavlaunch.profiles.ProfileAdapter;
+import net.kdt.pojavlaunch.profiles.ProfileConstants;
 import net.kdt.pojavlaunch.profiles.ProfileEditor;
 import net.kdt.pojavlaunch.profiles.ProfileIconCache;
 import net.kdt.pojavlaunch.value.MinecraftAccount;
@@ -273,7 +274,7 @@ public static void setupBasicList(Context ctx) {
 
         } finally {
             basicVersionList = versions.toArray(new String[0]);
-            ExtraCore.setValue("lac_version_list",versions);
+            ExtraCore.setValue(ProfileConstants.VERSION_LIST,versions);
         }
     }
     private void pickAccount() {

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileConstants.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileConstants.java
@@ -0,0 +1,9 @@
+package net.kdt.pojavlaunch.profiles;
+
+public class ProfileConstants {
+    /* ExtraCore constant: a HashMap for converting values such as latest-snapshot or latest-release to actual game version names */
+    public static final String RELEASE_TABLE = "release_table";
+    /* ExtraCore constant: an ArrayList of Strings, where each String is a Minecraft version name */
+    public static final String VERSION_LIST= "lac_version_list";
+
+}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileEditor.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileEditor.java
@@ -114,7 +114,7 @@ public boolean show(@NonNull String profile) {
         }
         javaRuntimeSpinner.setSelection(jvmIndex);
         rendererSpinner.setSelection(rendererIndex);
-        ExtraCore.addExtraListener("lac_version_list",this);
+        ExtraCore.addExtraListener(ProfileConstants.VERSION_LIST,this);
         profileNameView.setText(minecraftProfile.name);
         Bitmap profileIcon = ProfileIconCache.getCachedIcon(profile);
         if(profileIcon == null) {
@@ -124,7 +124,7 @@ public boolean show(@NonNull String profile) {
         if(minecraftProfile.lastVersionId != null && !"latest-release".equals(minecraftProfile.lastVersionId) && !"latest-snapshot".equals(minecraftProfile.lastVersionId))
             selectedVersionId = minecraftProfile.lastVersionId;
         else if(minecraftProfile.lastVersionId != null) {
-            Map<String,String> releaseTable = (Map<String,String>)ExtraCore.getValue("release_table");
+            Map<String,String> releaseTable = (Map<String,String>)ExtraCore.getValue(ProfileConstants.RELEASE_TABLE);
             if(releaseTable != null) {
             switch (minecraftProfile.lastVersionId) {
                 case "latest-release":
@@ -141,7 +141,7 @@ else if(minecraftProfile.lastVersionId != null) {
                 selectedVersionId = PojavLauncherActivity.basicVersionList[0];
             }
         }
-        ArrayList<String> versions = (ArrayList<String>) ExtraCore.getValue("lac_version_list");
+        ArrayList<String> versions = (ArrayList<String>) ExtraCore.getValue(ProfileConstants.VERSION_LIST);
         BaseLauncherActivity.updateVersionSpinner(context,versions,versionSpinner, selectedVersionId);
         dialog.show();
         return true;
@@ -180,7 +180,7 @@ public void save(DialogInterface dialog, int which) {
         destroy(dialog);
     }
     public void destroy(@NonNull DialogInterface dialog) {
-        ExtraCore.removeExtraListenerFromValue("lac_version_list",this);
+        ExtraCore.removeExtraListenerFromValue(ProfileConstants.VERSION_LIST,this);
         editingProfile = null;
         selectedVersionId = null;
     }

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/StringCRC64.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/StringCRC64.java
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java
@@ -18,6 +18,7 @@
 import net.kdt.pojavlaunch.multirt.MultiRTUtils;
 import net.kdt.pojavlaunch.multirt.RTSpinnerAdapter;
 import net.kdt.pojavlaunch.prefs.*;
+import net.kdt.pojavlaunch.profiles.ProfileConstants;
 import net.kdt.pojavlaunch.utils.*;
 import net.kdt.pojavlaunch.value.PerVersionConfig;
 
@@ -43,8 +44,8 @@ protected ArrayList<String> doInBackground(Void[] p1)
                     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);
-                    if(list.latest != null && ExtraCore.getValue("release_table") == null)
-                        ExtraCore.setValue("release_table",list.latest);
+                    if(list.latest != null && ExtraCore.getValue(ProfileConstants.RELEASE_TABLE) == null)
+                        ExtraCore.setValue(ProfileConstants.RELEASE_TABLE,list.latest);
                     Collections.addAll(versions,list.versions);
                 }
                 mActivity.mVersionList = new JMinecraftVersionList();
@@ -64,7 +65,7 @@ protected ArrayList<String> doInBackground(Void[] p1)
     protected void onPostExecute(ArrayList<String> result)
     {
         super.onPostExecute(result);
-        ExtraCore.setValue("lac_version_list",result);
+        ExtraCore.setValue(ProfileConstants.VERSION_LIST,result);
     }
 
     private ArrayList<String> filter(JMinecraftVersionList.Version[] list1, File[] list2) {