From c188fa0ce2dfbaa0939908d18c977745bf057af9 Mon Sep 17 00:00:00 2001
From: Shredder <example@email.com>
Date: Sun, 12 Apr 2026 01:12:17 +0500
Subject: [PATCH] Attempt to fix Normal Lighting and Shadows on Android, also
 disabled fancy trees temporarily due to performance issues on android.

---
 src/client/renderer/ItemInHandRenderer.cpp    | 5 ++++-
 src/client/renderer/entity/EntityRenderer.cpp | 2 +-
 src/client/renderer/gles.h                    | 2 +-
 src/world/level/biome/Biome.cpp               | 2 +-
 src/world/level/biome/ForestBiome.h           | 2 +-
 src/world/level/biome/RainforestBiome.h       | 2 +-
 src/world/level/tile/Sapling.h                | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/client/renderer/ItemInHandRenderer.cpp b/src/client/renderer/ItemInHandRenderer.cpp
index 3bd90bc..b45d837 100755
--- a/src/client/renderer/ItemInHandRenderer.cpp
+++ b/src/client/renderer/ItemInHandRenderer.cpp
@@ -375,7 +375,9 @@ void ItemInHandRenderer::render( float a )
 		}
 		glEnableClientState2(GL_VERTEX_ARRAY);
 		glEnableClientState2(GL_TEXTURE_COORD_ARRAY);
+		glEnableClientState2(GL_NORMAL_ARRAY);
 		renderItem(player, item);
+		glDisableClientState2(GL_NORMAL_ARRAY);
 		glDisableClientState2(GL_VERTEX_ARRAY);
 		glDisableClientState2(GL_TEXTURE_COORD_ARRAY);
 		glPopMatrix2();
@@ -394,7 +396,8 @@ void ItemInHandRenderer::render( float a )
 		glTranslatef2(0.8f * d, -0.75f * d - (1 - h) * 0.6f, -0.9f * d);
 
 		glRotatef2(45, 0, 1, 0);
-		glEnable2(GL_RESCALE_NORMAL);
+//		glEnable2(GL_RESCALE_NORMAL);
+		glEnable(GL_NORMALIZE);
 		glRotatef2(swing2 * 70, 0, 1, 0);
 		glRotatef2(-swing3 * 20, 0, 0, 1);
 		// glRotatef2(-swing2 * 80, 1, 0, 0);
diff --git a/src/client/renderer/entity/EntityRenderer.cpp b/src/client/renderer/entity/EntityRenderer.cpp
index 5538fda..1f745d2 100755
--- a/src/client/renderer/entity/EntityRenderer.cpp
+++ b/src/client/renderer/entity/EntityRenderer.cpp
@@ -187,7 +187,7 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 	//Textures* textures = entityRenderDispatcher->textures;
 	//textures->bind(textures->loadTexture("%clamp%/environment/shadow.png"));
 	Textures* textures = entityRenderDispatcher->textures;
-	textures->bind(textures->loadTexture("/misc/shadow.png"));
+	textures->loadAndBindTexture(("/misc/shadow.png"));
 
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
diff --git a/src/client/renderer/gles.h b/src/client/renderer/gles.h
index e557b1a..bd69eeb 100755
--- a/src/client/renderer/gles.h
+++ b/src/client/renderer/gles.h
@@ -12,7 +12,7 @@
 #if defined(ANDROID) || defined(__APPLE__) || defined(RPI)
     #define OPENGL_ES
 #endif
-
+#define GLES_SILENCE_DEPRECATION
 // Other systems might run it, if they #define OPENGL_ES
 // #if defined(OPENGL_ES) // || defined(ANDROID)
 	#define USE_VBO
diff --git a/src/world/level/biome/Biome.cpp b/src/world/level/biome/Biome.cpp
index f97cab8..2c8638f 100755
--- a/src/world/level/biome/Biome.cpp
+++ b/src/world/level/biome/Biome.cpp
@@ -143,7 +143,7 @@ void Biome::teardownBiomes() {
 Feature* Biome::getTreeFeature( Random* random )
 {
 	if (random->nextInt(10) == 0) {
-		return new BasicTree(false);
+	//	return new BasicTree(false); // temporarily disabled
 	}
 	return new TreeFeature(false);
 }
diff --git a/src/world/level/biome/ForestBiome.h b/src/world/level/biome/ForestBiome.h
index fa47dc0..b28d49d 100755
--- a/src/world/level/biome/ForestBiome.h
+++ b/src/world/level/biome/ForestBiome.h
@@ -16,7 +16,7 @@ public:
             return new BirchFeature();
         }
         if (random->nextInt(3) == 0) {
-            return new BasicTree(false);
+         //   return new BasicTree(false); // temporarily disabled
         }
         return new TreeFeature(false);
     }
diff --git a/src/world/level/biome/RainforestBiome.h b/src/world/level/biome/RainforestBiome.h
index cc80e84..ac94272 100755
--- a/src/world/level/biome/RainforestBiome.h
+++ b/src/world/level/biome/RainforestBiome.h
@@ -13,7 +13,7 @@ class RainforestBiome: public Biome
 public:
     Feature* getTreeFeature(Random* random) {
         if (random->nextInt(3) == 0) {
-            return new BasicTree(false);
+        //    return new BasicTree(false); // temporarily disabled
         }
         return new TreeFeature(false);
     }
diff --git a/src/world/level/tile/Sapling.h b/src/world/level/tile/Sapling.h
index 15877d7..6f697f4 100755
--- a/src/world/level/tile/Sapling.h
+++ b/src/world/level/tile/Sapling.h
@@ -92,7 +92,7 @@ public:
 //             }
         } else {
             if (random->nextInt(10) == 0) {
-                f = new BasicTree(true);
+//                f = new BasicTree(true); // temporarily disabled
             } else
                 f = new TreeFeature(true);
         }