Skip to content

Commit

Permalink
First pass support for 1.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
StellaArtois committed Oct 25, 2013
1 parent 2a64052 commit 8556988
Show file tree
Hide file tree
Showing 50 changed files with 3,859 additions and 2,737 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ releases/
*.class
*install*.jar
*install*.exe
patches/Start.java.patch
21 changes: 10 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Minecrift Mod for Minecraft
===========================

Current Version: 1.1 beta
Current Version: Minecrift 1.6.4

StellaArtois, mabrowning 2013

Expand All @@ -13,8 +13,8 @@ With thanks to:
- The team behind the MCP coders' pack, and the Minecraft community - why
Mojang bother obfuscating the source when you guys have done such a fantastic
job of de-obfuscating it is beyond me!
- Powback for his initial work on the Java JNI wrapper to the SDK. Seeing this
inspired me to get off my arse and get modding. See
- Powback for his initial work on the Java JNI wrapper to the Oculus SDK. Seeing
this inspired me to get off my arse and get modding. See
[this Reddit thread](http://www.reddit.com/r/oculus/comments/1c1vh0/java_wrapper_for_devs/)
- shakesoda and Ben (and others?) at MTBS for creating the GLSL version of the
Oculus distortion shader.
Expand Down Expand Up @@ -52,14 +52,14 @@ Click the button below to go to our Jenkins page where you can download the
latest build hot-off-the-presses.

[![Powered By CloudBees](http://www.cloudbees.com/sites/default/files/Button-Powered-by-CB.png)
](https://minecraftvr.ci.cloudbees.com/job/minecrift-1.6.2/)
](https://minecraftvr.ci.cloudbees.com/job/minecrift-1.6.4/lastSuccessfulBuild/artifact/)

---

Installation
------------

Download and run the latest minecrift-1.6.2-b###-installer.exe/jar.
Download and run the latest minecrift-1.6.4-b###-installer.exe/jar.
*WINDOWS USERS: IMPORTANT* (but only required once). Install the Microsoft
VS2010 C++ redists (both x86 and x64) from
[here](http://www.microsoft.com/en-us/download/details.aspx?id=5555)
Expand Down Expand Up @@ -152,7 +152,6 @@ Here are some other hotkeys that allow quick access to changing VR settings.
Known Issues
------------

FSAA (Super Sampling) doesn't work on OSX and is disabled.
There are quite a small bugs that can be seen on the [GitHub issue
tracker](https://github.com/mabrowning/minecrift/issues)

Expand Down Expand Up @@ -191,14 +190,14 @@ Linux, but was written with cross-platform support in mind, so should be usable
Run install.sh (or install.bat) to download mcp, minecraft, Optifine, and other
libraries; deobfuscate the base system, and apply the patches and new files.

Use the MCP environment in /mcp804 to modify, test, and recompile. If you use
the built-in eclipse workspace, you'll need to add the JRift and SixenseJava
jars, located in the jars/libraries/ directory. JRift is in de/fruitfly/ovr and
SixenseJava is in com/sixense.
Use the MCP environment in /mcpxxx to modify, test, and recompile. If you use
the built-in eclipse workspace, you'll need to add the JRift, SixenseJava and
JMumble jars, located in the jars/libraries/ directory. JRift is in de/fruitfly/ovr
and SixenseJava is in com/sixense.

Run build.sh (or build.bat) to create a release installer.

Run getchanges.sh (or getchanges.bat) to diff the modified /mcp804/src files into
Run getchanges.sh (or getchanges.bat) to diff the modified /mcpxxx/src files into
version controlled /patches and copy the new classes into the /src/
directory.

Expand Down
3 changes: 2 additions & 1 deletion applychanges.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@echo off

.\mcp\runtime\bin\python\python_mcp applychanges.py
REM.\mcp\runtime\bin\python\python_mcp applychanges.py
python applychanges.py

pause
2 changes: 1 addition & 1 deletion applychanges.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ def applychanges(mcp_dir):
elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')):
applychanges(os.path.abspath('..'))
else:
applychanges(os.path.abspath('mcp804'))
applychanges(os.path.abspath('mcp811'))
4 changes: 3 additions & 1 deletion build.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@echo off
.\mcp\runtime\bin\python\python_mcp build.py
REM.\mcp\runtime\bin\python\python_mcp build.py
python build.py

pause
4 changes: 2 additions & 2 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from optparse import OptionParser
import subprocess, shlex

mc_ver ="1.6.2"
mc_ver ="1.6.4"

try:
WindowsError
Expand Down Expand Up @@ -138,4 +138,4 @@ def main(mcp_dir):
elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')):
main(os.path.abspath('..'))
else:
main(os.path.abspath('mcp804'))
main(os.path.abspath('mcp811'))
2 changes: 1 addition & 1 deletion create_install.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env python
from build import create_install
create_install("mcp804")
create_install("mcp811")
3 changes: 2 additions & 1 deletion getchanges.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@echo off
.\mcp\runtime\bin\python\python_mcp getchanges.py
REM.\mcp\runtime\bin\python\python_mcp getchanges.py
python getchanges.py
pause
9 changes: 6 additions & 3 deletions getchanges.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ def main(mcp_dir):
except OSError as e:
pass

os.mkdir( new_src_dir )
os.mkdir( patch_base_dir )
if not os.path.exists( new_src_dir ):
os.mkdir( new_src_dir )

if not os.path.exists( patch_base_dir ):
os.mkdir( patch_base_dir )

mod_src_dir = os.path.join( mcp_dir , "src", "minecraft" )
org_src_dir = os.path.join( mcp_dir , "src", ".minecraft_orig" )
Expand Down Expand Up @@ -82,4 +85,4 @@ def main(mcp_dir):
elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')):
main(os.path.abspath('..'))
else:
main(os.path.abspath('mcp804'))
main(os.path.abspath('mcp811'))
9 changes: 5 additions & 4 deletions install.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@

base_dir = os.path.dirname(os.path.abspath(__file__))

mc_version = "1.6.2"
of_version = mc_version+"_HD_U_B3"
mcp_version = "mcp804"
mc_version = "1.6.4"
of_version = mc_version+"_HD_U_C6"
of_file_extension = ".jar"
mcp_version = "mcp811"

try:
WindowsError
Expand Down Expand Up @@ -103,7 +104,7 @@ def download_deps( mcp_dir ):
optifine_dir = os.path.join(jars,"libraries","net","optifine","OptiFine",of_version )
mkdir_p( optifine_dir )

download_file( "http://optifine.net/download.php?f=OptiFine_"+of_version+".zip", os.path.join( optifine_dir, "OptiFine-"+of_version+".jar" ))
download_file( "http://optifine.net/download.php?f=OptiFine_"+of_version+of_file_extension, os.path.join( optifine_dir, "OptiFine-"+of_version+".jar" ))

json_obj = []
with open(json_file,"rb") as f:
Expand Down
225 changes: 225 additions & 0 deletions installer/1.6.4-forge-nohydra.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
{
"id": "1.6.4-minecrift-$VERSION",
"time": "2013-07-17T13:59:42-05:00",
"releaseTime": "2013-07-17T08:09:02-05:00",
"type": "release",
"processArguments": "username_session_version",
"minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
"libraries": [
{
"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": "argo:argo:2.25_fixed"
},
{
"name": "org.bouncycastle:bcprov-jdk15on:1.47"
},
{
"name": "com.google.guava:guava:14.0"
},
{
"name": "org.apache.commons:commons-lang3:3.1"
},
{
"name": "commons-io:commons-io:2.4"
},
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "com.google.code.gson:gson:2.2.2"
},
{
"name": "optifine:OptiFine:1.6.4_HD_U_C6"
},
{
"name": "de.fruitfly.ovr:JRift:0.2.5.1",
"url": "http://repo.minecraft-vr.com/"
},
{
"name": "net.minecraftforge:minecraftforge:$FORGE_VERSION",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.7",
"serverreq": true
},
{
"name": "org.ow2.asm:asm-all:4.1",
"serverreq": true
},
{
"name": "net.sf.jopt-simple:jopt-simple:4.5",
"serverreq": true
},
{
"name": "lzma:lzma:0.0.1",
"serverreq": true
},
{
"name": "net.aib42.mumblelink:JMumble:1.0",
"url": "http://repo.minecraft-vr.com/"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"rules": [
{
"action": "allow"
},
{
"action": "disallow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
]
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
"rules": [
{
"action": "allow",
"os": {
"name": "osx",
"version": "^10\\.5\\.\\d$"
}
}
],
"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": "de.fruitfly.ovr:JRiftLibrary:0.2.5.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": 4,
"synced": false
}
Loading

0 comments on commit 8556988

Please sign in to comment.