12b

minecriftversion.py

@@ -4,7 +4,7 @@
 of_json_name = "1.10.2_HD_U_E3"
 of_file_md5 = "7ea7d7c1e353da2a94961b443e59026f"
 minecrift_version_num = "1.10.2"
-minecrift_build = "jrbudda-11r2"
+minecrift_build = "jrbudda-12b"
 of_file_extension = ".jar"
 mcp_version = "mcp931"
 mcp_uses_generics = True

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

@@ -306,7 +306,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 jrbudda-11r2";
++    public final String minecriftVerString = "Vivecraft 1.10.2 jrbudda-12b";
 +	/* end version */
 +	/** END MINECRIFT */
 +    
@@ -1379,7 +1379,7 @@
                                  {
                                      return;
                                  }
-@@ -1616,25 +2212,20 @@
+@@ -1616,25 +2212,21 @@
                              case BLOCK:
                                  BlockPos blockpos = this.objectMouseOver.getBlockPos();
 
@@ -1389,7 +1389,8 @@
 -                                    int i = itemstack != null ? itemstack.stackSize : 0;
 -                                    EnumActionResult enumactionresult = this.playerController.processRightClickBlock(this.player, this.world, itemstack, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec, enumhand);
 -
-+                                	int i = itemstack != null ? itemstack.stackSize : 0;                                    EnumActionResult enumactionresult = this.playerController.processRightClickBlock(this.player, this.world, itemstack, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec, enumhand);
++                                	int i = itemstack != null ? itemstack.stackSize : 0;                                    
++                                	EnumActionResult enumactionresult = this.playerController.processRightClickBlock(this.player, this.world, itemstack, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec, enumhand);
                                      if (enumactionresult == EnumActionResult.SUCCESS)
                                      {
                                          this.player.swingArm(enumhand);
@@ -1413,7 +1414,7 @@
                                          }
 
                                          return;
-@@ -1643,9 +2234,7 @@
+@@ -1643,9 +2235,7 @@
                          }
                      }
 
@@ -1424,7 +1425,7 @@
                      {
                          this.entityRenderer.itemRenderer.resetEquippedProgress(enumhand);
                          return;
-@@ -1720,29 +2309,14 @@
+@@ -1720,29 +2310,14 @@
      /**
       * Called to resize the current screen.
       */
@@ -1457,7 +1458,7 @@
      }
 
      /**
-@@ -1758,11 +2332,21 @@
+@@ -1758,11 +2333,21 @@
       */
      public void runTick() throws IOException
      {
@@ -1479,7 +1480,7 @@
          this.mcProfiler.startSection("gui");
 
          if (!this.isGamePaused)
-@@ -1861,12 +2445,23 @@
+@@ -1861,12 +2446,23 @@
 
              this.mcProfiler.endStartSection("keyboard");
              this.runTickKeyboard();
@@ -1503,7 +1504,7 @@
                  ++this.joinPlayerCounter;
 
                  if (this.joinPlayerCounter == 30)
-@@ -1874,6 +2469,10 @@
+@@ -1874,6 +2470,10 @@
                      this.joinPlayerCounter = 0;
                      this.world.joinEntityInSurroundings(this.player);
                  }
@@ -1514,7 +1515,7 @@
              }
 
              this.mcProfiler.endStartSection("gameRenderer");
-@@ -1907,6 +2506,9 @@
+@@ -1907,6 +2507,9 @@
              this.entityRenderer.stopUseShader();
          }
 
@@ -1524,7 +1525,7 @@
          if (!this.isGamePaused)
          {
              this.mcMusicTicker.update();
-@@ -1960,8 +2562,12 @@
+@@ -1960,8 +2563,12 @@
              this.mcProfiler.endStartSection("pendingConnection");
              this.myNetworkManager.processReceivedPackets();
          }
@@ -1538,7 +1539,7 @@
          this.systemTime = getSystemTime();
      }
 
-@@ -1996,8 +2602,15 @@
+@@ -1996,8 +2603,15 @@
                  this.currentScreen.handleKeyboardInput();
              }
 
@@ -1555,7 +1556,7 @@
              if (flag)
              {
                  if (i == 62 && this.entityRenderer != null)
-@@ -2005,6 +2618,8 @@
+@@ -2005,6 +2619,8 @@
                      this.entityRenderer.switchUseShader();
                  }
 
@@ -1564,15 +1565,15 @@
                  boolean flag1 = false;
 
                  if (this.currentScreen == null)
-@@ -2012,6 +2627,7 @@
+@@ -2012,6 +2628,7 @@
                      if (i == 1)
                      {
                          this.displayInGameMenu();
 +
                      }
 
                      flag1 = Keyboard.isKeyDown(61) && this.processKeyF3(i);
