diff --git a/build.py b/build.py index ed9ff094..9895976d 100644 --- a/build.py +++ b/build.py @@ -3,7 +3,7 @@ from optparse import OptionParser import subprocess, shlex -mc_ver ="1.6.4" +mc_ver ="1.7.10" try: WindowsError diff --git a/create_install.bat b/create_install.bat new file mode 100644 index 00000000..974e2723 --- /dev/null +++ b/create_install.bat @@ -0,0 +1,4 @@ +@echo off +REM.\mcp\runtime\bin\python\python_mcp create_install.py +python create_install.py +pause \ No newline at end of file diff --git a/create_install.py b/create_install.py new file mode 100644 index 00000000..65e5cef9 --- /dev/null +++ b/create_install.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python +from build import create_install +create_install("mcp908") diff --git a/create_install.sh b/create_install.sh index 2d981cbc..593c615c 100755 --- a/create_install.sh +++ b/create_install.sh @@ -1,3 +1,2 @@ -#!/usr/bin/env python -from build import create_install -create_install("mcp811") +#!/bin/bash +python create_install.py $@ diff --git a/installer/1.7.10-forge-nohydra.json b/installer/1.7.10-forge-nohydra.json new file mode 100644 index 00000000..ca388ce1 --- /dev/null +++ b/installer/1.7.10-forge-nohydra.json @@ -0,0 +1,349 @@ +{ + "id": "1.7.10-minecrift-$VERSION", + "time": "2014-05-14T18:29:23+01:00", + "releaseTime": "2014-05-14T18:29:23+01:00", + "type": "release", + "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker", + "libraries": [ + { + "name": "optifine:OptiFine:1.7.10_HD_U_A4" + }, + { + "name": "net.minecraftforge:forge:1.7.10-10.13.0.1180", + "url": "http://files.minecraftforge.net/maven/" + }, + { + "name": "net.minecraft:launchwrapper:1.9", + "serverreq": true + }, + { + "name": "org.ow2.asm:asm-all:4.1", + "serverreq": true + }, + { + "name": "com.typesafe.akka:akka-actor_2.11:2.3.3", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", + "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "com.typesafe:config:1.2.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", + "7d7bc36df0989d72f2d5d057309675777acc528b" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", + "8c9aaeeb68487ca519411a14068e1b4d69739207" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-compiler:2.11.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "56ea2e6c025e0821f28d73ca271218b8dd04926a", + "1444992390544ba3780867a13ff696a89d7d1639" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "87213338cd5a153a7712cb574c0ddd2edfee0386", + "0b4c1bf8d48993f138d6e10c0c144e50acfff581" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "1f7371605d4ba42aa26d3443440c0083c587b4e9", + "1ea655dda4504ae0a367327e2340cd3beaee6c73" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-library:2.11.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "0e11da23da3eabab9f4777b9220e60d44c1aab6a", + "1e4df76e835201c6eabd43adca89ab11f225f134" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", + "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-reflect:2.11.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "6580347e61cc7f8e802941e7fde40fa83b8badeb", + "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-swing_2.11:1.0.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", + "d77152691dcf5bbdb00529af37aa7d3d887b3e63" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-xml_2.11:1.0.2", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", + "62736b01689d56b6d09a0164b7ef9da2b0b9633d" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "net.sf.jopt-simple:jopt-simple:4.5", + "serverreq": true + }, + { + "name": "lzma:lzma:0.0.1", + "serverreq": true + }, + { + "name": "com.mojang:realms:1.3.1" + }, + { + "name": "org.apache.commons:commons-compress:1.8.1" + }, + { + "name": "org.apache.httpcomponents:httpclient:4.3.3" + }, + { + "name": "commons-logging:commons-logging:1.1.3" + }, + { + "name": "org.apache.httpcomponents:httpcore:4.3.2" + }, + { + "name": "java3d:vecmath:1.3.1" + }, + { + "name": "net.sf.trove4j:trove4j:3.0.3" + }, + { + "name": "com.ibm.icu:icu4j-core-mojang:51.2" + }, + { + "name": "com.paulscode:codecjorbis:20101023" + }, + { + "name": "com.paulscode:codecwav:20101023" + }, + { + "name": "com.paulscode:libraryjavasound:20101123" + }, + { + "name": "com.paulscode:librarylwjglopenal:20100824" + }, + { + "name": "com.paulscode:soundsystem:20120107" + }, + { + "name": "io.netty:netty-all:4.0.10.Final" + }, + { + "name": "com.google.guava:guava:16.0" + }, + { + "name": "org.apache.commons:commons-lang3:3.2.1" + }, + { + "name": "commons-io:commons-io:2.4" + }, + { + "name": "commons-codec:commons-codec:1.9" + }, + { + "name": "net.java.jinput:jinput:2.0.5" + }, + { + "name": "net.java.jutils:jutils:1.0.0" + }, + { + "name": "com.google.code.gson:gson:2.2.4" + }, + { + "name": "com.mojang:authlib:1.5.16" + }, + { + "name": "org.apache.logging.log4j:log4j-api:2.0-beta9" + }, + { + "name": "org.apache.logging.log4j:log4j-core:2.0-beta9" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl:2.9.1" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1" + }, + { + "name": "de.fruitfly.ovr:JRift:0.3.2.1", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "com.sixense:SixenseJava:062612.1", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "net.aib42.mumblelink:JMumble:1.0", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "net.java.jinput:jinput-platform:2.0.5", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "tv.twitch:twitch:5.16" + }, + { + "name": "tv.twitch:twitch-platform:5.16", + "rules": [ + { + "action": "allow" + }, + { + "action": "disallow", + "os": { + "name": "linux" + } + } + ], + "natives": { + "linux": "natives-linux", + "windows": "natives-windows-${arch}", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "tv.twitch:twitch-external-platform:4.5", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows" + } + } + ], + "natives": { + "windows": "natives-windows-${arch}" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "de.fruitfly.ovr:JRiftLibrary:0.3.2.1", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "net.aib42.mumblelink:JMumbleLibrary:1.1", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "com.sixense:SixenseJavaLibrary:062612.0", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + } + ], + "mainClass": "net.minecraft.launchwrapper.Launch", + "minimumLauncherVersion": 13, + "assets": "1.7.10" +} diff --git a/installer/1.7.10-forge.json b/installer/1.7.10-forge.json new file mode 100644 index 00000000..62cb95c5 --- /dev/null +++ b/installer/1.7.10-forge.json @@ -0,0 +1,331 @@ +{ + "id": "1.7.10-minecrift-$VERSION", + "time": "2014-05-14T18:29:23+01:00", + "releaseTime": "2014-05-14T18:29:23+01:00", + "type": "release", + "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker", + "libraries": [ + { + "name": "optifine:OptiFine:1.7.10_HD_U_A4" + }, + { + "name": "net.minecraftforge:forge:1.7.10-10.13.0.1180", + "url": "http://files.minecraftforge.net/maven/" + }, + { + "name": "net.minecraft:launchwrapper:1.9", + "serverreq": true + }, + { + "name": "org.ow2.asm:asm-all:4.1", + "serverreq": true + }, + { + "name": "com.typesafe.akka:akka-actor_2.11:2.3.3", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", + "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "com.typesafe:config:1.2.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", + "7d7bc36df0989d72f2d5d057309675777acc528b" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", + "8c9aaeeb68487ca519411a14068e1b4d69739207" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-compiler:2.11.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "56ea2e6c025e0821f28d73ca271218b8dd04926a", + "1444992390544ba3780867a13ff696a89d7d1639" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "87213338cd5a153a7712cb574c0ddd2edfee0386", + "0b4c1bf8d48993f138d6e10c0c144e50acfff581" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "1f7371605d4ba42aa26d3443440c0083c587b4e9", + "1ea655dda4504ae0a367327e2340cd3beaee6c73" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-library:2.11.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "0e11da23da3eabab9f4777b9220e60d44c1aab6a", + "1e4df76e835201c6eabd43adca89ab11f225f134" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", + "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-reflect:2.11.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "6580347e61cc7f8e802941e7fde40fa83b8badeb", + "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-swing_2.11:1.0.1", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", + "d77152691dcf5bbdb00529af37aa7d3d887b3e63" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "org.scala-lang:scala-xml_2.11:1.0.2", + "url": "http://files.minecraftforge.net/maven/", + "checksums": [ + "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", + "62736b01689d56b6d09a0164b7ef9da2b0b9633d" + ], + "serverreq": true, + "clientreq": true + }, + { + "name": "net.sf.jopt-simple:jopt-simple:4.5", + "serverreq": true + }, + { + "name": "lzma:lzma:0.0.1", + "serverreq": true + }, + { + "name": "com.mojang:realms:1.3.1" + }, + { + "name": "org.apache.commons:commons-compress:1.8.1" + }, + { + "name": "org.apache.httpcomponents:httpclient:4.3.3" + }, + { + "name": "commons-logging:commons-logging:1.1.3" + }, + { + "name": "org.apache.httpcomponents:httpcore:4.3.2" + }, + { + "name": "java3d:vecmath:1.3.1" + }, + { + "name": "net.sf.trove4j:trove4j:3.0.3" + }, + { + "name": "com.ibm.icu:icu4j-core-mojang:51.2" + }, + { + "name": "com.paulscode:codecjorbis:20101023" + }, + { + "name": "com.paulscode:codecwav:20101023" + }, + { + "name": "com.paulscode:libraryjavasound:20101123" + }, + { + "name": "com.paulscode:librarylwjglopenal:20100824" + }, + { + "name": "com.paulscode:soundsystem:20120107" + }, + { + "name": "io.netty:netty-all:4.0.10.Final" + }, + { + "name": "com.google.guava:guava:16.0" + }, + { + "name": "org.apache.commons:commons-lang3:3.2.1" + }, + { + "name": "commons-io:commons-io:2.4" + }, + { + "name": "commons-codec:commons-codec:1.9" + }, + { + "name": "net.java.jinput:jinput:2.0.5" + }, + { + "name": "net.java.jutils:jutils:1.0.0" + }, + { + "name": "com.google.code.gson:gson:2.2.4" + }, + { + "name": "com.mojang:authlib:1.5.16" + }, + { + "name": "org.apache.logging.log4j:log4j-api:2.0-beta9" + }, + { + "name": "org.apache.logging.log4j:log4j-core:2.0-beta9" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl:2.9.1" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1" + }, + { + "name": "de.fruitfly.ovr:JRift:0.3.2.1", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "net.aib42.mumblelink:JMumble:1.0", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "net.java.jinput:jinput-platform:2.0.5", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "tv.twitch:twitch:5.16" + }, + { + "name": "tv.twitch:twitch-platform:5.16", + "rules": [ + { + "action": "allow" + }, + { + "action": "disallow", + "os": { + "name": "linux" + } + } + ], + "natives": { + "linux": "natives-linux", + "windows": "natives-windows-${arch}", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "tv.twitch:twitch-external-platform:4.5", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows" + } + } + ], + "natives": { + "windows": "natives-windows-${arch}" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "de.fruitfly.ovr:JRiftLibrary:0.3.2.1", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "net.aib42.mumblelink:JMumbleLibrary:1.1", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + } + ], + "mainClass": "net.minecraft.launchwrapper.Launch", + "minimumLauncherVersion": 13, + "assets": "1.7.10" +} diff --git a/installer/1.7.10-nohydra.json b/installer/1.7.10-nohydra.json new file mode 100644 index 00000000..6573def0 --- /dev/null +++ b/installer/1.7.10-nohydra.json @@ -0,0 +1,207 @@ +{ + "id": "1.7.10-minecrift-$VERSION", + "time": "2014-05-14T18:29:23+01:00", + "releaseTime": "2014-05-14T18:29:23+01:00", + "type": "release", + "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass optifine.OptiFineTweaker", + "libraries": [ + { + "name": "optifine:OptiFine:1.7.10_HD_U_A4" + }, + { + "name": "net.minecraft:launchwrapper:1.7" + }, + { + "name": "com.mojang:realms:1.2.7" + }, + { + "name": "org.apache.commons:commons-compress:1.8.1" + }, + { + "name": "org.apache.httpcomponents:httpclient:4.3.3" + }, + { + "name": "commons-logging:commons-logging:1.1.3" + }, + { + "name": "org.apache.httpcomponents:httpcore:4.3.2" + }, + { + "name": "java3d:vecmath:1.3.1" + }, + { + "name": "net.sf.trove4j:trove4j:3.0.3" + }, + { + "name": "com.ibm.icu:icu4j-core-mojang:51.2" + }, + { + "name": "net.sf.jopt-simple:jopt-simple:4.5" + }, + { + "name": "com.paulscode:codecjorbis:20101023" + }, + { + "name": "com.paulscode:codecwav:20101023" + }, + { + "name": "com.paulscode:libraryjavasound:20101123" + }, + { + "name": "com.paulscode:librarylwjglopenal:20100824" + }, + { + "name": "com.paulscode:soundsystem:20120107" + }, + { + "name": "io.netty:netty-all:4.0.10.Final" + }, + { + "name": "com.google.guava:guava:15.0" + }, + { + "name": "org.apache.commons:commons-lang3:3.1" + }, + { + "name": "commons-io:commons-io:2.4" + }, + { + "name": "commons-codec:commons-codec:1.9" + }, + { + "name": "net.java.jinput:jinput:2.0.5" + }, + { + "name": "net.java.jutils:jutils:1.0.0" + }, + { + "name": "com.google.code.gson:gson:2.2.4" + }, + { + "name": "com.mojang:authlib:1.5.13" + }, + { + "name": "org.apache.logging.log4j:log4j-api:2.0-beta9" + }, + { + "name": "org.apache.logging.log4j:log4j-core:2.0-beta9" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl:2.9.1" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1" + }, + { + "name": "de.fruitfly.ovr:JRift:0.3.2.1", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "net.aib42.mumblelink:JMumble:1.0", + "url": "http://repo.minecraft-vr.com/" + }, + { + "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "net.java.jinput:jinput-platform:2.0.5", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "tv.twitch:twitch:5.16" + }, + { + "name": "tv.twitch:twitch-platform:5.16", + "rules": [ + { + "action": "allow" + }, + { + "action": "disallow", + "os": { + "name": "linux" + } + } + ], + "natives": { + "linux": "natives-linux", + "windows": "natives-windows-${arch}", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "tv.twitch:twitch-external-platform:4.5", + "rules": [ + { + "action": "allow", + "os": { + "name": "windows" + } + } + ], + "natives": { + "windows": "natives-windows-${arch}" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "de.fruitfly.ovr:JRiftLibrary:0.3.2.1", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + }, + { + "name": "net.aib42.mumblelink:JMumbleLibrary:1.1", + "url": "http://repo.minecraft-vr.com/", + "natives": { + "linux": "natives-linux", + "windows": "natives-windows", + "osx": "natives-osx" + }, + "extract": { + "exclude": [ + "META-INF/" + ] + } + } + ], + "mainClass": "net.minecraft.launchwrapper.Launch", + "minimumLauncherVersion": 13, + "assets": "1.7.10" +} diff --git a/installer/1.7.10.json b/installer/1.7.10.json index 9759dabf..27a86424 100644 --- a/installer/1.7.10.json +++ b/installer/1.7.10.json @@ -94,15 +94,15 @@ }, { "name": "de.fruitfly.ovr:JRift:0.3.2.1", - "url": "http://repo.minecraft-vr.com/" + "url": "http://repo.minecraft-vr.com/" }, { "name": "com.sixense:SixenseJava:062612.1", - "url": "http://repo.minecraft-vr.com/" + "url": "http://repo.minecraft-vr.com/" }, { "name": "net.aib42.mumblelink:JMumble:1.0", - "url": "http://repo.minecraft-vr.com/" + "url": "http://repo.minecraft-vr.com/" }, { "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1", @@ -178,7 +178,7 @@ }, { "name": "de.fruitfly.ovr:JRiftLibrary:0.3.2.1", - "url": "http://repo.minecraft-vr.com/", + "url": "http://repo.minecraft-vr.com/", "natives": { "linux": "natives-linux", "windows": "natives-windows", @@ -192,7 +192,7 @@ }, { "name": "net.aib42.mumblelink:JMumbleLibrary:1.1", - "url": "http://repo.minecraft-vr.com/", + "url": "http://repo.minecraft-vr.com/", "natives": { "linux": "natives-linux", "windows": "natives-windows", @@ -206,7 +206,7 @@ }, { "name": "com.sixense:SixenseJavaLibrary:062612.0", - "url": "http://repo.minecraft-vr.com/", + "url": "http://repo.minecraft-vr.com/", "natives": { "linux": "natives-linux", "windows": "natives-windows", diff --git a/installer/Installer.java b/installer/Installer.java index 62be8d35..13e24129 100644 --- a/installer/Installer.java +++ b/installer/Installer.java @@ -25,7 +25,7 @@ /** * Derived from https://github.com/MinecraftForge/Installer/ - * Copyright 2013 MinecraftForge developers, Mark Browning, StellaArtois + * Copyright 2013 MinecraftForge developers, & Mark Browning, StellaArtois * * Licensed under GNU LGPL v2.1 or later. * @@ -34,8 +34,9 @@ */ public class Installer extends JPanel implements PropertyChangeListener { private static final long serialVersionUID = -562178983462626162L; - private static final String MC_VERSION = "1.6.4"; - private static final String OF_VERSION = "1.6.4_HD_U_D1"; + private static final String MC_VERSION = "1.7.10"; + private static final String OF_VERSION = "1.7.10_HD_U_A4"; + private static final String FORGE_VERSION = "10.13.0.1180"; private static final String OF_VERSION_EXT = "jar"; private static final String OF_LIB_PATH = "libraries/optifine/OptiFine/"; @@ -121,7 +122,7 @@ private boolean ExtractVersion() { if( jar_id != null ) { InputStream version_json; - if(useForge.isSelected() && forgeVersion.getSelectedItem() != forgeNotFound ) { + if(useForge.isSelected() /*&& forgeVersion.getSelectedItem() != forgeNotFound*/ ) { String filename; if( useHydra.isSelected() ) { filename = "version-forge.json"; @@ -136,7 +137,7 @@ public int read(byte[] buff) throws IOException { int ret = in.read(buff); if( ret > 0 ) { String s = new String( buff,0, ret, "UTF-8"); - s = s.replace("$FORGE_VERSION", (String)forgeVersion.getSelectedItem()); + //s = s.replace("$FORGE_VERSION", (String)forgeVersion.getSelectedItem()); ret = s.length(); System.arraycopy(s.getBytes("UTF-8"), 0, buff, 0, ret); } @@ -460,24 +461,28 @@ public Installer(File targetDir) JPanel forgePanel = new JPanel(); forgePanel.setLayout( new BoxLayout(forgePanel, BoxLayout.X_AXIS)); //Create forge: no/yes buttons - useForge = new JCheckBox("Install with Forge",false); + useForge = new JCheckBox("Install with Forge " + FORGE_VERSION,false); forgeVersion = new JComboBox(); //Add "yes" and "which version" to the forgePanel useForge.setAlignmentX(LEFT_ALIGNMENT); forgeVersion.setAlignmentX(LEFT_ALIGNMENT); forgePanel.add(useForge); - forgePanel.add(forgeVersion); + //forgePanel.add(forgeVersion); useHydra = new JCheckBox("Include Razer Hydra support",false); useHydra.setAlignmentX(LEFT_ALIGNMENT); - useHrtf = new JCheckBox("Setup binaural sound (OpenAL HRTF)", false); - useHrtf.setToolTipText("If checked, the installer will create the configuration file needed for ear-aware sound in Minecraft (and other games).
" + + useHrtf = new JCheckBox("Setup binaural audio", false); + useHrtf.setToolTipText( + "" + + "If checked, the installer will create the configuration file needed for OpenAL HRTF
" + + "ear-aware sound in Minecraft (and other games).
" + " If the file has previously been created, you do not need to check this again.
" + " NOTE: Your sound card's output MUST be set to 44.1Khz.
" + " WARNING, will overwrite " + (isWindows ? (appDataDir + "\\alsoft.ini") : (userHomeDir + "/.alsoftrc")) + "!
" + - " Delete the " + (isWindows ? "alsoft.ini" : "alsoftrc") + " file to disable HRTF again."); + " Delete the " + (isWindows ? "alsoft.ini" : "alsoftrc") + " file to disable HRTF again." + + ""); useHrtf.setAlignmentX(LEFT_ALIGNMENT); //Add option panels option panel diff --git a/installer/installer.ipr b/installer/installer.ipr new file mode 100644 index 00000000..2c5ef23c --- /dev/null +++ b/installer/installer.ipr @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/installer/installer.iws b/installer/installer.iws new file mode 100644 index 00000000..f8af720b --- /dev/null +++ b/installer/installer.iws @@ -0,0 +1,427 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + 1405942810236 + 1405942810236 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.6 + + + + + + + + installer + + + + + + + + + + + + + + + + diff --git a/installer/installer.jar b/installer/installer.jar index 49cafee4..25615b5e 100644 Binary files a/installer/installer.jar and b/installer/installer.jar differ