Skip to content

Commit

Permalink
ms store
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbudda committed Nov 11, 2021
1 parent 7dd0f5d commit 081c399
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions installer/Installer.java
Original file line number Diff line number Diff line change
Expand Up @@ -740,8 +740,9 @@ public Void doInBackground()
monitor.setProgress(95);
monitor.setNote("Creating Vivecraft profile...");

if (!updateLauncherJson(targetDir, minecriftVersionName, profileName))
sbErrors.append("Failed to set up 'Vivecraft' profile (you can still manually select Edit Profile->Use Version " + minecriftVersionName + " in the Minecraft launcher)\n");
if (!updateLauncherJson(targetDir, minecriftVersionName, profileName, "launcher_profiles.json" )
& (!updateLauncherJson(targetDir, minecriftVersionName, profileName, "launcher_profiles_microsoft_store.json")))
sbErrors.append("Failed to set up 'Vivecraft' profile (you can still manually select Edit Profile->Use Version " + minecriftVersionName + " in the Minecraft launcher)\n");
else
profileCreated = true;
}
Expand Down Expand Up @@ -1358,13 +1359,13 @@ private void sleep(int millis)
} catch (InterruptedException e) {}
}

private boolean updateLauncherJson(File mcBaseDirFile, String minecriftVer, String profileName)
private boolean updateLauncherJson(File mcBaseDirFile, String minecriftVer, String profileName, String profile)
{
boolean result = false;

try {
int jsonIndentSpaces = 2;
File fileJson = new File(mcBaseDirFile, "launcher_profiles.json");
File fileJson = new File(mcBaseDirFile, profile);
String json = readAsciiFile(fileJson);
JSONObject root = new JSONObject(json);
//System.out.println(root.toString(jsonIndentSpaces));
Expand Down
2 changes: 1 addition & 1 deletion minecriftversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
of_json_name = "1.7.10_HD_U_D1"
of_file_md5 = "57c724fe8335c82aef8d54c101043e60"
minecrift_version_num = "1.7.10"
minecrift_build = "jrbudda-40r11"
minecrift_build = "jrbudda-40r12"
of_file_extension = ".jar"
mcp_version = "mcp908"
mcp_uses_generics = False
Expand Down
2 changes: 1 addition & 1 deletion patches/net/minecraft/client/Minecraft.java.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@
+ * The minecriftVerString will be automatically updated by the build scripts, do not modify here.
+ * Modify minecriftversion.py in root minecrift dir.
+ */
+ public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-40r11";
+ public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-40r12";
+ private boolean trigger;
+ /* end version */
+ /** END MINECRIFT */
Expand Down

0 comments on commit 081c399

Please sign in to comment.