Some fixes

modifiedeight-newadditions/headers/rendering/LevelRenderer.hpp

@@ -91,7 +91,7 @@ struct LevelRenderer: LevelListener, AppPlatform::Listener
 	std::string gatherStats1();
 	void generateSky();
 	static int32_t getLayerFeature(int32_t, bool_t);
-	void render(const AABB&);
+	void render(const AABB&, float);
 	int32_t renderChunks(int32_t, float, bool_t);
 	void renderClouds(float);
 	void renderDebug(const AABB&, float);

modifiedeight-newadditions/impl/entity/LocalPlayer.cpp

@@ -512,6 +512,9 @@ void LocalPlayer::aiStep() {
   if (!currentScreen || currentScreen->field_C) {
     moveInput->tick(this);
   }
+  if (this->moveInput->sneakingMaybe && this->ySize < 0.2) {
+    this->ySize = 0.2;
+  }
   this->field_B7C = 1.0;
   if (this->abilities.mayfly) {
     if (!jumpingMaybe && this->moveInput->jumpingMaybe) {
@@ -547,10 +550,6 @@ void LocalPlayer::aiStep() {
     }
   }
 
-  if (!this->abilities.flying && this->moveInput->sneakingMaybe &&
-      !this->onGround) {
-    this->motionY = this->motionY - 0.15f;
-  }
   if (this->isUsingItem()) {
     this->moveInput->strafeInput = this->moveInput->strafeInput * 0.35;
     this->moveInput->forwardInput = this->moveInput->forwardInput * 0.35;

modifiedeight-newadditions/impl/input/ControllerHandler.cpp

@@ -179,9 +179,6 @@ void ControllerHandler::tickGame(Minecraft* mc) {
 	ControllerHandler::jumpHeld = Gamepad::isBindingDown(ControllerLayout::get(CA_JUMP));
 	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK))) {
 		ControllerHandler::sneakToggle ^= 1;
-		if(mc->soundEngine) {
-			mc->soundEngine->playUI("random.click", 1.0f, 1.0f);
-		}
 	}
 	ControllerHandler::sneakHeld = ControllerHandler::sneakToggle;
 
@@ -324,7 +321,7 @@ void ControllerHandler::tickMenu(Minecraft* mc) {
 		Mouse::feed(1, 0, cx, cy);
 	}
 
-	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK))) {
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK)) || Gamepad::wasButtonPressed(GP_BTN_B)) {
 		mc->handleBack(0);
 		return;
 	}

modifiedeight-newadditions/impl/input/TouchscreenInput.cpp

@@ -120,7 +120,7 @@ void TouchscreenInput::rebuild() {
         (this->field_42 || (hideGUI = this->field_41) != 0)) {
       hideGUI = 1;
     }
