39pre

jrbudda · May 23, 2017 · c3e8cb6 · c3e8cb6
1 parent 0d25d97
commit c3e8cb6
Show file tree

Hide file tree

Showing 6 changed files with 882 additions and 883 deletions.
diff --git 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-38r2";
++    public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-39pre";
 +	private boolean trigger;
 +	/* end version */
 +	/** END MINECRIFT */

diff --git a/patches/net/minecraft/client/entity/EntityPlayerSP.java.patch b/patches/net/minecraft/client/entity/EntityPlayerSP.java.patch
@@ -566,7 +566,7 @@
 +            if(!this.capabilities.isFlying && !this.inWater) addFactor = VRSettings.getInertiaAddFactor(inertiaFactor);
 +            
 +            float yAdd = 1f;
-+            if(this.capabilities.isFlying) yAdd = 3f; //HACK
++            if(this.capabilities.isFlying) yAdd = 5f; //HACK
 +            
 +            this.motionX = this.motionX + (mX * addFactor);
 +            this.motionZ = this.motionZ + (mZ * addFactor);

diff --git a/patches/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/net/minecraft/client/renderer/EntityRenderer.java.patch
@@ -4407,7 +4407,7 @@
 +					eye = Vec3.createVectorHelper(mc.vrSettings.vrFixedCamposX, mc.vrSettings.vrFixedCamposY, mc.vrSettings.vrFixedCamposZ);
 +				}
 +			}
-+			Vector3f guipos = MCOpenVR.guiPos_World;
++			Vector3f guipos = MCOpenVR.guiPos_Room;
 +			Matrix4f guirot = MCOpenVR.guiRotationPose; 
 +			Vec3 guiLocal = Vec3.createVectorHelper(0, 0, 0);		
 +	
@@ -4561,7 +4561,7 @@
 +				Vec3 pos = posAvg.add(Vec3.createVectorHelper(dir.xCoord * dist, dir.yCoord * dist, dir.zCoord * dist));
 +				guipos = new Vector3f((float)pos.xCoord, (float)pos.yCoord, (float)pos.zCoord);
 +				guirot = Matrix4f.rotationY(-(yawAvg + (float)Math.PI / 2)); // don't ask
-+				MCOpenVR.guiPos_World = guipos;
++				MCOpenVR.guiPos_Room = guipos;
 +				MCOpenVR.guiRotationPose = guirot;
 +			}
 +			

diff --git a/src/com/mtbs3d/minecrift/gameplay/BackpackTracker.java b/src/com/mtbs3d/minecrift/gameplay/BackpackTracker.java
@@ -47,11 +47,10 @@ public void doProcess(Minecraft minecraft, EntityPlayerSP player){
 			double dot = controllerDir.dotProduct(down);
 			double dotDelta = delta.dotProduct(hmddir);
 
-			if ( 
-					((hmdPos.yCoord - controllerPos.yCoord) > 0.05) && //controller below hmd
-					(dot > .8) && // pointing approx down
-					(dotDelta > 0) // behind head
-					){
+			boolean zone = ((Math.abs(hmdPos.yCoord - controllerPos.yCoord)) < 0.25) && //controller below hmd
+					(dotDelta > 0); // behind head
+
+			if (zone){
 				if(!wasIn[c]){
 					if(player.inventory.currentItem != 0){
 						previousSlot = player.inventory.currentItem;