Merge branch 'PojavLauncherTeam:v3_openjdk' into v3_zink_freedreno

SolDev69 · Aug 19, 2023 · 432c6ea · 432c6ea
2 parents 2bc32ff + c2c57ca
commit 432c6ea
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/app_pojavlauncher/src/main/assets/launcher_profiles.json b/app_pojavlauncher/src/main/assets/launcher_profiles.json
@@ -2,7 +2,7 @@
   "profiles": {
     "(Default)": {
       "name": "(Default)",
-      "lastVersionId": "Unknown"
+      "lastVersionId": "1.7.10"
     }
   },
   "selectedProfile": "(Default)"

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java
@@ -84,9 +84,12 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         });
 
         mDeleteButton.setOnClickListener(v -> {
-            LauncherProfiles.mainProfileJson.profiles.remove(mProfileKey);
-            LauncherProfiles.update();
-            ExtraCore.setValue(ExtraConstants.REFRESH_VERSION_SPINNER, DELETED_PROFILE);
+            if(LauncherProfiles.mainProfileJson.profiles.size() > 1){
+                LauncherProfiles.mainProfileJson.profiles.remove(mProfileKey);
+                LauncherProfiles.update();
+                ExtraCore.setValue(ExtraConstants.REFRESH_VERSION_SPINNER, DELETED_PROFILE);
+            }
+
             Tools.removeCurrentFragment(requireActivity());
         });
 

diff --git a/...avlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java b/...avlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java
@@ -28,6 +28,12 @@ else if(LauncherProfiles.normalizeProfileIds(mainProfileJson)){
                     mainProfileJson = new MinecraftLauncherProfiles();
                     mainProfileJson.profiles = new HashMap<>();
                 }
+
+                // Make sure we have a default profile on start
+                if (mainProfileJson.profiles.size() == 0){
+                    mainProfileJson.profiles.put("(Default)", MinecraftProfile.getDefaultProfile());
+                    LauncherProfiles.update();
+                }
             } else {
                 Tools.write(launcherProfilesFile.getAbsolutePath(), mainProfileJson.toJson());
             }

diff --git a/...avlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java b/...avlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java
@@ -28,6 +28,13 @@ public static MinecraftProfile createTemplate(){
 		return TEMPLATE;
 	}
 
+	public static MinecraftProfile getDefaultProfile(){
+		MinecraftProfile defaultProfile = new MinecraftProfile();
+		defaultProfile.name = "Default";
+		defaultProfile.lastVersionId = "1.7.10";
+		return defaultProfile;
+	}
+
 	public MinecraftProfile(){}
 
 	public MinecraftProfile(MinecraftProfile profile){