From 7dd0f5d0f64f2fd5695e819172f6d22c619fea80 Mon Sep 17 00:00:00 2001 From: jrbudda Date: Sun, 9 May 2021 17:46:08 -0400 Subject: [PATCH] installer --- build.py | 2 +- minecriftversion.py | 9 ++++++++- patches/net/minecraft/client/Minecraft.java.patch | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index 52e6f85a..43fd27fd 100644 --- a/build.py +++ b/build.py @@ -126,7 +126,7 @@ def create_install(mcp_dir): # Build installer.java print "Recompiling Installer.java..." subprocess.Popen( - cmdsplit("javac -source 1.6 -target 1.6 \"%s\"" % os.path.join(base_dir,installer_java_file)), + cmdsplit("javac -source 1.8 -target 1.8 \"%s\"" % os.path.join(base_dir,installer_java_file)), cwd=os.path.join(base_dir,"installer"), bufsize=-1).communicate() diff --git a/minecriftversion.py b/minecriftversion.py index e44bccb0..42652753 100644 --- a/minecriftversion.py +++ b/minecriftversion.py @@ -4,9 +4,16 @@ of_json_name = "1.7.10_HD_U_D1" of_file_md5 = "57c724fe8335c82aef8d54c101043e60" minecrift_version_num = "1.7.10" -minecrift_build = "jrbudda-40r10" +minecrift_build = "jrbudda-40r11" of_file_extension = ".jar" mcp_version = "mcp908" mcp_uses_generics = False mcp_download_url = "http://www.modcoderpack.com/files/mcp908.zip" forge_version = "10.13.4.1614-1.7.10" +allow_forge = True +forge_default = True +allow_katvr = False +allow_kiosk = False +allow_zgc = False +allow_hrtf = True +allow_remove_hrtf = False diff --git a/patches/net/minecraft/client/Minecraft.java.patch b/patches/net/minecraft/client/Minecraft.java.patch index 4bbe89e7..c0910301 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-40r10"; ++ public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-40r11"; + private boolean trigger; + /* end version */ + /** END MINECRIFT */