-@@ -2019,7 +2635,9 @@
+@@ -2019,7 +2636,9 @@
 
                      if (i == 59)
                      {
@@ -1583,23 +1584,23 @@
                      }
                  }
 
-@@ -2032,6 +2650,7 @@
+@@ -2032,6 +2651,7 @@
                      KeyBinding.setKeyBindState(i, true);
                      KeyBinding.onTick(i);
                  }
 +                
 
                  if (this.gameSettings.showDebugProfilerChart)
                  {
-@@ -2052,7 +2671,6 @@
+@@ -2052,7 +2672,6 @@
              else
              {
                  KeyBinding.setKeyBindState(i, false);
 -
                  if (i == 61)
                  {
                      if (this.actionKeyF3)
-@@ -2067,6 +2685,11 @@
+@@ -2067,6 +2686,11 @@
                      }
                  }
              }
@@ -1611,7 +1612,7 @@
          }
 
          this.processKeyBinds();
-@@ -2171,20 +2794,38 @@
+@@ -2171,20 +2795,38 @@
      {
          for (; this.gameSettings.keyBindTogglePerspective.isPressed(); this.renderGlobal.setDisplayListEntitiesDirty())
          {
@@ -1664,7 +1665,7 @@
              }
          }
 
-@@ -2207,7 +2848,7 @@
+@@ -2207,7 +2849,7 @@
                  }
              }
          }
@@ -1673,7 +1674,7 @@
          while (this.gameSettings.keyBindInventory.isPressed())
          {
              this.getConnection().sendPacket(new CPacketClientStatus(CPacketClientStatus.State.OPEN_INVENTORY_ACHIEVEMENT));
-@@ -2242,22 +2883,42 @@
+@@ -2242,22 +2884,42 @@
 
          if (flag)
          {
@@ -1723,7 +1724,7 @@
              }
 
              label472:
-@@ -2283,17 +2944,27 @@
+@@ -2283,17 +2945,27 @@
                  }
              }
          }
@@ -1759,7 +1760,7 @@
 
              while (this.gameSettings.keyBindPickBlock.isPressed())
              {
-@@ -2301,18 +2972,23 @@
+@@ -2301,18 +2973,23 @@
              }
          }
 
@@ -1786,7 +1787,7 @@
              int i = Mouse.getEventButton();
              KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState());
 
-@@ -2327,6 +3003,13 @@
+@@ -2327,6 +3004,13 @@
                      KeyBinding.onTick(i - 100);
                  }
              }
@@ -1800,7 +1801,7 @@
 
              long j = getSystemTime() - this.systemTime;
 
-@@ -2381,6 +3064,15 @@
+@@ -2381,6 +3065,15 @@
       */
      public void launchIntegratedServer(String folderName, String worldName, @Nullable WorldSettings worldSettingsIn)
      {
@@ -1816,7 +1817,7 @@
          this.loadWorld((WorldClient)null);
          System.gc();
          ISaveHandler isavehandler = this.saveLoader.getSaveLoader(folderName, false);
-@@ -2423,6 +3115,16 @@
+@@ -2423,6 +3116,16 @@
 
          while (!this.theIntegratedServer.serverIsInRunLoop())
          {
@@ -1833,7 +1834,7 @@
              String s = this.theIntegratedServer.getUserMessage();
 
              if (s != null)
-@@ -2443,12 +3145,19 @@
+@@ -2443,12 +3146,19 @@
                  ;
              }
          }
@@ -1855,7 +1856,7 @@
          networkmanager.sendPacket(new CPacketLoginStart(this.getSession().getProfile()));
          this.myNetworkManager = networkmanager;
      }
-@@ -2458,6 +3167,9 @@
+@@ -2458,6 +3168,9 @@
       */
      public void loadWorld(WorldClient worldClientIn)
      {
@@ -1865,7 +1866,7 @@
          this.loadWorld(worldClientIn, "");
      }
 