-    if (!this->minecraft->player->isRiding()) {
+    if (!Gamepad::connected && !this->minecraft->player->isRiding()) {
       if (hideGUI || this->idkWhatIsThis2) {
         v4 = _D6E06658;
       } else if (this->isButtonDown(102)) {
@@ -161,37 +161,41 @@ void TouchscreenInput::rebuild() {
         sub_D6604D0C(this->upRightButton, 26, 133, 26.0);
       }
     }
-    if (this->isButtonDown(100)) {
-      v9 = _D6E0665C;
-    } else {
-      v9 = _D6E06660;
-    }
-    Tesselator::instance.colorABGR(v9);
-    if (this->idkWhatIsThis2) {
-      v10 = 52;
-      v11 = 133;
-    } else {
-      v10 = 0;
-      v11 = 107;
-    }
-    sub_D6604D0C(this->upArrow, v10, v11, 26.0);
-    if (this->field_43 && hideGUI) {
-      v12 = _D6E06658;
-    } else if (this->isButtonDown(104)) {
-      v12 = _D6E0665C;
-    } else {
-      v12 = _D6E06660;
-    }
-    Tesselator::instance.colorABGR(v12);
-    if (this->field_43) {
-      v13 = 133;
-    } else {
-      v13 = 107;
+    if (!Gamepad::connected) {
+      if (this->isButtonDown(100)) {
+        v9 = _D6E0665C;
+      } else {
+        v9 = _D6E06660;
+      }
+      Tesselator::instance.colorABGR(v9);
+      if (this->idkWhatIsThis2) {
+        v10 = 52;
+        v11 = 133;
+      } else {
+        v10 = 0;
+        v11 = 107;
+      }
+      sub_D6604D0C(this->upArrow, v10, v11, 26.0);
     }
-    if (this->options->swapJumpAndSneak) {
-      sub_D6604D0C(this->jumpButton, 104, this->field_43 ? 133 : 107, 26.0);
-    } else {
-      sub_D6604D0C(this->jumpButton, 104, v13, 26.0);
+    if (!Gamepad::connected) {
+      if (this->field_43 && hideGUI) {
+        v12 = _D6E06658;
+      } else if (this->isButtonDown(104)) {
+        v12 = _D6E0665C;
+      } else {
+        v12 = _D6E06660;
+      }
+      Tesselator::instance.colorABGR(v12);
+      if (this->field_43) {
+        v13 = 133;
+      } else {
+        v13 = 107;
+      }
+      if (this->options->swapJumpAndSneak) {
+        sub_D6604D0C(this->jumpButton, 104, this->field_43 ? 133 : 107, 26.0);
+      } else {
+        sub_D6604D0C(this->jumpButton, 104, v13, 26.0);
+      }
     }
     if (!this->minecraft->currentScreen) {
       if (this->isButtonDown(106)) {
@@ -202,7 +206,7 @@ void TouchscreenInput::rebuild() {
       Tesselator::instance.colorABGR(v14);
       sub_D6604D0C(this->chatButton, 200, 82, 18.0);
     }
-    if (!this->minecraft->currentScreen && this->sneakButton) {
+    if (!Gamepad::connected && !this->minecraft->currentScreen && this->sneakButton) {
       if (this->isButtonDown(108)) {
         v14 = _D6E0665C;
       } else {
@@ -407,7 +411,6 @@ void TouchscreenInput::tick(Player *a2) {
               static int32_t s_lastSneakTap = 0;
               int32_t now = getTimeMs();
               if (now - s_lastSneakTap <= 400) {
-                this->minecraft->soundEngine->playUI("random.click", 1.0, 1.0);
                 this->sneakingMaybe = !this->sneakingMaybe;
                 s_lastSneakTap = 0;
               } else {

modifiedeight-newadditions/impl/rendering/GameRenderer.cpp

@@ -367,7 +367,7 @@ void GameRenderer::pick(float a2) {
 			if(this->minecraft->viewEntityMaybe) {
 				if(this->minecraft->viewEntityMaybe->isAlive()) {
 					float v6 = this->minecraft->gameMode->getPickRange();
-					Vec3 v72(0, 0, 0);
+					Vec3 v72 = this->minecraft->viewEntityMaybe->getPos(a2);
 					bool updated;
 					if(!this->minecraft->useTouchscreen() || this->minecraft->options.useJoypad) {
 						bool isLiquidClipItem;
@@ -813,17 +813,15 @@ void GameRenderer::renderLevel(float a2) {
 	this->minecraft->levelRenderer->renderNameTags(a2);
 	if(this->field_4C == 1.0) {
 		if(viewEntityMaybe->isPlayer()) {
-			if(!this->minecraft->currentScreen && !this->minecraft->options.thirdPerson && this->minecraft->selectedObject.hitType != 2 && !viewEntityMaybe->isUnderLiquid(Material::water)) {
-#ifndef PCTWEAKS
-				if(this->minecraft->useTouchscreen() && !this->minecraft->mouseGrabbed) {
-#endif
-					levelRenderer->renderHitSelect((Player*)viewEntityMaybe, this->minecraft->selectedObject, 0, 0, a2);
-#ifndef PCTWEAKS
-				} else {
-					levelRenderer->renderHitOutline((Player*)viewEntityMaybe, this->minecraft->selectedObject, 0, 0, a2);
-				}
+		if(!this->minecraft->currentScreen && !this->minecraft->options.thirdPerson && this->minecraft->selectedObject.hitType != 2 && !viewEntityMaybe->isUnderLiquid(Material::water)) {
+#ifdef PCTWEAKS
+			levelRenderer->renderHitOutline((Player*)viewEntityMaybe, this->minecraft->selectedObject, 0, 0, a2);
+#else
+			if(this->minecraft->useTouchscreen()) {
+				levelRenderer->renderHitSelect((Player*)viewEntityMaybe, this->minecraft->selectedObject, 0, 0, a2);
+			}
 #endif
-				levelRenderer->renderHit((Player*)viewEntityMaybe, this->minecraft->selectedObject, 0, 0, a2);
+			levelRenderer->renderHit((Player*)viewEntityMaybe, this->minecraft->selectedObject, 0, 0, a2);
 			}
 		}
 	}

modifiedeight-newadditions/impl/rendering/LevelRenderer.cpp

@@ -538,25 +538,25 @@ int32_t LevelRenderer::getLayerFeature(int32_t a1, bool_t a2) {
     return 0;
   }
 }
-void LevelRenderer::render(const AABB &a2) {
-  Vec3 v5 = this->minecraft->player->getPos(0.0);
+void LevelRenderer::render(const AABB &a2, float pt) {
+  Vec3 v5 = this->minecraft->player->getPos(pt);
   Vec3 v6(-v5.x, -v5.y, -v5.z);
   Tesselator::instance.offset(v6);
-  Tesselator::instance.begin(3);
+  Tesselator::instance.begin(3, 0);
   Tesselator::instance.vertex(a2.minX, a2.minY, a2.minZ);
   Tesselator::instance.vertex(a2.maxX, a2.minY, a2.minZ);
   Tesselator::instance.vertex(a2.maxX, a2.minY, a2.maxZ);
   Tesselator::instance.vertex(a2.minX, a2.minY, a2.maxZ);
   Tesselator::instance.vertex(a2.minX, a2.minY, a2.minZ);
   Tesselator::instance.draw(1);
-  Tesselator::instance.begin(3);
+  Tesselator::instance.begin(3, 0);
   Tesselator::instance.vertex(a2.minX, a2.maxY, a2.minZ);
   Tesselator::instance.vertex(a2.maxX, a2.maxY, a2.minZ);
   Tesselator::instance.vertex(a2.maxX, a2.maxY, a2.maxZ);
   Tesselator::instance.vertex(a2.minX, a2.maxY, a2.maxZ);
   Tesselator::instance.vertex(a2.minX, a2.maxY, a2.minZ);
   Tesselator::instance.draw(1);
-  Tesselator::instance.begin(1);
+  Tesselator::instance.begin(1, 0);
   Tesselator::instance.vertex(a2.minX, a2.minY, a2.minZ);
   Tesselator::instance.vertex(a2.minX, a2.maxY, a2.minZ);
   Tesselator::instance.vertex(a2.maxX, a2.minY, a2.minZ);
@@ -1025,19 +1025,16 @@ void LevelRenderer::renderHitOutline(Player *a2, const HitResult &a3,
     int32_t v9 = this->level->getTile(a3.field_4, a3.field_8, a3.field_C);
     if (v9 > 0) {
       Tile::tiles[v9]->updateShape(this->level, a3.field_4, a3.field_8, a3.field_C);
-      float v11 = a2->prevPosX + (float)((float)(a2->posX - a2->prevPosX) * a6);
-      float v12 = a2->prevPosY + (float)((float)(a2->posY - a2->prevPosY) * a6);
-      float v13 = a2->prevPosZ + (float)((float)(a2->posZ - a2->prevPosZ) * a6);
       AABB v15 = Tile::tiles[v9]->getTileAABB(this->level, a3.field_4, a3.field_8, a3.field_C);
       AABB v16{
-          (float)(v15.minX - 0.002f) - v11,
-          (float)(v15.minY - 0.002f) - v12,
-          (float)(v15.minZ - 0.002f) - v13,
-          (float)(v15.maxX + 0.002f) - v11,
-          (float)(v15.maxY + 0.002f) - v12,
-          (float)(v15.maxZ + 0.002f) - v13,
+          (float)(v15.minX - 0.002f),
+          (float)(v15.minY - 0.002f),
+          (float)(v15.minZ - 0.002f),
+          (float)(v15.maxX + 0.002f),
+          (float)(v15.maxY + 0.002f),
+          (float)(v15.maxZ + 0.002f),
       };
-      this->render(v16);
+      this->render(v16, a6);
     }
   }
 }
@@ -1088,7 +1085,8 @@ void LevelRenderer::renderOutlineHitSelect(Player *a2, float a3, Tile *a4,
   glColor4f(0.0, 0.0, 0.0, 0.4);
   AABB v8 = a4->getTileAABB(this->level, a5.field_4, a5.field_8, a5.field_C);
   this->render({v8.minX + 0.002f, v8.minY + 0.002f, v8.minZ + 0.002f,
-                v8.maxX - 0.002f, v8.maxY - 0.002f, v8.maxZ - 0.002f});
+                   v8.maxX - 0.002f, v8.maxY - 0.002f, v8.maxZ - 0.002f},
+               a3);
   glDepthMask(1u);
 }
 void LevelRenderer::renderShadows(

modifiedeight/headers/rendering/LevelRenderer.hpp

@@ -91,7 +91,7 @@ struct LevelRenderer: LevelListener, AppPlatform::Listener
 	std::string gatherStats1();
 	void generateSky();
 	static int32_t getLayerFeature(int32_t, bool_t);
-	void render(const AABB&);
+	void render(const AABB&, float);
 	int32_t renderChunks(int32_t, float, bool_t);
 	void renderClouds(float);
 	void renderDebug(const AABB&, float);

modifiedeight/impl/entity/LocalPlayer.cpp

@@ -428,6 +428,9 @@ void LocalPlayer::aiStep() {
   if (!currentScreen || currentScreen->field_C) {
     moveInput->tick(this);
   }
+  if (this->moveInput->sneakingMaybe && this->ySize < 0.2) {
+    this->ySize = 0.2;
+  }
   this->field_B7C = 1.0;
   if (this->abilities.mayfly) {
     if (!jumpingMaybe && this->moveInput->jumpingMaybe) {
@@ -463,10 +466,6 @@ void LocalPlayer::aiStep() {
     }
   }
 
-  if (!this->abilities.flying && this->moveInput->sneakingMaybe &&
-      !this->onGround) {
-    this->motionY = this->motionY - 0.15f;
-  }
   if (this->isUsingItem()) {
     this->moveInput->strafeInput = this->moveInput->strafeInput * 0.35;
     this->moveInput->forwardInput = this->moveInput->forwardInput * 0.35;

modifiedeight/impl/input/ControllerHandler.cpp

@@ -179,9 +179,6 @@ void ControllerHandler::tickGame(Minecraft* mc) {
 	ControllerHandler::jumpHeld = Gamepad::isBindingDown(ControllerLayout::get(CA_JUMP));
 	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK))) {
 		ControllerHandler::sneakToggle ^= 1;
-		if(mc->soundEngine) {
-			mc->soundEngine->playUI("random.click", 1.0f, 1.0f);
-		}
 	}
 	ControllerHandler::sneakHeld = ControllerHandler::sneakToggle;
 
@@ -324,7 +321,7 @@ void ControllerHandler::tickMenu(Minecraft* mc) {
 		Mouse::feed(1, 0, cx, cy);
 	}
 
-	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK))) {
+	if(Gamepad::wasBindingPressed(ControllerLayout::get(CA_SNEAK)) || Gamepad::wasButtonPressed(GP_BTN_B)) {
 		mc->handleBack(0);
 		return;
 	}

modifiedeight/impl/input/TouchscreenInput.cpp

@@ -120,7 +120,7 @@ void TouchscreenInput::rebuild() {
         (this->field_42 || (hideGUI = this->field_41) != 0)) {
       hideGUI = 1;
     }
-    if (!this->minecraft->player->isRiding()) {
+    if (!Gamepad::connected && !this->minecraft->player->isRiding()) {
       if (hideGUI || this->idkWhatIsThis2) {
         v4 = _D6E06658;
       } else if (this->isButtonDown(102)) {
@@ -161,34 +161,38 @@ void TouchscreenInput::rebuild() {
         sub_D6604D0C(this->upRightButton, 26, 133, 26.0);
       }
     }
-    if (this->isButtonDown(100)) {
-      v9 = _D6E0665C;
-    } else {
-      v9 = _D6E06660;
-    }
-    Tesselator::instance.colorABGR(v9);
-    if (this->idkWhatIsThis2) {
-      v10 = 52;
-      v11 = 133;
-    } else {
-      v10 = 0;
-      v11 = 107;
-    }
-    sub_D6604D0C(this->upArrow, v10, v11, 26.0);
-    if (this->field_43 && hideGUI) {
-      v12 = _D6E06658;
-    } else if (this->isButtonDown(104)) {
-      v12 = _D6E0665C;
-    } else {
-      v12 = _D6E06660;
+    if (!Gamepad::connected) {
+      if (this->isButtonDown(100)) {
+        v9 = _D6E0665C;
+      } else {
+        v9 = _D6E06660;
+      }
+      Tesselator::instance.colorABGR(v9);
+      if (this->idkWhatIsThis2) {
+        v10 = 52;
+        v11 = 133;
+      } else {
+        v10 = 0;
+        v11 = 107;
+      }
+      sub_D6604D0C(this->upArrow, v10, v11, 26.0);
     }
-    Tesselator::instance.colorABGR(v12);
-    if (this->field_43) {
-      v13 = 133;
-    } else {
-      v13 = 107;
+    if (!Gamepad::connected) {
+      if (this->field_43 && hideGUI) {
+        v12 = _D6E06658;
+      } else if (this->isButtonDown(104)) {
+        v12 = _D6E0665C;
+      } else {
+        v12 = _D6E06660;
+      }
+      Tesselator::instance.colorABGR(v12);
+      if (this->field_43) {
+        v13 = 133;
+      } else {
+        v13 = 107;
+      }
+      sub_D6604D0C(this->jumpButton, 104, v13, 26.0);
     }
-    sub_D6604D0C(this->jumpButton, 104, v13, 26.0);
     if (!this->minecraft->currentScreen) {
       if (this->isButtonDown(106)) {
         v14 = _D6E0665C;
@@ -198,14 +202,14 @@ void TouchscreenInput::rebuild() {
       Tesselator::instance.colorABGR(v14);
       sub_D6604D0C(this->chatButton, 200, 82, 18.0);
     }
-    if (!this->minecraft->currentScreen && this->sneakButton) {
+    if (!Gamepad::connected && !this->minecraft->currentScreen && this->sneakButton) {
       if (this->isButtonDown(108)) {
         v14 = _D6E0665C;
       } else {
         v14 = _D6E06660;
       }
       Tesselator::instance.colorABGR(v14);
-      sub_D6604D0C(this->sneakButton, 218, this->sneakingMaybe ? 82 : 64, 18.0);
+      sub_D6604D0C(this->sneakButton, 218, this->sneakingMaybe ? 64 : 82, 18.0);
     }
     if (!this->minecraft->currentScreen && this->cameraButton) {
       int vCam = this->isButtonDown(107) ? _D6E0665C : _D6E06660;
@@ -403,7 +407,6 @@ void TouchscreenInput::tick(Player *a2) {
               static int32_t s_lastSneakTap = 0;
               int32_t now = getTimeMs();
               if (now - s_lastSneakTap <= 400) {
-                this->minecraft->soundEngine->playUI("random.click", 1.0, 1.0);
                 this->sneakingMaybe = !this->sneakingMaybe;
                 s_lastSneakTap = 0;
               } else {