40b

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-39finalr1"
+minecrift_build = "jrbudda-40b"
 of_file_extension = ".jar"
 mcp_version = "mcp908"
 mcp_uses_generics = False

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-39finalr1";
++ public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-40b";
 + private boolean trigger;
 + /* end version */
 + /** END MINECRIFT */

patches/net/minecraft/client/entity/EntityPlayerSP.java.patch

@@ -429,7 +429,7 @@
  this.worldObj.playSound(this.posX, this.posY - (double)this.yOffset, this.posZ, name, volume, pitch, false);
  }
 
-@@ -662,4 +853,292 @@
+@@ -662,4 +853,294 @@
  }
 
  protected void sendHorseJump() {}
@@ -532,6 +532,7 @@
 + if(this.capabilities.isFlying || this.inWater){
 + switch (mc.vrSettings.vrFreeMoveMode){
 + case VRSettings.FREEMOVE_CONTROLLER:
++ case VRSettings.FREEMOVE_JOYPAD:
 + directionVec.rotateAroundX(con.getControllerOffhandPitch_World() * PIOVER180); 
 + break;
 + case VRSettings.FREEMOVE_HMD:
@@ -546,6 +547,7 @@
 + 
 + switch (mc.vrSettings.vrFreeMoveMode){
 + case VRSettings.FREEMOVE_CONTROLLER:
++ case VRSettings.FREEMOVE_JOYPAD:
 + directionVec.rotateAroundY(-con.getControllerOffhandYaw_World() * PIOVER180); 
 + break;
 + case VRSettings.FREEMOVE_HMD:

patches/net/minecraft/client/main/Main.java.patch

@@ -1,6 +1,15 @@
 --- a/net/minecraft/client/main/Main.java
 +++ b/net/minecraft/client/main/Main.java
-@@ -77,8 +77,8 @@
+@@ -23,6 +23,8 @@
+
+ public class Main
+ {
++ public static boolean kiosk;
++ public static boolean katvr;
+ private static final java.lang.reflect.Type field_152370_a = new ParameterizedType()
+ {
+ private static final String __OBFID = "CL_00000828";
+@@ -77,8 +79,8 @@
  ArgumentAcceptingOptionSpec var12 = var1.accepts("uuid").withRequiredArg();
  ArgumentAcceptingOptionSpec var13 = var1.accepts("accessToken").withRequiredArg().required();
  ArgumentAcceptingOptionSpec var14 = var1.accepts("version").withRequiredArg().required();

patches/net/minecraft/entity/projectile/EntityArrow.java.patch

@@ -47,7 +47,7 @@
 + float pitch = shooter.rotationPitch;
 + 
 + 
-+ if (shooter instanceof EntityPlayer)
++ if (shooter.getEntityId() == Minecraft.getMinecraft().thePlayer.getEntityId())
 + {
 + 
 + Vec3 aimSource = Minecraft.getMinecraft().roomScale.getControllerPos_World(1);

patches/net/minecraft/entity/projectile/EntityFireball.java.patch

@@ -36,7 +36,7 @@
 + float yaw = shooter.rotationYaw;
 + float pitch = shooter.rotationPitch;
 + 
-+ if (shooter instanceof EntityPlayer)
++ if (shooter.getEntityId() == Minecraft.getMinecraft().thePlayer.getEntityId())
 + { 
 + Vec3 aimSource = Minecraft.getMinecraft().roomScale.getControllerPos_World(0);
 + Vec3 controllerDirection = Minecraft.getMinecraft().roomScale.getControllerMainDir_World();

patches/net/minecraft/entity/projectile/EntityThrowable.java.patch

@@ -38,7 +38,7 @@
 + float pitch = shooter.rotationPitch;
 + 
 + 
-+ if (shooter instanceof EntityPlayer)
++ if (shooter.getEntityId() == Minecraft.getMinecraft().thePlayer.getEntityId())
 + { 
 + Vec3 aimSource = Minecraft.getMinecraft().roomScale.getControllerPos_World(0);
 + Vec3 controllerDirection = Minecraft.getMinecraft().roomScale.getControllerMainDir_World();

patches/net/minecraft/util/MovementInputFromOptions.java.patch

@@ -1,14 +1,18 @@
 --- a/net/minecraft/util/MovementInputFromOptions.java
 +++ b/net/minecraft/util/MovementInputFromOptions.java
-@@ -1,5 +1,7 @@
+@@ -1,6 +1,11 @@
  package net.minecraft.util;
 
++import com.mtbs3d.minecrift.control.VRControllerButtonMapping;
++import com.mtbs3d.minecrift.provider.MCOpenVR;
 +import com.mtbs3d.minecrift.settings.VRSettings;
 +import net.minecraft.client.Minecraft;
  import net.minecraft.client.settings.GameSettings;
++import net.minecraft.client.settings.KeyBinding;
 
  public class MovementInputFromOptions extends MovementInput
-@@ -14,8 +16,12 @@
+ {
+@@ -14,8 +19,12 @@
 
  public void updatePlayerMoveState()
  {
@@ -23,13 +27,31 @@
 
  if (this.gameSettings.keyBindForward.getIsKeyPressed())
  {
-@@ -37,13 +43,30 @@
+@@ -36,14 +45,47 @@
+ {
  --this.moveStrafe;
  }
- 
+-
 - this.jump = this.gameSettings.keyBindJump.getIsKeyPressed();
 - this.sneak = this.gameSettings.keyBindSneak.getIsKeyPressed();
++ 
 + Minecraft mc = Minecraft.getMinecraft();
++ if(mc.vrSettings.vrFreeMoveMode == mc.vrSettings.FREEMOVE_JOYPAD){
++ //override everything
++ this.moveForward = MCOpenVR.joyPadZ;
++ this.moveStrafe = MCOpenVR.joyPadX;
++
++ //just assuming all this below is needed for compatibility.
++ boolean forwardKeyDown = this.moveForward > 0;
++ boolean backKeyDown = this.moveForward < 0;
++ boolean leftKeyDown = this.moveStrafe < 0 ;
++ boolean rightKeyDown = this.moveStrafe > 0;
++ KeyBinding.setKeyBindState(this.gameSettings.keyBindForward, forwardKeyDown);
++ KeyBinding.setKeyBindState(this.gameSettings.keyBindBack, backKeyDown);
++ KeyBinding.setKeyBindState(this.gameSettings.keyBindLeft, leftKeyDown);
++ KeyBinding.setKeyBindState(this.gameSettings.keyBindRight, rightKeyDown);
++ }
++ 
 + boolean ok = Minecraft.getMinecraft().currentScreen==null && (mc.vrPlayer.getFreeMoveMode() || mc.vrSettings.simulateFalling);
 + 
 + //VIVECRAFT DO ok.