-@@ -2466,6 +3178,11 @@
+@@ -2466,6 +3179,11 @@
       */
      public void loadWorld(@Nullable WorldClient worldClientIn, String loadingMessage)
      {
@@ -1877,7 +1878,7 @@
          if (worldClientIn == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.getConnection();
-@@ -2477,9 +3194,25 @@
+@@ -2477,9 +3195,25 @@
 
              if (this.theIntegratedServer != null && this.theIntegratedServer.isAnvilFileSet())
              {
@@ -1905,7 +1906,7 @@
              this.theIntegratedServer = null;
              this.guiAchievement.clearAchievements();
              this.entityRenderer.getMapItemRenderer().clearLoadedMaps();
-@@ -2501,6 +3234,11 @@
+@@ -2501,6 +3235,11 @@
              this.ingameGUI.resetPlayersOverlayFooterHeader();
              this.setServerData((ServerData)null);
              this.integratedServerIsRunning = false;
@@ -1917,7 +1918,7 @@
          }
 
          this.mcSoundHandler.stopSounds();
-@@ -2533,12 +3271,14 @@
+@@ -2533,12 +3272,14 @@
 
              if (this.player == null)
              {
@@ -1933,41 +1934,39 @@
              this.player.movementInput = new MovementInputFromOptions(this.gameSettings);
              this.playerController.setPlayerCapabilities(this.player);
              this.renderViewEntity = this.player;
-@@ -2576,6 +3316,7 @@
+@@ -2576,6 +3317,7 @@
          this.player.preparePlayerToSpawn();
          this.player.setServerBrand(s);
          this.world.spawnEntity(this.player);
 +        System.out.println("Spawned Player At " + this.player.posX + " " + this.player.posY + " " + this.player.posZ); //debug spawning in the damn ground.
          this.playerController.flipPlayer(this.player);
          this.player.movementInput = new MovementInputFromOptions(this.gameSettings);
          this.player.setEntityId(i);
-@@ -2607,6 +3348,7 @@
+@@ -2607,6 +3349,7 @@
          return theMinecraft == null || !theMinecraft.gameSettings.hideGUI;
      }
 
 +    //unused
      public static boolean isFancyGraphicsEnabled()
      {
          return theMinecraft != null && theMinecraft.gameSettings.fancyGraphics;
-@@ -2623,8 +3365,16 @@
+@@ -2623,8 +3366,14 @@
      /**
       * Called when user clicked he's mouse middle button (pick block)
       */
 -    private void middleClickMouse()
 +    public void middleClickMouse() //VIVECRAFT PUBLIC
      {
 +    	
-+    	if(Reflector.forgeExists()){
-+    		if (Reflector.callBoolean(Reflector.ForgeHooks_onPickBlock, new Object[]{this.objectMouseOver,this.player,this.world}))
-+    		{
-+    			return;
-+    		}
++    	if(Reflector.forgeExists() && this.objectMouseOver != null){
++    		Reflector.call(Reflector.ForgeHooks_onPickBlock, new Object[]{this.objectMouseOver,this.player,this.world});
++			return;
 +    	}
 +    	
          if (this.objectMouseOver != null && this.objectMouseOver.typeOfHit != RayTraceResult.Type.MISS)
          {
              boolean flag = this.player.capabilities.isCreativeMode;
-@@ -2788,7 +3538,8 @@
+@@ -2788,7 +3537,8 @@
          }
      }
 
@@ -1977,7 +1976,7 @@
      {
          NBTTagCompound nbttagcompound = te.writeToNBT(new NBTTagCompound());
 
-@@ -3098,6 +3849,11 @@
+@@ -3098,6 +3848,11 @@
       */
      public static int getGLMaximumTextureSize()
      {
@@ -1989,7 +1988,7 @@
          for (int i = 16384; i > 0; i >>= 1)
          {
              GlStateManager.glTexImage2D(32868, 0, 6408, i, i, 0, 6408, 5121, (IntBuffer)null);
-@@ -3264,7 +4020,7 @@
+@@ -3264,7 +4019,7 @@
      }
 
      public void dispatchKeypresses()
@@ -1998,7 +1997,7 @@
          int i = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey();
 
          if (i != 0 && !Keyboard.isRepeatEvent())
-@@ -3417,4 +4173,1209 @@
+@@ -3417,4 +4172,1209 @@
      {
          return this.player != null && this.player.hasReducedDebug() || this.gameSettings.reducedDebugInfo;
      }

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

@@ -576,7 +576,7 @@
                          vec3d2 = new Vec3d((double)(f2 * f5 - f3 * f4), vec3d2.yCoord, (double)(f3 * f5 + f2 * f4));
                          f1 = (float)vec3d2.lengthSquared();
 
-@@ -1269,4 +1483,338 @@
+@@ -1269,4 +1483,340 @@
              }
          }
      }
@@ -741,6 +741,7 @@
 +    			if(this.capabilities.isFlying || this.inWater){
 +    					switch (mc.vrSettings.vrFreeMoveMode){
 +    					case VRSettings.FREEMOVE_CONTROLLER:
++    					case VRSettings.FREEMOVE_JOYPAD:
 +    						directionVec= directionVec.rotatePitch(con.getControllerPitch_World(1) * PIOVER180);		   
 +    						break;
 +    					case VRSettings.FREEMOVE_HMD:
@@ -758,6 +759,7 @@
 +    			}else{
 +    				switch (mc.vrSettings.vrFreeMoveMode){
 +    				case VRSettings.FREEMOVE_CONTROLLER:
++    				case VRSettings.FREEMOVE_JOYPAD:
 +    					directionVec=directionVec.rotateYaw(-con.getControllerYaw_World(1) * PIOVER180);	
 +    					break;
 +    				case VRSettings.FREEMOVE_HMD: