From 081c39921be750f7d9ca27fd4c31f8a4231b754f Mon Sep 17 00:00:00 2001 From: jrbudda Date: Thu, 11 Nov 2021 18:24:33 -0500 Subject: [PATCH] ms store --- installer/Installer.java | 9 +++++---- minecriftversion.py | 2 +- patches/net/minecraft/client/Minecraft.java.patch | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/installer/Installer.java b/installer/Installer.java index d7c865dd..df29100f 100644 --- a/installer/Installer.java +++ b/installer/Installer.java @@ -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; } @@ -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)); diff --git a/minecriftversion.py b/minecriftversion.py index 42652753..3adc125c 100644 --- a/minecriftversion.py +++ b/minecriftversion.py @@ -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 diff --git a/patches/net/minecraft/client/Minecraft.java.patch b/patches/net/minecraft/client/Minecraft.java.patch index c0910301..d44cb011 100644 --- a/patches/net/minecraft/client/Minecraft.java.patch +++ b/patches/net/minecraft/client/Minecraft.java.patch @@ -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 */