backpack

Author: jrbudda

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-38r2"
+minecrift_build = "jrbudda-39pre"
 of_file_extension = ".jar"
 mcp_version = "mcp908"
 mcp_uses_generics = False

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -1,40 +1,109 @@
+@@ -1,40 +1,110 @@
  package net.minecraft.client;
 
 -import com.google.common.collect.Iterables;
@@ -121,7 +121,7 @@
  import net.minecraft.client.entity.EntityClientPlayerMP;
  import net.minecraft.client.gui.FontRenderer;
  import net.minecraft.client.gui.GuiChat;
-@@ -68,6 +137,8 @@
+@@ -68,6 +138,8 @@
  import net.minecraft.client.renderer.RenderGlobal;
  import net.minecraft.client.renderer.Tessellator;
  import net.minecraft.client.renderer.WorldRenderer;
@@ -130,15 +130,15 @@
  import net.minecraft.client.renderer.entity.RenderManager;
  import net.minecraft.client.renderer.texture.DynamicTexture;
  import net.minecraft.client.renderer.texture.TextureManager;
-@@ -97,6 +168,7 @@
+@@ -97,6 +169,7 @@
  import net.minecraft.client.settings.GameSettings;
  import net.minecraft.client.settings.KeyBinding;
  import net.minecraft.client.shader.Framebuffer;
 +import net.minecraft.client.shader.ShaderGroup;
  import net.minecraft.client.stream.IStream;
  import net.minecraft.client.stream.NullStream;
  import net.minecraft.client.stream.TwitchStream;
-@@ -127,6 +199,8 @@
+@@ -127,6 +200,8 @@
  import net.minecraft.profiler.Profiler;
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.integrated.IntegratedServer;
@@ -147,15 +147,15 @@
  import net.minecraft.stats.AchievementList;
  import net.minecraft.stats.IStatStringFormat;
  import net.minecraft.stats.StatFileWriter;
-@@ -142,6 +216,7 @@
+@@ -142,6 +217,7 @@
  import net.minecraft.util.Session;
  import net.minecraft.util.Timer;
  import net.minecraft.util.Util;
 +import net.minecraft.util.Vec3;
  import net.minecraft.world.EnumDifficulty;
  import net.minecraft.world.WorldProviderEnd;
  import net.minecraft.world.WorldProviderHell;
-@@ -150,2988 +225,4962 @@
+@@ -150,2988 +226,4963 @@
  import net.minecraft.world.storage.ISaveFormat;
  import net.minecraft.world.storage.ISaveHandler;
  import net.minecraft.world.storage.WorldInfo;

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

@@ -15,12 +15,9 @@
  * Created by cincodenada on 13-May-17.
  */
 public class BackpackTracker {
-	float mouthtoEyeDistance=0.0f;
-	float threshold=0.25f;
-	public Item[] items = new Item[2];
 	public boolean[] wasIn = new boolean[2];
-	public boolean[] wasPressed = new boolean[2];
-
+	public int previousSlot = -1;
+	
 	public boolean isActive(EntityPlayerSP p){
 		if(Minecraft.getMinecraft().vrSettings.seated)
 			return false;
@@ -30,52 +27,46 @@ public boolean isActive(EntityPlayerSP p){
 		return true;
 	}
 
-private Random r = new Random();
-
 
-public void doProcess(Minecraft minecraft, EntityPlayerSP player){
-	if(!isActive(player)) {
-		return;
-	}
-	IRoomscaleAdapter provider = minecraft.roomScale;
+	private Vec3 down = Vec3.createVectorHelper(0, -1, 0);
+	
+	public void doProcess(Minecraft minecraft, EntityPlayerSP player){
+		if(!isActive(player)) {
+			return;
+		}
+		IRoomscaleAdapter provider = minecraft.roomScale;
 
-	Vec3 hmdPos=provider.getHMDPos_Room();
+		Vec3 hmdPos=provider.getHMDPos_Room();
 
-	for(int c=0; c<2; c++) {
-		Vec3 controllerPos = MCOpenVR.controllerHistory[c].averagePosition(0.333).add(provider.getCustomControllerVector(c, new Vec3(0, 0, -0.1)));
-		controllerPos = controllerPos.add(minecraft.roomScale.getControllerDir_Room(c).scale(0.1));
+		for(int c=0; c<1; c++) { //just main for 1710, no dual wielding
+			Vec3 controllerPos = provider.getControllerPos_Room(c);//.add(provider.getCustomControllerVector(c, new Vec3(0, 0, -0.1)));
+			Vec3 controllerDir = minecraft.roomScale.getControllerDir_World(c);
+			Vec3 hmddir = provider.getHMDDir_World();
+			Vec3 hmdpos = provider.getHMDPos_Room();
+			Vec3 delta = hmdPos.subtractProperly(controllerPos);
+			double dot = controllerDir.dotProduct(down);
+			double dotDelta = delta.dotProduct(hmddir);
 
-		if (
-				(Math.abs(hmdPos.yCoord - controllerPos.yCoord) < 0.25)
-						&& controllerPos.zCoord > hmdPos.zCoord
-						&& ((controllerPos.zCoord - hmdPos.zCoord) < 0.5)
-				) {
-			wasIn[c] = true;
-			if(!wasPressed[c]) {
-				wasPressed[c] = Minecraft.getMinecraft().gameSettings.keyBindAttack.getIsKeyPressed();
-				if(wasPressed[c]) {
-					provider.triggerHapticPulse(c,1500);
-				}
-			}
-		} else {
-			// Only run once per zone entrance
-			if (wasIn[c]) {
-				// If we pressed while in the zone
-				if (wasPressed[c]) {
-					ItemStack heldStack = player.getHeldItem();
-					this.items[c] = (heldStack == null ? null : heldStack.getItem());
-				} else {
-					if(this.items[c] != null) {
-						player.inventory.setCurrentItem(this.items[c], 0, false, player.capabilities.isCreativeMode);
-						provider.triggerHapticPulse(c, 1500);
+			if ( 
+					((hmdPos.yCoord - controllerPos.yCoord) > 0.05) && //controller below hmd
+					(dot > .8) && // pointing approx down
+					(dotDelta > 0) // behind head
+					){
+				if(!wasIn[c]){
+					if(player.inventory.currentItem != 0){
+						previousSlot = player.inventory.currentItem;
+						player.inventory.currentItem = 0;	
+					} else {
+						player.inventory.currentItem = previousSlot;
+						previousSlot = -1;
 					}
+					provider.triggerHapticPulse(c, 1500);
+					wasIn[c] = true;
 				}
+			} else {
+				wasIn[c] = false;
 			}
-			// Reset state
-			wasIn[c] = false;
-			wasPressed[c] = false;
 		}
-	}
 }
 
 }

src/com/mtbs3d/minecrift/provider/OpenVRPlayer.java

@@ -222,9 +222,9 @@ public void onLivingUpdate(EntityPlayerSP player, Minecraft mc, Random rand)
 	    mc.sneakTracker.doProcess(mc, player);
 
 		mc.autoFood.doProcess(mc,player);
-
-        mc.backpackTracker.doProcess(mc, player);
-
+		
+		mc.backpackTracker.doProcess(mc, player);
+        
         this.checkandUpdateRotateScale(false, 1);
 
 	    mc.swimTracker.doProcess(mc,player);