r2+3

minecriftversion.py

@@ -4,7 +4,7 @@
 of_json_name = "1.10.2_HD_U_D8"
 of_file_md5 = "d2a99a8d96d1067cb9e384bbdc560c70"
 minecrift_version_num = "1.10.2"
-minecrift_build = "Vivecraft-jrbudda-9r1"
+minecrift_build = "Vivecraft-jrbudda-9r3"
 of_file_extension = ".jar"
 mcp_version = "mcp931"
 mcp_uses_generics = True

patches/net/minecraft/client/Minecraft.java.patch

@@ -304,7 +304,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.10.2 Vivecraft-jrbudda-9r1";
++ public final String minecriftVerString = "Vivecraft 1.10.2 Vivecraft-jrbudda-9r3";
 + /* end version */
 + /** END MINECRIFT */
 + 

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

@@ -515,7 +515,7 @@
 + if(this.isRiding())return;
 + boolean freemove = OpenVRPlayer.get().getFreeMove();
 + boolean doY = freemove || (Minecraft.getMinecraft().vrSettings.simulateFalling && !this.isOnLadder()) && !this.isSneaking();
-+ if(mc.climbTracker.isActive(this)) doY = true;
++ if(mc.climbTracker.isActive(this) && (freemove || mc.climbTracker.isGrabbingLadder())) doY = true;
 + Vec3d roomOrigin = OpenVRPlayer.get().getRoomOriginPos_World();
 + // Vec3 camloc = Minecraft.getMinecraft().roomScale.getHMDPos_World();
 +

src/com/mtbs3d/minecrift/gameplay/ClimbTracker.java

@@ -155,18 +155,15 @@ public void doProcess(EntityPlayerSP player){
  } else if (meta == 5){
  inblock[c] = cpos.xCoord < .1 && (cpos.zCoord > .1 && cpos.zCoord < .9);
  } 
- //nah, hotboxes too big. inblock[c] = box[c] != null && box[c].offset(bp).isVecInside(controllerPos); 
- button[c]=inblock[c];
-
  } else {
  if(latchStart[c].subtract(controllerPos).lengthSquared() > 0.25) 
  inblock[c] = false;
- if(latchStart[c].subtract(controllerPos).lengthSquared() > 0.50) 
- button[c] = false;
  else
- button[c] = wasbutton[c];
+ inblock[c] = wasinblock[c];
  }
 
+ button[c] = inblock[c];
+ allowed[c] = inblock[c];
  } else { //Climbey
  //TODO whitelist by block type
 

src/net/minecraft/client/renderer/entity/RenderPlayerVR.java

@@ -130,7 +130,7 @@ else if (enumaction == EnumAction.BOW)
  }
  }
 
- if (itemstack != null)
+ if (itemstack1 != null)
  {
  modelbiped$armpose1 = ModelBiped.ArmPose.ITEM;