Add grass item support

Debug Screen now also renders mob id nametags like in beta java

SkyDarken is now also no longer clamped in Java Fog Style

CMakeLists.txt

@@ -312,6 +312,7 @@ if(UNIX)
     target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
 
     target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+        "${CMAKE_SOURCE_DIR}/glad/include/"
         "${CMAKE_SOURCE_DIR}/src/"
         "project/lib_projects/raknet/jni/RaknetSources"
     )

data/lang/en_US.lang

@@ -161,6 +161,18 @@ options.fogType.vanilla=Vanilla
 options.fogType.java=Beta Java
 options.fogType.unused=Unused
 
+options.debugStyle=Debug Menu Style
+options.debugStyle.javaBeta=Java Beta
+options.debugStyle.custom=Custom
+
+options.beautifulSky=Beautiful Skies
+
+options.useVignette=Vignette Overlay
+
+options.tintedSide=Tint Grass Sides
+
+options.betaSky=Java Beta Sky
+
 options.restoredAnims=Restored Animations
 
 options.normalLighting=Java Beta/Normals Shading

src/client/Minecraft.cpp

@@ -8,6 +8,7 @@
 #include <string>
 #include <cstdlib>
 
+
 #if defined(APPLE_DEMO_PROMOTION)
     #define NO_NETWORK
 #endif
@@ -91,6 +92,9 @@
 #include "gamemode/CreatorMode.h"
 
 #include "../world/level/GrassColor.h"
+#include "renderer/LevelRenderer.h"
+#include "particle/ParticleEngine.h"
+#include "../world/level/Level.h"
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG
 	while (1) {
@@ -475,19 +479,20 @@ void Minecraft::update() {
 #ifndef STANDALONE_SERVER
 	Multitouch::resetThisUpdate();
 #endif
-	TIMER_POP();
+	
 #ifndef STANDALONE_SERVER
+	TIMER_POP();
 	checkGlError("Update finished");
 
 	if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-#ifndef PLATFORM_DESKTOP
+//#ifndef PLATFORM_DESKTOP
 		if (!PerfTimer::enabled) {
 			PerfTimer::reset();
 			PerfTimer::enabled = true;
 		}
 		_perfRenderer->renderFpsMeter(1);
 		checkGlError("render debug");
-#endif
+//#endif
 	} else {
 		PerfTimer::enabled = false;
 	}
@@ -829,6 +834,12 @@ void Minecraft::tickInput() {
 				}
 			#endif
 
+			if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+				if (key >= '0' && key <= '9') {
+					_perfRenderer->debugFpsMeterKeyPress(key - '0');
+				}
+			}
+
 			if (key == Keyboard::KEY_ESCAPE)
 				pauseGame(false);
 
@@ -1148,14 +1159,18 @@ void Minecraft::init()
 	// now i can finally initialize foliage color, probably not the best way to handle this but i cant be arsed rn
 	FoliageColor::init(foliagePixels);
 
-	TextureId grassId = (textures->loadTexture("misc/foliagecolor.png")); // loading the uh png for foliage color
+	TextureId grassId = (textures->loadTexture("misc/grasscolor.png")); // loading the uh png for foliage color
-	int* grassPixels = textures->loadTexturePixels(grassId, "misc/foliagecolor.png");
+	int* grassPixels = textures->loadTexturePixels(grassId, "misc/grasscolor.png");
 	GrassColor::init(grassPixels);
 	
 	bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
 
+	bool sideTint = options.getBooleanValue(OPTIONS_TINTED_SIDE);
+	TileRenderer::setUseTint(sideTint);
+
+
 	// Platform specific initialization here
 	font = new Font(&options, "font/default8.png", textures);
 
@@ -1406,10 +1421,10 @@ void Minecraft::_levelGenerated()
 		player->resetPos(false);
 	}
 
-	    if (level && level->dimension) {
+    if (level && level->dimension) {
-        // For example, if you want FogType or any other option
+        
-        level->dimension->FogType = options.getBooleanValue(OPTIONS_FOG_TYPE);
+       level->dimension->FogType = options.getIntValue(OPTIONS_FOG_TYPE);
-		}
+	}
 
 
 	this->cameraTargetPlayer = player;
@@ -1437,6 +1452,34 @@ void Minecraft::_levelGenerated()
 	_hasSignaledGeneratingLevelFinished = true;
 }
 
+std::string Minecraft::gatherStats1() {
+#ifndef STANDALONE_SERVER
+    return levelRenderer->gatherStats1();
+#endif
+	return "Blank";
+}
+
+std::string Minecraft::gatherStats2() {
+#ifndef STANDALONE_SERVER
+    return levelRenderer->gatherStats2();
+#endif
+	return "Blank";
+}
+
+std::string Minecraft::gatherStats3() {
+#ifndef STANDALONE_SERVER
+	return ("P: " + particleEngine->countParticles() + ". T: " + (level->gatherStats()));
+#endif
+	return "Blank";
+}
+
+std::string Minecraft::gatherStats4() {
+    return level->gatherChunkSourceStats();
+}
+
+
+
+
 Player* Minecraft::respawnPlayer(int playerId) {
 	for (unsigned int i = 0; i < level->players.size(); ++i) {
 		if (level->players[i]->entityId == playerId) {

src/client/Minecraft.h

@@ -87,6 +87,14 @@ public:
 
 	void update();
 
+	 std::string  gatherStats1();
+
+	 std::string  gatherStats2();
+
+     std::string  gatherStats4();
+
+     std::string  gatherStats3();
+
 	void tick(int nTick, int maxTick);
 	void tickInput();
 

src/client/Options.cpp

@@ -58,6 +58,10 @@ OptionBool ambientOcclusion("ao", true);
 
 OptionBool useNormalLighting("normalLighting", true);
 
+OptionBool beautifulSky("beautifulSky", true);
+
+OptionBool useVignette("useVignette", true);
+
 OptionBool useTouchscreen("useTouchscreen", true);
 
 OptionBool serverVisible("servervisible", true);
@@ -68,10 +72,16 @@ OptionInt fogType("fogType", 0, 0, 2);
 
 OptionBool javaHud("javaHud", false);
 
+OptionBool betaSky("betaSky", false);
+
+OptionBool tintedSide("tintedSide", false);
+
 OptionBool blockOutline("blockOutline", false);
 
 OptionBool restoredAnims("restoredAnims", true);
 
+OptionInt debugStyle("debugStyle", 0, 0, 1);
+
 OptionInt keyForward("key.forward", Keyboard::KEY_W);
 OptionInt keyLeft("key.left", Keyboard::KEY_A);
 OptionInt keyBack("key.back", Keyboard::KEY_S);
@@ -150,6 +160,10 @@ void Options::initTable() {
 
 	m_options[OPTIONS_BLOCK_OUTLINE] = &blockOutline;
 
+	m_options[OPTIONS_VIGNETTE] = &useVignette;
+
+	m_options[OPTIONS_BEAUTIFUL_SKY] = &beautifulSky;
+
 	m_options[OPTIONS_NORMAL_LIGHTING] = &useNormalLighting;
 
 	m_options[OPTIONS_RESTORED_ANIMS] = &restoredAnims;
@@ -183,6 +197,12 @@ void Options::initTable() {
 	// more options yay
 	m_options[OPTIONS_FOG_TYPE] = &fogType;
 
+	m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;
+
+	m_options[OPTIONS_BETA_SKY] = &betaSky;
+
+	m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
+
 	m_options[OPTIONS_JAVA_HUD] = &javaHud;
 
 	m_options[OPTIONS_AUTOJUMP] = &autoJump;

src/client/Options.h

@@ -90,6 +90,11 @@ enum OptionId {
 	OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
+	OPTIONS_TINTED_SIDE,
+	OPTIONS_BETA_SKY,
+	OPTIONS_BEAUTIFUL_SKY,
+	OPTIONS_VIGNETTE,
+	OPTIONS_DEBUG_STYLE,
 	// Should be last!
 	OPTIONS_COUNT
 };

src/client/gui/Gui.cpp

@@ -7,6 +7,7 @@
 #include "screens/ConsoleScreen.h"
 #include "../Minecraft.h"
 #include "../player/LocalPlayer.h"
+#include "../renderer/Chunk.h"
 #include "../renderer/Tesselator.h"
 #include "../renderer/TileRenderer.h"
 #include "../renderer/LevelRenderer.h"
@@ -103,10 +104,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		}
 	}
 
-	// @todo - Shredder: I added this here but currently viginette is broken so i cant do much about it.
+	// viginette has been fixed, was due to gl_blend not being enabled, my bad
-	//	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)){
+	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && minecraft->options.getBooleanValue(OPTIONS_VIGNETTE)){
-	//		this->renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
+			renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
-	//	}
+		}
 	// shredder end
 
 	if(minecraft->player->getSleepTimer() > 0) {
@@ -121,6 +122,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
 		renderToolBar(a, ySlot, screenWidth);
 
+	//	font->drawShadow("Minecraft - Pocket Edition ", 2, 2, 0xffffffff);
+//	font->drawShadow("This is a demo, not the finished product", 2, 10 + 2, 0xffffffff);
+
 		glEnable(GL_BLEND);
 		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
 		unsigned int max = 10;
@@ -360,6 +364,7 @@ void Gui::renderVignette(float br, int w, int h) {
 
 	glDisable(GL_DEPTH_TEST);
 	glDepthMask(false);
+	glEnable(GL_BLEND);
 	glBlendFunc2(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
 	glColor4f2(tbr, tbr, tbr, 1);
 
@@ -376,6 +381,7 @@ void Gui::renderVignette(float br, int w, int h) {
 	t.draw();
 	glDepthMask(true);
 	glEnable(GL_DEPTH_TEST);
+	glDisable(GL_BLEND);
 	glColor4f2(1, 1, 1, 1);
 	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
@@ -726,13 +732,20 @@ void Gui::onLevelGenerated() {
 
 void Gui::renderDebugInfo() {
 	// FPS counter (updates once per second)
-	static float fps = 0.0f;
+	static int fps = 0;
-	static float fpsLastTime = 0.0f;
+	static int fpsLastTime = 0;
 	static int   fpsFrames = 0;
+	static int   displayChunkUpdates = 0;
 	float now = getTimeS();
 	fpsFrames++;
-	if (now - fpsLastTime >= 1.0f) {
+	if (now - fpsLastTime >= 1) {
 		fps = fpsFrames / (now - fpsLastTime);
+
+		displayChunkUpdates = Chunk::updates;
+    
+    // 3. RESET the actual game counter to 0 for the next second
+		Chunk::updates = 0;
+
 		fpsFrames = 0;
 		fpsLastTime = now;
 	}
@@ -770,6 +783,47 @@ void Gui::renderDebugInfo() {
 	long seed      = lvl ? lvl->getSeed() : 0;
 
 	// Build lines (NULL entry = blank gap)
+	Font* font = minecraft->font;
+
+	// @todo - add our own debug screen as an option alongside the restored java one, why does renderdebug have to be so jank - shredder
+
+	// if java beta's restored debug menu is enabled
+	if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 0){
+
+	char buf[128];
+
+	sprintf(buf, "Minecraft - Pocket Edition (%d fps, %d chunk updates)", (int)fps, displayChunkUpdates);
+	font->drawShadow(buf, 2, 2, 0xffffff);
+
+	font->drawShadow(minecraft->gatherStats1(), 2, 12, 0xFFFFFF);
+	font->drawShadow(minecraft->gatherStats2(), 2, 22, 0xFFFFFF);
+    font->drawShadow(minecraft->gatherStats3(), 2, 32, 0xFFFFFF);
+    font->drawShadow(minecraft->gatherStats4(), 2, 42, 0xFFFFFF);
+
+	sprintf(buf, "x: %.8f", minecraft->player->x);
+	drawString(font, buf, 2, 64, 0xE0E0E0);
+
+	sprintf(buf, "y: %.8f", minecraft->player->y);
+	drawString(font, buf, 2, 72, 0xE0E0E0);
+
+	sprintf(buf, "z: %.8f", minecraft->player->z);
+	drawString(font, buf, 2, 80, 0xE0E0E0);
+
+	sprintf(buf, "f: %d",Mth::floor(minecraft->player->yRot * 4.0f / 360.0f + 0.5) & 0x3);
+	drawString(font, buf, 2, 88, 0xE0E0E0);
+
+	sprintf(buf, "Seed: %.ld", lvl->getSeed());
+	drawString(font, buf, 2, 104, 0xE0E0E0);
+
+	sprintf(buf, "Dimension: %d (%s)", lvl->dimension->id, lvl->dimension->getDimension().c_str());
+	drawString(font, buf, 2, 114, 0xE0E0E0);
+
+	sprintf(buf, "Biome: %s", biomeName);
+	drawString(font, buf, 2, 124, 0xE0E0E0);
+	}
+	else if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 1){
+	
+
 	static char ln[8][96];
 	sprintf(ln[0], "Minecraft PE 0.6.1 alpha (mcpe64)");
 	sprintf(ln[1], "%.1f fps", fps);
@@ -784,7 +838,7 @@ void Gui::renderDebugInfo() {
 	const float LH  = (float)Font::DefaultLineHeight; // 10 font-pixels
 	const float MGN = 2.0f;  // left/top margin in font-pixels
 	const float PAD = 2.0f;  // horizontal padding for background
-	Font* font = minecraft->font;
+//	Font* font = minecraft->font;
 	
 	// 1) Draw semi-transparent background boxes behind each line
 	for (int i = 0; i < N; i++) {
@@ -807,6 +861,7 @@ void Gui::renderDebugInfo() {
 		font->draw(ln[i], MGN, y, col);
 	}
 	t.endOverrideAndDraw();
+	}
 }
 
 void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {

src/client/gui/components/GuiElementContainer.cpp

@@ -35,6 +35,17 @@ void GuiElementContainer::removeChild( GuiElement* element ) {
 		children.erase(it);
 }
 
+bool GuiElementContainer::containsPointInChildren(int x, int y) const {
+	for (std::vector<GuiElement*>::const_iterator it = children.begin(); it != children.end(); ++it) {
+		GuiElement* child = *it;
+		if (child == NULL || !child->visible) continue;
+		if (child->pointInside(x, y)) return true;
+		const GuiElementContainer* container = dynamic_cast<const GuiElementContainer*>(child);
+		if (container != NULL && container->containsPointInChildren(x, y)) return true;
+	}
+	return false;
+}
+
 void GuiElementContainer::tick( Minecraft* minecraft ) {
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->tick(minecraft);

src/client/gui/components/GuiElementContainer.h

@@ -13,6 +13,7 @@ public:
 	virtual void setupPositions();
 	virtual void addChild(GuiElement* element);
 	virtual void removeChild(GuiElement* element);
+	bool containsPointInChildren(int x, int y) const;
 
 	virtual void tick( Minecraft* minecraft );
 

src/client/gui/components/OptionsGroup.cpp

@@ -6,14 +6,36 @@
 #include "../../../locale/I18n.h"
 #include "TextOption.h"
 #include "KeyOption.h"
+#include <algorithm>
+#include "../Gui.h"
+#include "../Screen.h"
+#include "../../../platform/input/Mouse.h"
+#include "../../../util/Mth.h"
 
-OptionsGroup::OptionsGroup( std::string labelID )  {
+OptionsGroup::OptionsGroup( std::string labelID )
+: contentHeight(0),
+	scrollOffsetY(0.0f),
+	maxScrollOffsetY(0.0f),
+	trackingScrollGesture(false),
+	scrollingGesture(false),
+	touchDispatched(false),
+	dragStartX(0),
+	dragStartY(0),
+	lastDragY(0),
+	touchStartX(0),
+	touchStartY(0) {
 	label = I18n::get(labelID);
 }
 
 void OptionsGroup::setupPositions() {
+	const int labelHeight = 18;
+	const int bottomPadding = 36;
+	const float requestedScroll = scrollOffsetY;
+	const int scrollOffset = (int)requestedScroll;
+	int curY = y + labelHeight - scrollOffset;
+	const int contentStartY = y + labelHeight;
+
 	// First we write the header and then we add the items
-	int curY = y + 18;
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->width = width - 5;
 		
@@ -22,16 +44,109 @@ void OptionsGroup::setupPositions() {
 		(*it)->setupPositions();
 		curY += (*it)->height + 3;
 	}
-	height = curY;
+	curY += bottomPadding;
+	contentHeight = std::max(0, curY - contentStartY + scrollOffset);
+	maxScrollOffsetY = std::max(0, contentHeight - (height - labelHeight));
+	const float clampedScroll = Mth::clamp(requestedScroll, 0.0f, maxScrollOffsetY);
+	if (clampedScroll != requestedScroll) {
+		scrollOffsetY = clampedScroll;
+		setupPositions();
+	}
 }
 
 void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
 	float padX = 10.0f;
 	float padY = 5.0f;
+	const int labelHeight = 18;
 	
 	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
 
+	glEnable2(GL_SCISSOR_TEST);
+	glScissor(
+		Gui::GuiScale * x,
+		minecraft->height - Gui::GuiScale * (y + height),
+		Gui::GuiScale * width,
+		Gui::GuiScale * (height - labelHeight)
+	);
+
 	super::render(minecraft, xm, ym);
+	glDisable2(GL_SCISSOR_TEST);
+}
+
+void OptionsGroup::tick(Minecraft* minecraft) {
+	int xm = Mouse::getX();
+	int ym = Mouse::getY();
+	if (minecraft->screen != NULL) {
+		minecraft->screen->toGUICoordinate(xm, ym);
+	}
+
+	bool leftDown = Mouse::isButtonDown(MouseAction::ACTION_LEFT);
+
+	if (trackingScrollGesture && leftDown) {
+		int dy = ym - lastDragY;
+		int dx = xm - dragStartX;
+		if (!scrollingGesture) {
+			int totalDx = xm - dragStartX;
+			int totalDy = ym - dragStartY;
+			if (std::abs(totalDx) >= ScrollStartThreshold || std::abs(totalDy) >= ScrollStartThreshold) {
+				if (std::abs(totalDy) >= std::abs(totalDx)) {
+					scrollingGesture = true;
+				} else if (!touchDispatched) {
+					super::mouseClicked(minecraft, touchStartX, touchStartY, MouseAction::ACTION_LEFT);
+					touchDispatched = true;
+				}
+			}
+		}
+		if (scrollingGesture && dy != 0) {
+			scrollByPixels((float)dy);
+		}
+		lastDragY = ym;
+	}
+	super::tick(minecraft);
+}
+
+void OptionsGroup::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	touchDispatched = false;
+
+	if (buttonNum == MouseAction::ACTION_LEFT && pointInside(x, y)) {
+		trackingScrollGesture = true;
+		dragStartX = x;
+		dragStartY = y;
+		lastDragY = y;
+		touchStartX = x;
+		touchStartY = y;
+		return;
+	}
+
+	super::mouseClicked(minecraft, x, y, buttonNum);
+}
+
+void OptionsGroup::mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum) {
+	bool wasScrolling = scrollingGesture;
+	bool wasTracking = trackingScrollGesture;
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	if (buttonNum == MouseAction::ACTION_LEFT && wasTracking && !touchDispatched && pointInside(touchStartX, touchStartY)) {
+		super::mouseClicked(minecraft, touchStartX, touchStartY, buttonNum);
+		touchDispatched = true;
+	}
+
+	if (!wasScrolling) {
+		super::mouseReleased(minecraft, x, y, buttonNum);
+	}
+}
+
+void OptionsGroup::scrollByPixels(float deltaY) {
+	if (deltaY == 0.0f || maxScrollOffsetY <= 0.0f) return;
+
+	scrollOffsetY = Mth::clamp(scrollOffsetY - deltaY, 0.0f, maxScrollOffsetY);
+	setupPositions();
+}
+
+bool OptionsGroup::isScrollingGestureActive() const {
+	return trackingScrollGesture || scrollingGesture;
 }
 
 OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {

src/client/gui/components/OptionsGroup.h

@@ -17,7 +17,12 @@ public:
 	OptionsGroup(std::string labelID);
 	virtual void setupPositions();
 	virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void tick(Minecraft* minecraft);
+	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum);
 	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	void scrollByPixels(float deltaY);
+	bool isScrollingGestureActive() const;
 protected:
 
 	void createToggle(OptionId optId, Minecraft* minecraft);
@@ -27,6 +32,18 @@ protected:
 	void createKey(OptionId optId, Minecraft* minecraft);
 
 	std::string label;
+	int contentHeight;
+	float scrollOffsetY;
+	float maxScrollOffsetY;
+	bool trackingScrollGesture;
+	bool scrollingGesture;
+	bool touchDispatched;
+	int dragStartX;
+	int dragStartY;
+	int lastDragY;
+	int touchStartX;
+	int touchStartY;
+	static const int ScrollStartThreshold = 5;
 };
 
 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/

src/client/gui/components/OptionsItem.cpp

@@ -36,7 +36,7 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		}
 		text += ": " + scaleText;
 	}
-		if (m_optionId == OPTIONS_FOG_TYPE) {
+	if (m_optionId == OPTIONS_FOG_TYPE) {
 		int value = minecraft->options.getIntValue(OPTIONS_FOG_TYPE);
 		std::string scaleText;
 		switch (value) {
@@ -46,6 +46,16 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		}
 		text += ": " + scaleText;
 	}
+	if (m_optionId == OPTIONS_DEBUG_STYLE) {
+		int value = minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE);
+		std::string scaleText;
+		switch (value) {
+		case 0: scaleText = I18n::get("options.debugStyle.javaBeta"); break;
+		case 1: scaleText = I18n::get("options.debugStyle.custom"); break;
+		case 2: scaleText = I18n::get("options.fogType.unused"); break;
+		}
+		text += ": " + scaleText;
+	}
 
 	minecraft->font->draw(text, (float)x, (float)y + yOffset, 0x909090, false);
 	super::render(minecraft, xm, ym);

src/client/gui/screens/OptionsScreen.cpp

@@ -121,6 +121,7 @@ void OptionsScreen::setupPositions() {
 			(*it)->x = categoryButtons[0]->width;
 			(*it)->y = bHeader->height;
 			(*it)->width = width - categoryButtons[0]->width;
+			(*it)->height = height - bHeader->height;
 
 			(*it)->setupPositions();
 		}
@@ -227,15 +228,20 @@ void OptionsScreen::generateOptionScreens() {
 		.addOptionItem(OPTIONS_ANAGLYPH_3D, minecraft)
 		.addOptionItem(OPTIONS_VIEW_BOBBING, minecraft)
 		.addOptionItem(OPTIONS_AMBIENT_OCCLUSION, minecraft)
-		.addOptionItem(OPTIONS_NORMAL_LIGHTING, minecraft);
+		.addOptionItem(OPTIONS_NORMAL_LIGHTING, minecraft)
+		.addOptionItem(OPTIONS_BEAUTIFUL_SKY, minecraft)
+		.addOptionItem(OPTIONS_VIGNETTE, minecraft);
 
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
+		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
 		.addOptionItem(OPTIONS_JAVA_HUD, minecraft)
 		.addOptionItem(OPTIONS_FOG_TYPE, minecraft)
-		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft);
+		.addOptionItem(OPTIONS_BETA_SKY, minecraft)
+		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft)
+		.addOptionItem(OPTIONS_DEBUG_STYLE, minecraft);
 		
 }
 
@@ -253,6 +259,12 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 	super::mouseReleased(x, y, buttonNum);
 }
 
+void OptionsScreen::mouseWheel(int dx, int dy, int xm, int ym) {
+	if (currentOptionsGroup != NULL && currentOptionsGroup->pointInside(xm, ym) && dy != 0) {
+		currentOptionsGroup->scrollByPixels((float)dy * 18.0f);
+	}
+}
+
 void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);

src/client/gui/screens/OptionsScreen.h

@@ -27,6 +27,7 @@ public:
 
 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void mouseWheel(int dx, int dy, int xm, int ym);
 	virtual void keyPressed(int eventKey);
 	virtual void charPressed(char inputChar);
 	

src/client/renderer/GameRenderer.cpp

@@ -272,17 +272,7 @@ void GameRenderer::renderLevel(float a) {
 				screenScissorArea.w, screenScissorArea.h);
 		}
 
-		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
+
-			setupFog(-1);
-			TIMER_POP_PUSH("sky");
-			glFogf(GL_FOG_START, renderDistance  * 0.2f);
-			glFogf(GL_FOG_END, renderDistance *0.75);
-			// levelRenderer->renderSky(a); // Removed duplicate call
-			glFogf(GL_FOG_START, renderDistance  * 0.6f);
-			glFogf(GL_FOG_END, renderDistance);
-		}
-		glEnable2(GL_FOG);
-		setupFog(1);
 
 		if (mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION)) {
 			glShadeModel2(GL_SMOOTH);
@@ -295,10 +285,29 @@ void GameRenderer::renderLevel(float a) {
 		TIMER_POP_PUSH("culling");
 		mc->levelRenderer->cull(&frustum, a);
 		mc->levelRenderer->updateDirtyChunks(cameraEntity, false);
+		// this sky rendering code below was originally before the frustrum and culling stuff but sunset color breaks for some reason in that place, so i moved i after those two - shredder
+//		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
+			setupFog(-1);
+			TIMER_POP_PUSH("sky");
+			// @TODO - EXTREME JANK BELOW, it works but i have to do heavy cleanup here, also to test if the glfogf commands even affect fog in anyway.
+			if(mc->options.getBooleanValue(OPTIONS_BETA_SKY) && (mc->options.getIntValue(OPTIONS_VIEW_DISTANCE) < 2)){
+			levelRenderer->renderSky(a); // how java renders the sky instead of how pe doing prepareandrenderclouds.
+			} else if (!mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+			glFogf(GL_FOG_START, renderDistance  * 0.2f);
+			glFogf(GL_FOG_END, renderDistance *0.75);
 
+			glFogf(GL_FOG_START, renderDistance  * 0.6f);
+			glFogf(GL_FOG_END, renderDistance);
+			}
+//		}
+		glEnable2(GL_FOG);
+		setupFog(1);
+		// MCPE renders clouds using this, but this method breaks 3d clouds and also breaks 2d clouds transparency viewed from above, add as a Legacy Sky or Fast Sky option. - shredder
+		if(!mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
 		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) { 
 			prepareAndRenderClouds(levelRenderer, a);
 		}
+		}
 
 		setupFog(0);
 		glEnable2(GL_FOG);
@@ -306,7 +315,9 @@ void GameRenderer::renderLevel(float a) {
 		mc->textures->loadAndBindTexture("terrain.png");
 		Lighting::turnOff();
 
-		glDisable2(GL_ALPHA_TEST);
+//		glDisable2(GL_ALPHA_TEST); // vanilla pe disables alpha test here, i renable it so grass side textures dont become opaque - shredder
+		glEnable2(GL_ALPHA_TEST); // 
+
 		glDisable2(GL_BLEND);
 		glEnable2(GL_CULL_FACE);
 		TIMER_POP_PUSH("terrain-0");
@@ -374,11 +385,14 @@ void GameRenderer::renderLevel(float a) {
 		}
 
 		glDisable2(GL_FOG);
-		//
+		// Normally this is commented out, but this is how java does it and should fix both 2d/3d clouds, a
-		//        setupFog(0);
+		if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		//        glEnable2(GL_FOG);
+		       setupFog(0);
-		////        levelRenderer->renderClouds(a);
+		       glEnable2(GL_FOG);
-		//        glDisable2(GL_FOG);
+		        levelRenderer->renderClouds(a);
+		        glDisable2(GL_FOG);
+		}
+		// SHREDDER END
 		setupFog(1);
 
 		if (zoom == 1 && !mc->options.getBooleanValue(OPTIONS_HIDEGUI)) {

src/client/renderer/ItemInHandRenderer.cpp

@@ -443,10 +443,10 @@ void ItemInHandRenderer::renderScreenEffect( float a )
 		}
 	}
 
-	//     if (mc->player->isUnderLiquid(Material::water)) {
+	     if (mc->player->isUnderLiquid(Material::water)) {
-	//mc->textures->loadAndBindTexture("misc/water.png");
+			 mc->textures->loadAndBindTexture("misc/water.png");
-	//         renderWater(a);
+	         renderWater(a);
-	//     }
+	     }
 	glEnable2(GL_ALPHA_TEST);
 }
 

src/client/renderer/LevelRenderer.cpp

@@ -76,6 +76,9 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	//for (int i = 0; i < numListsOrBuffers; ++i) printf("bufId %d: %d\t", i, chunkBuffers[i]);
 
 	glGenBuffers2(1, &skyBuffer);
+	glGenBuffers2(1, &voidBuffer);
+	glGenBuffers2(1, &starBuffer);
+	generateStars();
 	generateSky();
 #else
 	int maxChunksWidth = 1024 / CHUNK_SIZE;
@@ -94,6 +97,8 @@ LevelRenderer::~LevelRenderer()
 #ifdef OPENGL_ES
 	glDeleteBuffers(numListsOrBuffers, chunkBuffers);
 	glDeleteBuffers(1, &skyBuffer);
+	glDeleteBuffers(1, &voidBuffer);
+	glDeleteBuffers(1, &starBuffer);
 	delete[] chunkBuffers;
 #else
 	glDeleteLists(numListsOrBuffers, chunkLists);
@@ -121,6 +126,25 @@ void LevelRenderer::generateSky() {
 	}
 
 	t.end(true, skyBuffer);
+
+	yy = (float) (-16);
+	t.begin();
+
+	// pretty much the same thing as the sky one above except uses inverted values to generate the void plane. 
+
+	voidVertexCount = 0;
+	for (int xx = -s * d; xx <= s * d; xx += s) {
+		for (int zz = -s * d; zz <= s * d; zz += s) {
+			t.vertex((float) xx + 0,  yy, (float) zz + s);
+			t.vertex((float)(xx + s), yy, (float) zz + s);
+			t.vertex((float)(xx + s), yy, (float)(zz + 0));
+			t.vertex((float) xx + 0,  yy, (float)(zz + 0));
+			//LOGI("x, z: %d, %d\n", xx, zz);
+			voidVertexCount += 4;
+		}
+	}
+
+	t.end(true, voidBuffer);
 	//LOGI("skyvertexcount: %d\n", skyVertexCount);
 	//glEndList();
 }
@@ -146,10 +170,6 @@ void LevelRenderer::setLevel( Level* level )
 		level->addListener(this);
 		allChanged();
 	}
-	if (mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION)) {
-		mc->useAmbientOcclusion = !mc->useAmbientOcclusion;
-		allChanged();
-	}
 }
 
 void LevelRenderer::allChanged()
@@ -168,6 +188,9 @@ void LevelRenderer::allChanged()
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
 
+	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
+	TileRenderer::setUseTint(sideTint);
+
 
 	int dist = (512 >> 3) << (3 - lastViewDistance);
 	if (lastViewDistance <= 2 && mc->isPowerVR())
@@ -325,6 +348,37 @@ int LevelRenderer::render( Mob* player, int layer, float alpha )
 
 		allChanged(); 
 	}
+	bool SmoothLightState = mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION);
+	if (SmoothLightState != mc->useAmbientOcclusion){
+		mc->useAmbientOcclusion = SmoothLightState;
+		allChanged();
+	}
+
+
+	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
+	if (tint != LastTint) {
+		LastTint = tint;
+
+
+		FoliageColor::setUseTint(tint);
+		GrassColor::setUseTint(tint);
+
+		allChanged(); 
+	}
+
+
+	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
+
+	if (sideTint != LastSideTint) {
+		LastSideTint = sideTint;
+
+
+		TileRenderer::setUseTint(sideTint);
+
+		allChanged(); 
+	}
+
+
 
 	TIMER_PUSH("sortchunks");
 	for (int i = 0; i < 10; i++) {
@@ -513,14 +567,14 @@ void LevelRenderer::render(const AABB& b) const
 {
 	Tesselator& t = Tesselator::instance;
 
-//	glColor4f2(1, 1, 1, 1);
+	//	glColor4f2(1, 1, 1, 1);
 
-//	textures->loadAndBindTexture("terrain.png"); // uh need to check java - shredder
+	//	textures->loadAndBindTexture("terrain.png"); // uh need to check java - shredder
 
 	//t.begin();
-//	t.color(255, 255, 255, 255); // again not needed, for some reason the vanilla source code tints it... white? maybe this was used for something else in MCPE's dev at one point? - shredder
+	//	t.color(255, 255, 255, 255); // again not needed, for some reason the vanilla source code tints it... white? maybe this was used for something else in MCPE's dev at one point? - shredder
 
-//	t.offset(((Mob*)mc->player)->getPos(0).negated()); // why does this even exist normally, it just makes the thing... not render
+	//	t.offset(((Mob*)mc->player)->getPos(0).negated()); // why does this even exist normally, it just makes the thing... not render
 
 	t.begin(GL_LINE_STRIP);
 	t.vertex(b.x0, b.y0, b.z0);
@@ -1009,13 +1063,66 @@ std::string LevelRenderer::gatherStats1() {
 }
 
 //
-//    /*public*/ std::string gatherStats2() {
+    std::string LevelRenderer::gatherStats2() {
-//        return "E: " + renderedEntities + "/" + totalEntities + ". B: " + culledEntities + ", I: " + ((totalEntities - culledEntities) - renderedEntities);
+		std::stringstream ss;
-//    }
+		ss << "E: "<< renderedEntities << "/" << totalEntities << ". B: " << culledEntities << ", I: " << (totalEntities - culledEntities) - renderedEntities <<"\n";
+        return ss.str();
+    }
 //
 //    int[] toRender = new int[50000];
 //    IntBuffer resultBuffer = MemoryTracker.createIntBuffer(64);
 
+   void LevelRenderer::generateStars() {
+	   // ported from java beta again,
+	   // converted the doubles into floats to be consistent, shouldnt affect much - shredder
+
+      Random random = Random(10842L);
+      Tesselator& t = Tesselator::instance;
+      t.begin();
+	  starVertexCount = 0;
+
+      for (int i = 0; i < 1500; i++) {
+         float d = random.nextFloat() * 2.0F - 1.0F;
+         float e = random.nextFloat() * 2.0F - 1.0F;
+         float f = random.nextFloat() * 2.0F - 1.0F;
+         float g = 0.25F + random.nextFloat() * 0.25F;
+         float h = d * d + e * e + f * f;
+         if (h < 1.0 && h > 0.01) {
+            h = 1.0 / Mth::sqrt(h);
+            d *= h;
+            e *= h;
+            f *= h;
+            float j = d * 100.0;
+            float k = e * 100.0;
+            float l = f * 100.0;
+            float m = Mth::atan2(d, f);
+            float n = Mth::sin(m);
+            float o = Mth::cos(m);
+            float p = Mth::atan2(Mth::sqrt(d * d + f * f), e);
+            float q = Mth::sin(p);
+            float r = Mth::cos(p);
+            float s = random.nextDouble() * Mth::PI * 2.0;
+            float t2 = Mth::sin(s);
+            float u = Mth::cos(s);
+
+            for (int v = 0; v < 4; v++) {
+               float w = 0.0;
+               float x = ((v & 2) - 1) * g;
+               float y = ((v + 1 & 2) - 1) * g;
+               float aa = x * u - y * t2;
+               float ab = y * u + x * t2;
+               float ad = aa * q + w * r;
+               float ae = w * q - aa * r;
+               float af = ae * n - ab * o;
+               float ah = ab * n + ae * o;
+               t.vertex(j + af, k + ad, l + ah);
+            }
+			starVertexCount += 4;
+         }
+      }
+
+      t.end(true, starBuffer);
+   }
 void LevelRenderer::renderSky(float alpha) {
 	if (mc->level->dimension->foggy) return;
 
@@ -1036,19 +1143,125 @@ void LevelRenderer::renderSky(float alpha) {
 	}
 	glColor4f2(sr, sg, Mth::Min(1.0f, sb), 1);
 
-	//Tesselator& t = Tesselator::instance;
+	Tesselator& t = Tesselator::instance;
-
+	// @TODO shredder - should not enable or disable depth mask if using legacy sky because mcpe sky rendering is awful and will render clouds above terrain
+	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+		glDepthMask(false);
+	}
 	glEnable2(GL_FOG);
 	glColor4f2(sr, sg, sb, 1.0f);
 
 #ifdef OPENGL_ES
 	drawArrayVT(skyBuffer, skyVertexCount);
 #endif
-	glEnable2(GL_TEXTURE_2D);
+		glDisable(GL_FOG);
+	glDisable(GL_ALPHA_TEST);
+
+	// thanks to the mcpe 0.1 decomp project a bit for this part, was not getting the gl states correctly, gles is painful - shredder
+
+	// Sunrise
+	if (mc->options.getBooleanValue(OPTIONS_BEAUTIFUL_SKY)) {
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	float* c = level->dimension->getSunriseColor(level->getTimeOfDay(alpha), alpha);
+	if (c != nullptr)
+	{
+		glDisable(GL_TEXTURE_2D);
+
+
+		glPushMatrix();
+		glRotatef(90.0f, 1.0f, 0.0f, 0.0f);
+		glRotatef(level->getTimeOfDay(alpha) > 0.5f ? 180 : 0, 0.0f, 0.0f, 1.0f);
+
+		t.begin(GL_TRIANGLE_FAN);
+		t.color(c[0], c[1], c[2], c[3]);
+		t.vertex(0.0f, 100.0f, 0.0f);
+		t.color(c[0], c[1], c[2], 0.0f);
+
+		int steps = 16;
+		for (int i = 0; i <= steps; i++)
+		{
+			float a = i * 3.1415927f * 2.0f / steps;
+			float sin = Mth::sin(a);
+			float cos = Mth::cos(a);
+			t.vertex((sin * 120.0f), (cos * 120.0f), (-cos * 40.0f * c[3]));
+		}
+
+		t.draw();
+		glPopMatrix();
+	}
+
+	// gets the time of day and rotates the sun and moon png based on the time
+	glEnable(GL_TEXTURE_2D);
+	glBlendFunc(GL_ONE, GL_ONE);
+	glPushMatrix();
+
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+	glTranslatef(sc.x, sc.y, sc.z);
+	glRotatef(0.0f, 0.0f, 0.0f, 1.0f);
+	glRotatef(level->getTimeOfDay(alpha) * 360.0f, 1.0f, 0.0f, 0.0f);
+
+	float ss = 30.0f;
+
+
+		textures->loadAndBindTexture("terrain/sun.png");
+		t.begin();
+		t.vertexUV(-ss, 100.0f, -ss, 0.0f, 0.0f);
+		t.vertexUV(ss, 100.0f, -ss, 1.0f, 0.0f);
+		t.vertexUV(ss, 100.0f, ss, 1.0f, 1.0f);
+		t.vertexUV(-ss, 100.0f, ss, 0.0f, 1.0f);
+		t.draw();
+
+		ss = 20.0f;
+		textures->loadAndBindTexture("terrain/moon.png");
+		t.begin();
+		t.vertexUV(-ss, -100.0f, ss, 1.0f, 1.0f);
+		t.vertexUV(ss, -100.0f, ss, 0.0f, 1.0f);
+		t.vertexUV(ss, -100.0f, -ss, 0.0f, 0.0f);
+		t.vertexUV(-ss, -100.0f, -ss, 1.0f, 0.0f);
+		t.draw();
+	
+
+	glDisable(GL_TEXTURE_2D);
+
+	float a = level->getStarBrightness(alpha);
+	if (a > 0.0f)
+	{
+		glColor4f(a, a, a, a);
+		drawArrayVT(starBuffer, starVertexCount);
+	}
+	}
+
+	
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+	glDisable(GL_BLEND);
+	glEnable(GL_ALPHA_TEST);
+	glEnable(GL_FOG);
+	glPopMatrix();
+
+	// ported over void plane (the blue bottom plane seen in java) because pocket edition lacks it @TODO test if it's buggy - shredder
+
+//	glColor3f(sc.x * 0.2f + 0.04f, sc.y * 0.2f + 0.04f, sc.z * 0.6f + 0.1f);
+	glColor4f(sc.x * 0.2f + 0.04f, sc.y * 0.2f + 0.04f, sc.z * 0.6f + 0.1f, 1.0f);
+	glDisable(GL_TEXTURE_2D);
+	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+		drawArrayVT(voidBuffer, voidVertexCount);
+	}
+	glEnable(GL_TEXTURE_2D);
+
+	// @TODO shredder - should not enable or disable depth mask if using legacy sky because mcpe sky rendering is awful and will render clouds above terrain
+	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+		glDepthMask(true);
+	}
 }
 
 void LevelRenderer::renderClouds( float alpha ) {
 	//if (!mc->level->dimension->isNaturalDimension()) return;
+	if (mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+		renderAdvancedClouds(alpha);
+		return;
+	}
 	glEnable2(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 	float yOffs = (float) (mc->player->yOld + (mc->player->y - mc->player->yOld) * alpha);
@@ -1097,6 +1310,142 @@ void LevelRenderer::renderClouds( float alpha ) {
 	glEnable(GL_CULL_FACE);
 }
 
+void LevelRenderer::renderAdvancedClouds(float alpha) {
+
+	// ported from java beta, tesselation code for the 3d clouds, renders broken if mcpe sky rendering option is used - shredder
+
+	glDisable(GL_CULL_FACE);
+
+	float px = mc->player->xOld + (mc->player->x - mc->player->xOld) * alpha;
+	float py = mc->player->yOld + (mc->player->y - mc->player->yOld) * alpha;
+	float pz = mc->player->zOld + (mc->player->z - mc->player->zOld) * alpha;
+
+	Tesselator& t = Tesselator::instance;
+	float ss = 12.0f; 
+	float h = 4.0f;  
+
+	float cloudTime = (float)ticks + alpha;
+
+	double xo = (px + cloudTime * 0.03f) / ss;
+	double zo = pz / ss + 0.33f;
+
+	float yy = 108.0f - py + 0.33f;
+
+	int xWraps = Mth::floor(xo / 2048.0);
+	int zWraps = Mth::floor(zo / 2048.0);
+	xo -= xWraps * 2048;
+	zo -= zWraps * 2048;
+
+	textures->loadAndBindTexture("environment/clouds.png");
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	Vec3 cc = level->getCloudColor(alpha);
+	float cr = cc.x;
+	float cg = cc.y;
+	float cb = cc.z;
+
+	float uvScale = 1.0f / 256.0f;
+	float uo = (float)Mth::floor(xo) * uvScale;
+	float vo = (float)Mth::floor(zo) * uvScale;
+
+	float xOffs = (float)(xo - Mth::floor(xo));
+	float zOffs = (float)(zo - Mth::floor(zo));
+
+	int D = 8;      
+	int radius = 3;  
+	float e = 1.0f / 1024.0f; 
+
+	glPushMatrix();
+	glScalef(ss, 1.0f, ss);
+
+	for (int pass = 0; pass < 2; pass++) {
+
+		if (pass == 0) glColorMask(false, false, false, false);
+		else glColorMask(true, true, true, true);
+
+		for (int xPos = -radius + 1; xPos <= radius; xPos++) {
+			for (int zPos = -radius + 1; zPos <= radius; zPos++) {
+				t.begin();
+				float xx = (float)(xPos * D);
+				float zz = (float)(zPos * D);
+				float xp = xx - xOffs;
+				float zp = zz - zOffs;
+
+
+				if (yy > -h - 1.0f) {
+					t.color(cr * 0.7f, cg * 0.7f, cb * 0.7f, 0.8f);
+					t.normal(0.0f, -1.0f, 0.0f);
+					t.vertexUV(xp + 0, yy + 0, zp + D, (xx + 0) * uvScale + uo, (zz + D) * uvScale + vo);
+					t.vertexUV(xp + D, yy + 0, zp + D, (xx + D) * uvScale + uo, (zz + D) * uvScale + vo);
+					t.vertexUV(xp + D, yy + 0, zp + 0, (xx + D) * uvScale + uo, (zz + 0) * uvScale + vo);
+					t.vertexUV(xp + 0, yy + 0, zp + 0, (xx + 0) * uvScale + uo, (zz + 0) * uvScale + vo);
+				}
+
+
+				if (yy <= h + 1.0f) {
+					t.color(cr, cg, cb, 0.8f);
+					t.normal(0.0f, 1.0f, 0.0f);
+					t.vertexUV(xp + 0, yy + h - e, zp + D, (xx + 0) * uvScale + uo, (zz + D) * uvScale + vo);
+					t.vertexUV(xp + D, yy + h - e, zp + D, (xx + D) * uvScale + uo, (zz + D) * uvScale + vo);
+					t.vertexUV(xp + D, yy + h - e, zp + 0, (xx + D) * uvScale + uo, (zz + 0) * uvScale + vo);
+					t.vertexUV(xp + 0, yy + h - e, zp + 0, (xx + 0) * uvScale + uo, (zz + 0) * uvScale + vo);
+				}
+
+				t.color(cr * 0.9f, cg * 0.9f, cb * 0.9f, 0.8f);
+
+
+				if (xPos > -1) {
+					t.normal(-1.0f, 0.0f, 0.0f);
+					for (int i = 0; i < D; i++) {
+						t.vertexUV(xp + i + 0, yy + 0, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
+						t.vertexUV(xp + i + 0, yy + h, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
+						t.vertexUV(xp + i + 0, yy + h, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
+						t.vertexUV(xp + i + 0, yy + 0, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
+					}
+				}
+				if (xPos <= 1) {
+					t.normal(1.0f, 0.0f, 0.0f);
+					for (int i = 0; i < D; i++) {
+						t.vertexUV(xp + i + 1 - e, yy + 0, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
+						t.vertexUV(xp + i + 1 - e, yy + h, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
+						t.vertexUV(xp + i + 1 - e, yy + h, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
+						t.vertexUV(xp + i + 1 - e, yy + 0, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
+					}
+				}
+
+				t.color(cr * 0.8f, cg * 0.8f, cb * 0.8f, 0.8f);
+
+
+				if (zPos > -1) {
+					t.normal(0.0f, 0.0f, -1.0f);
+					for (int i = 0; i < D; i++) {
+						t.vertexUV(xp + 0, yy + h, zp + i + 0, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+						t.vertexUV(xp + D, yy + h, zp + i + 0, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+						t.vertexUV(xp + D, yy + 0, zp + i + 0, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+						t.vertexUV(xp + 0, yy + 0, zp + i + 0, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+					}
+				}
+				if (zPos <= 1) {
+					t.normal(0.0f, 0.0f, 1.0f);
+					for (int i = 0; i < D; i++) {
+						t.vertexUV(xp + 0, yy + h, zp + i + 1 - e, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+						t.vertexUV(xp + D, yy + h, zp + i + 1 - e, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+						t.vertexUV(xp + D, yy + 0, zp + i + 1 - e, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+						t.vertexUV(xp + 0, yy + 0, zp + i + 1 - e, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
+					}
+				}
+				t.endOverrideAndDraw();
+			}
+		}
+	}
+
+	glPopMatrix();
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+	glDisable(GL_BLEND);
+	glEnable(GL_CULL_FACE);
+}
+
 void LevelRenderer::playSound(const std::string& name, float x, float y, float z, float volume, float pitch) {
 	// @todo: deny sounds here if sound is off (rather than waiting 'til SoundEngine)
 	float dd = 16;
@@ -1259,6 +1608,7 @@ void LevelRenderer::renderHitSelect( Player* player, const HitResult& h, int mod
 
 void LevelRenderer::onGraphicsReset()
 {
+	generateStars();
 	generateSky();
 
 	// Get new buffers

src/client/renderer/LevelRenderer.h

@@ -43,7 +43,9 @@ public:
 	void renderDebug(const AABB& b, float a) const;
 
 	void renderSky(float alpha);
+	void generateStars();
 	void renderClouds(float alpha);
+	void renderAdvancedClouds(float alpha);
 	void renderEntities(Vec3 cam, Culler* culler, float a);
     void renderSameAsLast(int layer, float alpha);
 	void renderHit(Player* player, const HitResult& h, int mode, /*ItemInstance*/void* inventoryItem, float a);
@@ -67,6 +69,7 @@ public:
 	void levelEvent(Player* source, int type, int x, int y, int z, int data);
 
 	std::string gatherStats1();
+	std::string gatherStats2();
 
 	void render(const AABB& b) const;
 	void onGraphicsReset();
@@ -116,6 +119,9 @@ private:
 	// shredder added again...
 	int lastFogType;
 
+	bool LastTint;
+	bool LastSideTint;
+
 	int ticks;
     int starList, skyList, darkList;
 
@@ -124,6 +130,12 @@ private:
 	GLuint skyBuffer;
 	int skyVertexCount;
 
+	GLuint voidBuffer;
+	int voidVertexCount;
+
+	GLuint starBuffer;
+	int starVertexCount;
+
 //    /*public*/ std::vector<TileEntity*> renderableTileEntities;
     Textures* textures;
 //    /*private*/ TileRenderer tileRenderer;

src/client/renderer/TileRenderer.cpp

@@ -19,8 +19,10 @@
 #include "tileentity/TileEntityRenderer.h"
 #include "EntityTileRenderer.h"
 
-TileRenderer::TileRenderer( LevelSource* level /* = NULL */ )
+bool TileRenderer::sideTinting = false;
-:	level(level),
+
+TileRenderer::TileRenderer(LevelSource* level /* = NULL */ )
+	:	level(level),
 	fixedTexture(-1),
 	xFlipTexture(false),
 	noCulling(false),
@@ -58,6 +60,11 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 	float c2 = 0.8f;
 	float c3 = 0.6f;
 
+	// added these to get biome color and save it before its overriden - shredder
+	float biomeR = r;
+	float biomeG = g;
+	float biomeB = b;
+
 
 	float r11 = c11 * r;
 	float g11 = c11 * g;
@@ -101,6 +108,10 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->zz0 > 0) br = centerBrightness;
 		t.color(r2 * br, g2 * br, b2 * br);
 		renderNorth(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 2));
+		if ((tt->getTexture(level, x, y, z, 2) == 3) && sideTinting) { // checking if the texture from terrain.png is the normal grass side texture
+			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
+			renderNorth(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
+		}
 		changed = true;
 	}
 
@@ -109,6 +120,10 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->zz1 < 1) br = centerBrightness;
 		t.color(r2 * br, g2 * br, b2 * br);
 		renderSouth(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 3));
+		if ((tt->getTexture(level, x, y, z, 3) == 3) && sideTinting){ // checking if the texture from terrain.png is the normal grass side texture
+			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
+			renderSouth(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
+		}
 		changed = true;
 	}
 
@@ -117,6 +132,10 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->xx0 > 0) br = centerBrightness;
 		t.color(r3 * br, g3 * br, b3 * br);
 		renderWest(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 4));
+		if ((tt->getTexture(level, x, y, z, 4) == 3) && sideTinting) { // checking if the texture from terrain.png is the normal grass side texture
+			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
+			renderWest(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
+		}
 		changed = true;
 	}
 
@@ -125,6 +144,10 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->xx1 < 1) br = centerBrightness;
 		t.color(r3 * br, g3 * br, b3 * br);
 		renderEast(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 5));
+		if ((tt->getTexture(level, x, y, z, 5) == 3) && sideTinting) { // checking if the texture from terrain.png is the normal grass side texture
+			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
+			renderEast(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
+		}
 		changed = true;
 	}
 
@@ -148,38 +171,38 @@ bool TileRenderer::tesselateInWorld( Tile* tt, int x, int y, int z )
 		return tesselateBlockInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_WATER) {
 		return tesselateWaterInWorld(tt, x, y, z);
-    } else if (shape == Tile::SHAPE_CACTUS) {
+	} else if (shape == Tile::SHAPE_CACTUS) {
-        return tesselateCactusInWorld(tt, x, y, z);
+		return tesselateCactusInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_CROSS_TEXTURE) {
 		return tesselateCrossInWorld(tt, x, y, z);
 	} else if(shape == Tile::SHAPE_STEM) {
 		return tesselateStemInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_ROWS) {
-        return tesselateRowInWorld(tt, x, y, z);
+		return tesselateRowInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_TORCH) {
 		return tesselateTorchInWorld(tt, x, y, z);
-    } else if (shape == Tile::SHAPE_FIRE) {
+	} else if (shape == Tile::SHAPE_FIRE) {
-        return tesselateFireInWorld(tt, x, y, z);
+		return tesselateFireInWorld(tt, x, y, z);
-    //} else if (shape == Tile::SHAPE_RED_DUST) {
+		//} else if (shape == Tile::SHAPE_RED_DUST) {
-    //    return tesselateDustInWorld(tt, x, y, z);
+		//    return tesselateDustInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_LADDER) {
 		return tesselateLadderInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_DOOR) {
 		return tesselateDoorInWorld(tt, x, y, z);
-    //} else if (shape == Tile::SHAPE_RAIL) {
+		//} else if (shape == Tile::SHAPE_RAIL) {
-    //    return tesselateRailInWorld(tt, x, y, z);
+		//    return tesselateRailInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_STAIRS) {
 		return tesselateStairsInWorld((StairTile*)tt, x, y, z);
-    } else if (shape == Tile::SHAPE_FENCE) {
+	} else if (shape == Tile::SHAPE_FENCE) {
-        return tesselateFenceInWorld((FenceTile*)tt, x, y, z);
+		return tesselateFenceInWorld((FenceTile*)tt, x, y, z);
 	} else if (shape == Tile::SHAPE_FENCE_GATE) {
 		return tesselateFenceGateInWorld((FenceGateTile*) tt, x, y, z);
-    //} else if (shape == Tile::SHAPE_LEVER) {
+		//} else if (shape == Tile::SHAPE_LEVER) {
-    //    return tesselateLeverInWorld(tt, x, y, z);
+		//    return tesselateLeverInWorld(tt, x, y, z);
-    //} else if (shape == Tile::SHAPE_BED) {
+		//} else if (shape == Tile::SHAPE_BED) {
-    //    return tesselateBedInWorld(tt, x, y, z);
+		//    return tesselateBedInWorld(tt, x, y, z);
-    //} else if (shape == Tile::SHAPE_DIODE) {
+		//} else if (shape == Tile::SHAPE_DIODE) {
-    //    return tesselateDiodeInWorld(tt, x, y, z);
+		//    return tesselateDiodeInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_IRON_FENCE) {
 		return tesselateThinFenceInWorld((ThinFenceTile*) tt, x, y, z);
 	} else if(shape == Tile::SHAPE_BED) {
@@ -340,82 +363,82 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 		if ( Tile::fire->canBurn( level, x - 1, y, z ) )
 		{
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
+				1.0f ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
+				1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
+				0.0f ), ( float )( u0 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
+				0.0f ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
+				1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
+				1.0f ), ( float )( u1 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x + 1, y, z ) )
 		{
 			t.vertexUV( ( float )( x + 1 - r ), ( float )( y + h + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
+				0.0f ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1 - 0 ), ( float )( y + 0 + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1 - 0 ), ( float )( y + 0 + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
+				1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1 - r ), ( float )( y + h + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
+				1.0f ), ( float )( u1 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + 1.0f - r ), ( float )( y + h + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
+				1.0f ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1.0f - 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
+				1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f - 0 ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f - r ), ( float )( y + h + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
+				0.0f ), ( float )( u0 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x, y, z - 1 ) )
 		{
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z +
-						 r ), ( float )( u1 ), ( float )( v0 ) );
+				r ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
+				0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z +
-						 r ), ( float )( u0 ), ( float )( v0 ) );
+				r ), ( float )( u0 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z +
-						 r ), ( float )( u0 ), ( float )( v0 ) );
+				r ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
+				0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z +
-						 r ), ( float )( u1 ), ( float )( v0 ) );
+				r ), ( float )( u1 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x, y, z + 1 ) )
 		{
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-						 r ), ( float )( u0 ), ( float )( v0 ) );
+				r ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
+				0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-						 r ), ( float )( u1 ), ( float )( v0 ) );
+				r ), ( float )( u1 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-						 r ), ( float )( u1 ), ( float )( v0 ) );
+				r ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
+				0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
+				0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-						 r ), ( float )( u0 ), ( float )( v0 ) );
+				r ), ( float )( u0 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x, y + 1.0f, z ) )
 		{
@@ -440,13 +463,13 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 			if ( ( ( x + y + z ) & 1 ) == 0 )
 			{
 				t.vertexUV( ( float )( x0_ ), ( float )( y + h ), ( float )( z +
-							 0 ), ( float )( u1 ), ( float )( v0 ) );
+					0 ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x0 ), ( float )( y + 0 ), ( float )( z +
-							 0 ), ( float )( u1 ), ( float )( v1 ) );
+					0 ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x0 ), ( float )( y + 0 ), ( float )( z +
-							 1 ), ( float )( u0 ), ( float )( v1 ) );
+					1 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x0_ ), ( float )( y + h ), ( float )( z +
-							 1 ), ( float )( u0 ), ( float )( v0 ) );
+					1 ), ( float )( u0 ), ( float )( v0 ) );
 
 				u0 = (xt) / 256.0f;
 				u1 = (xt + 15.99f) / 256.0f;
@@ -454,24 +477,24 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 				v1 = (yt + 15.99f) / 256.0f;
 
 				t.vertexUV( ( float )( x1_ ), ( float )( y + h ), ( float )( z +
-							 1.0f ), ( float )( u1 ), ( float )( v0 ) );
+					1.0f ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x1 ), ( float )( y + 0.0f ), ( float )( z +
-							 1.0f ), ( float )( u1 ), ( float )( v1 ) );
+					1.0f ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x1 ), ( float )( y + 0.0f ), ( float )( z +
-							 0 ), ( float )( u0 ), ( float )( v1 ) );
+					0 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x1_ ), ( float )( y + h ), ( float )( z +
-							 0 ), ( float )( u0 ), ( float )( v0 ) );
+					0 ), ( float )( u0 ), ( float )( v0 ) );
 			}
 			else
 			{
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-							 h ), ( float )( z1_ ), ( float )( u1 ), ( float )( v0 ) );
+					h ), ( float )( z1_ ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-							 0.0f ), ( float )( z1 ), ( float )( u1 ), ( float )( v1 ) );
+					0.0f ), ( float )( z1 ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-							 0.0f ), ( float )( z1 ), ( float )( u0 ), ( float )( v1 ) );
+					0.0f ), ( float )( z1 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-							 h ), ( float )( z1_ ), ( float )( u0 ), ( float )( v0 ) );
+					h ), ( float )( z1_ ), ( float )( u0 ), ( float )( v0 ) );
 
 				u0 = (xt) / 256.0f;
 				u1 = (xt + 15.99f) / 256.0f;
@@ -479,13 +502,13 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 				v1 = (yt + 15.99f) / 256.0f;
 
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-							 h ), ( float )( z0_ ), ( float )( u1 ), ( float )( v0 ) );
+					h ), ( float )( z0_ ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-							 0.0f ), ( float )( z0 ), ( float )( u1 ), ( float )( v1 ) );
+					0.0f ), ( float )( z0 ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-							 0.0f ), ( float )( z0 ), ( float )( u0 ), ( float )( v1 ) );
+					0.0f ), ( float )( z0 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-							 h ), ( float )( z0_ ), ( float )( u0 ), ( float )( v0 ) );
+					h ), ( float )( z0_ ), ( float )( u0 ), ( float )( v0 ) );
 			}
 		}
 	}
@@ -958,46 +981,46 @@ float TileRenderer::getWaterHeight( int x, int y, int z, const Material* m )
 }
 
 void TileRenderer::renderBlock(Tile* tt, LevelSource* level, int x, int y, int z) {
-    float c10 = 0.5f;
+	float c10 = 0.5f;
-    float c11 = 1;
+	float c11 = 1;
-    float c2 = 0.8f;
+	float c2 = 0.8f;
-    float c3 = 0.6f;
+	float c3 = 0.6f;
 
-    Tesselator& t = Tesselator::instance;
+	Tesselator& t = Tesselator::instance;
-    t.begin();
+	t.begin();
 
-    float center = tt->getBrightness(level, x, y, z);
+	float center = tt->getBrightness(level, x, y, z);
-    float br = tt->getBrightness(level, x, y - 1, z);
+	float br = tt->getBrightness(level, x, y - 1, z);
-    if (br < center) br = center;
+	if (br < center) br = center;
 
-    t.color(c10 * br, c10 * br, c10 * br);
+	t.color(c10 * br, c10 * br, c10 * br);
-    renderFaceDown(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(0));
+	renderFaceDown(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(0));
 
-    br = tt->getBrightness(level, x, y + 1, z);
+	br = tt->getBrightness(level, x, y + 1, z);
-    if (br < center) br = center;
+	if (br < center) br = center;
-    t.color(c11 * br, c11 * br, c11 * br);
+	t.color(c11 * br, c11 * br, c11 * br);
-    renderFaceUp(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(1));
+	renderFaceUp(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(1));
 
-    br = tt->getBrightness(level, x, y, z - 1);
+	br = tt->getBrightness(level, x, y, z - 1);
-    if (br < center) br = center;
+	if (br < center) br = center;
-    t.color(c2 * br, c2 * br, c2 * br);
+	t.color(c2 * br, c2 * br, c2 * br);
-    renderNorth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(2));
+	renderNorth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(2));
 
-    br = tt->getBrightness(level, x, y, z + 1);
+	br = tt->getBrightness(level, x, y, z + 1);
-    if (br < center) br = center;
+	if (br < center) br = center;
-    t.color(c2 * br, c2 * br, c2 * br);
+	t.color(c2 * br, c2 * br, c2 * br);
-    renderSouth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(3));
+	renderSouth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(3));
 
-    br = tt->getBrightness(level, x - 1, y, z);
+	br = tt->getBrightness(level, x - 1, y, z);
-    if (br < center) br = center;
+	if (br < center) br = center;
-    t.color(c3 * br, c3 * br, c3 * br);
+	t.color(c3 * br, c3 * br, c3 * br);
-    renderWest(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(4));
+	renderWest(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(4));
 
-    br = tt->getBrightness(level, x + 1, y, z);
+	br = tt->getBrightness(level, x + 1, y, z);
-    if (br < center) br = center;
+	if (br < center) br = center;
-    t.color(c3 * br, c3 * br, c3 * br);
+	t.color(c3 * br, c3 * br, c3 * br);
-    renderEast(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(5));
+	renderEast(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(5));
-    t.draw();
+	t.draw();
 }
 
 bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX, int pY, int pZ, float pBaseRed, float pBaseGreen, float pBaseBlue )
@@ -1197,6 +1220,15 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4g *= ll4;
 		c4b *= ll4;
 		renderNorth(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 2));
+		if (tt->getTexture(level, pX, pY, pZ, 2) == 3 && sideTinting) 
+		{
+			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
+			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
+			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
+			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
+
+			renderNorth(tt, (float) pX, (float) pY, (float) pZ, 38);
+		}
 		i = true;
 	}
 	if ((noCulling) || (tt->shouldRenderFace(level, pX, pY, pZ + 1, 3))) {
@@ -1250,6 +1282,15 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4g *= ll4;
 		c4b *= ll4;
 		renderSouth(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 3));
+		if (tt->getTexture(level, pX, pY, pZ, 3) == 3 && sideTinting) 
+		{
+			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
+			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
+			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
+			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
+
+			renderSouth(tt, (float) pX, (float) pY, (float) pZ, 38);
+		}
 		i = true;
 	}
 	if ((noCulling) || (tt->shouldRenderFace(level, pX - 1, pY, pZ, 4))) {
@@ -1302,6 +1343,15 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4g *= ll4;
 		c4b *= ll4;
 		renderWest(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 4));
+		if (tt->getTexture(level, pX, pY, pZ, 4) == 3 && sideTinting) 
+		{
+			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
+			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
+			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
+			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
+
+			renderWest(tt, (float) pX, (float) pY, (float) pZ, 38);
+		}
 		i = true;
 	}
 	if ((noCulling) || (tt->shouldRenderFace(level, pX + 1, pY, pZ, 5))) {
@@ -1355,6 +1405,15 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4b *= ll4;
 
 		renderEast(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 5));
+		if (tt->getTexture(level, pX, pY, pZ, 5) == 3 && sideTinting) 
+		{
+			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
+			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
+			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
+			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
+
+			renderEast(tt, (float) pX, (float) pY, (float) pZ, 38);
+		}
 		i = true;
 	}
 	applyAmbienceOcclusion = false;
@@ -1362,124 +1421,124 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 }
 
 bool TileRenderer::tesselateCactusInWorld(Tile* tt, int x, int y, int z) {
-    int col = tt->getColor(level, x, y, z);
+	int col = tt->getColor(level, x, y, z);
-    float r = ((col >> 16) & 0xff) / 255.0f;
+	float r = ((col >> 16) & 0xff) / 255.0f;
-    float g = ((col >> 8) & 0xff) / 255.0f;
+	float g = ((col >> 8) & 0xff) / 255.0f;
-    float b = ((col) & 0xff) / 255.0f;
+	float b = ((col) & 0xff) / 255.0f;
-    return tesselateCactusInWorld(tt, x, y, z, r, g, b);
+	return tesselateCactusInWorld(tt, x, y, z, r, g, b);
 }
 
 bool TileRenderer::tesselateCactusInWorld(Tile* tt, int x, int y, int z, float r, float g, float b) {
-    Tesselator& t = Tesselator::instance;
+	Tesselator& t = Tesselator::instance;
 
-    bool changed = false;
+	bool changed = false;
-    float c10 = 0.5f;
+	float c10 = 0.5f;
-    float c11 = 1;
+	float c11 = 1;
-    float c2 = 0.8f;
+	float c2 = 0.8f;
-    float c3 = 0.6f;
+	float c3 = 0.6f;
 
-    float r10 = c10 * r;
+	float r10 = c10 * r;
-    float r11 = c11 * r;
+	float r11 = c11 * r;
-    float r2 = c2 * r;
+	float r2 = c2 * r;
-    float r3 = c3 * r;
+	float r3 = c3 * r;
 
-    float g10 = c10 * g;
+	float g10 = c10 * g;
-    float g11 = c11 * g;
+	float g11 = c11 * g;
-    float g2 = c2 * g;
+	float g2 = c2 * g;
-    float g3 = c3 * g;
+	float g3 = c3 * g;
 
-    float b10 = c10 * b;
+	float b10 = c10 * b;
-    float b11 = c11 * b;
+	float b11 = c11 * b;
-    float b2 = c2 * b;
+	float b2 = c2 * b;
-    float b3 = c3 * b;
+	float b3 = c3 * b;
 
-    float s = 1 / 16.0f;
+	float s = 1 / 16.0f;
 	const float X = (float)x;
 	const float Y = (float)y;
 	const float Z = (float)z;
 
-    float centerBrightness = tt->getBrightness(level, x, y, z);
+	float centerBrightness = tt->getBrightness(level, x, y, z);
 
-    if (noCulling || tt->shouldRenderFace(level, x, y - 1, z, 0)) {
+	if (noCulling || tt->shouldRenderFace(level, x, y - 1, z, 0)) {
-        float br = tt->getBrightness(level, x, y - 1, z);
+		float br = tt->getBrightness(level, x, y - 1, z);
-        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-        t.color(r10 * br, g10 * br, b10 * br);
+		t.color(r10 * br, g10 * br, b10 * br);
-        renderFaceDown(tt, X, Y, Z, tt->getTexture(level, x, y, z, 0));
+		renderFaceDown(tt, X, Y, Z, tt->getTexture(level, x, y, z, 0));
-        changed = true;
+		changed = true;
-    }
+	}
 
-    if (noCulling || tt->shouldRenderFace(level, x, y + 1, z, 1)) {
+	if (noCulling || tt->shouldRenderFace(level, x, y + 1, z, 1)) {
-        float br = tt->getBrightness(level, x, y + 1, z);
+		float br = tt->getBrightness(level, x, y + 1, z);
-        if (tt->yy1 != 1 && !tt->material->isLiquid()) br = centerBrightness;
+		if (tt->yy1 != 1 && !tt->material->isLiquid()) br = centerBrightness;
-        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-        t.color(r11 * br, g11 * br, b11 * br);
+		t.color(r11 * br, g11 * br, b11 * br);
-        renderFaceUp(tt, X, Y, Z, tt->getTexture(level, x, y, z, 1));
+		renderFaceUp(tt, X, Y, Z, tt->getTexture(level, x, y, z, 1));
-        changed = true;
+		changed = true;
-    }
+	}
 
-    if (noCulling || tt->shouldRenderFace(level, x, y, z - 1, 2)) {
+	if (noCulling || tt->shouldRenderFace(level, x, y, z - 1, 2)) {
-        float br = tt->getBrightness(level, x, y, z - 1);
+		float br = tt->getBrightness(level, x, y, z - 1);
-        if (tt->zz0 > 0) br = centerBrightness;
+		if (tt->zz0 > 0) br = centerBrightness;
-        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-        t.color(r2 * br, g2 * br, b2 * br);
+		t.color(r2 * br, g2 * br, b2 * br);
-        t.addOffset(0, 0, s);
+		t.addOffset(0, 0, s);
-        renderNorth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 2));
+		renderNorth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 2));
-        t.addOffset(0, 0, -s);
+		t.addOffset(0, 0, -s);
-        changed = true;
+		changed = true;
-    }
+	}
 
-    if (noCulling || tt->shouldRenderFace(level, x, y, z + 1, 3)) {
+	if (noCulling || tt->shouldRenderFace(level, x, y, z + 1, 3)) {
-        float br = tt->getBrightness(level, x, y, z + 1);
+		float br = tt->getBrightness(level, x, y, z + 1);
-        if (tt->zz1 < 1) br = centerBrightness;
+		if (tt->zz1 < 1) br = centerBrightness;
-        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-        t.color(r2 * br, g2 * br, b2 * br);
+		t.color(r2 * br, g2 * br, b2 * br);
-        t.addOffset(0, 0, -s);
+		t.addOffset(0, 0, -s);
-        renderSouth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 3));
+		renderSouth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 3));
-        t.addOffset(0, 0, s);
+		t.addOffset(0, 0, s);
-        changed = true;
+		changed = true;
-    }
+	}
 
-    if (noCulling || tt->shouldRenderFace(level, x - 1, y, z, 4)) {
+	if (noCulling || tt->shouldRenderFace(level, x - 1, y, z, 4)) {
-        float br = tt->getBrightness(level, x - 1, y, z);
+		float br = tt->getBrightness(level, x - 1, y, z);
-        if (tt->xx0 > 0) br = centerBrightness;
+		if (tt->xx0 > 0) br = centerBrightness;
-        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-        t.color(r3 * br, g3 * br, b3 * br);
+		t.color(r3 * br, g3 * br, b3 * br);
-        t.addOffset(s, 0, 0);
+		t.addOffset(s, 0, 0);
-        renderWest(tt, X, Y, Z, tt->getTexture(level, x, y, z, 4));
+		renderWest(tt, X, Y, Z, tt->getTexture(level, x, y, z, 4));
-        t.addOffset(-s, 0, 0);
+		t.addOffset(-s, 0, 0);
-        changed = true;
+		changed = true;
-    }
+	}
 
-    if (noCulling || tt->shouldRenderFace(level, x + 1, y, z, 5)) {
+	if (noCulling || tt->shouldRenderFace(level, x + 1, y, z, 5)) {
-        float br = tt->getBrightness(level, x + 1, y, z);
+		float br = tt->getBrightness(level, x + 1, y, z);
-        if (tt->xx1 < 1) br = centerBrightness;
+		if (tt->xx1 < 1) br = centerBrightness;
-        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-        t.color(r3 * br, g3 * br, b3 * br);
+		t.color(r3 * br, g3 * br, b3 * br);
-        t.addOffset(-s, 0, 0);
+		t.addOffset(-s, 0, 0);
-        renderEast(tt, X, Y, Z, tt->getTexture(level, x, y, z, 5));
+		renderEast(tt, X, Y, Z, tt->getTexture(level, x, y, z, 5));
-        t.addOffset(s, 0, 0);
+		t.addOffset(s, 0, 0);
-        changed = true;
+		changed = true;
-    }
+	}
 
-    return changed;
+	return changed;
 }
 
 bool TileRenderer::tesselateFenceInWorld(FenceTile* tt, int x, int y, int z) {
-    bool changed = true;
+	bool changed = true;
 
-    float a = 6 / 16.0f;
+	float a = 6 / 16.0f;
-    float b = 10 / 16.0f;
+	float b = 10 / 16.0f;
-    tt->setShape(a, 0, a, b, 1, b);
+	tt->setShape(a, 0, a, b, 1, b);
-    tesselateBlockInWorld(tt, x, y, z);
+	tesselateBlockInWorld(tt, x, y, z);
 
-    bool vertical = false;
+	bool vertical = false;
-    bool horizontal = false;
+	bool horizontal = false;
 
 	bool l = tt->connectsTo(level, x - 1, y, z);
 	bool r = tt->connectsTo(level, x + 1, y, z);
@@ -1487,42 +1546,42 @@ bool TileRenderer::tesselateFenceInWorld(FenceTile* tt, int x, int y, int z) {
 	bool d = tt->connectsTo(level, x, y, z + 1);
 
 	if (l || r) vertical = true;
-    if (u || d) horizontal = true;
+	if (u || d) horizontal = true;
 
-    if (!vertical && !horizontal) vertical = true;
+	if (!vertical && !horizontal) vertical = true;
 
-    a = 7 / 16.0f;
+	a = 7 / 16.0f;
-    b = 9 / 16.0f;
+	b = 9 / 16.0f;
-    float h0 = 12 / 16.0f;
+	float h0 = 12 / 16.0f;
-    float h1 = 15 / 16.0f;
+	float h1 = 15 / 16.0f;
 
-    float x0 = l ? 0 : a;
+	float x0 = l ? 0 : a;
-    float x1 = r ? 1 : b;
+	float x1 = r ? 1 : b;
-    float z0 = u ? 0 : a;
+	float z0 = u ? 0 : a;
-    float z1 = d ? 1 : b;
+	float z1 = d ? 1 : b;
 
-    if (vertical) {
+	if (vertical) {
-        tt->setShape(x0, h0, a, x1, h1, b);
+		tt->setShape(x0, h0, a, x1, h1, b);
-        tesselateBlockInWorld(tt, x, y, z);
+		tesselateBlockInWorld(tt, x, y, z);
-    }
+	}
-    if (horizontal) {
+	if (horizontal) {
-        tt->setShape(a, h0, z0, b, h1, z1);
+		tt->setShape(a, h0, z0, b, h1, z1);
-        tesselateBlockInWorld(tt, x, y, z);
+		tesselateBlockInWorld(tt, x, y, z);
-    }
+	}
 
-    h0 = 6 / 16.0f;
+	h0 = 6 / 16.0f;
-    h1 = 9 / 16.0f;
+	h1 = 9 / 16.0f;
-    if (vertical) {
+	if (vertical) {
-        tt->setShape(x0, h0, a, x1, h1, b);
+		tt->setShape(x0, h0, a, x1, h1, b);
-        tesselateBlockInWorld(tt, x, y, z);
+		tesselateBlockInWorld(tt, x, y, z);
-    }
+	}
-    if (horizontal) {
+	if (horizontal) {
-        tt->setShape(a, h0, z0, b, h1, z1);
+		tt->setShape(a, h0, z0, b, h1, z1);
-        tesselateBlockInWorld(tt, x, y, z);
+		tesselateBlockInWorld(tt, x, y, z);
-    }
+	}
 
-    tt->setShape(0, 0, 0, 1, 1, 1);
+	tt->setShape(0, 0, 0, 1, 1, 1);
-    return changed;
+	return changed;
 }
 
 bool TileRenderer::tesselateFenceGateInWorld(FenceGateTile* tt, int x, int y, int z) {
@@ -2403,110 +2462,110 @@ void TileRenderer::renderTile( Tile* tile, int data )
 		t.addOffset(s, 0, 0);
 		t.draw();
 		t.offset(0, 0, 0);//0.5f, 0.5f, 0.5f);
-		} else if (shape == Tile::SHAPE_ROWS) {
+	} else if (shape == Tile::SHAPE_ROWS) {
-			t.begin();
+		t.begin();
-			t.normal(0, -1, 0);
+		t.normal(0, -1, 0);
-			tesselateRowTexture(tile, data, -0.5f, -0.5f, -0.5f);
+		tesselateRowTexture(tile, data, -0.5f, -0.5f, -0.5f);
 		//}  else if (shape == Tile::SHAPE_TORCH) {
 		////    t.begin();
 		////    t.normal(0, -1, 0);
 		///    tesselateTorch(tile, -0.5f, -0.5f, -0.5f, 0, 0);
 		////    t.end();
-        } else if (shape == Tile::SHAPE_ENTITYTILE_ANIMATED) {
+	} else if (shape == Tile::SHAPE_ENTITYTILE_ANIMATED) {
-            EntityTileRenderer::instance->render(tile, data, 1.0f);
+		EntityTileRenderer::instance->render(tile, data, 1.0f);
-            //glEnable(GL_RESCALE_NORMAL);
+		//glEnable(GL_RESCALE_NORMAL);
-		} else if (shape == Tile::SHAPE_STAIRS) {
+	} else if (shape == Tile::SHAPE_STAIRS) {
-		    t.addOffset(-0.5f, -0.5f, -0.5f);
+		t.addOffset(-0.5f, -0.5f, -0.5f);
-			t.begin();
+		t.begin();
-			for (int i = 0; i < 2; i++) {
+		for (int i = 0; i < 2; i++) {
-		        if (i == 0) tile->setShape(0, 0, 0, 1, 1, 0.5f);
+			if (i == 0) tile->setShape(0, 0, 0, 1, 1, 0.5f);
-		        if (i == 1) tile->setShape(0, 0, 0.5f, 1, 0.5f, 1);
+			if (i == 1) tile->setShape(0, 0, 0.5f, 1, 0.5f, 1);
 
 
-				t.normal(0.0f, -1.0f, 0.0f);
+			t.normal(0.0f, -1.0f, 0.0f);
-		        renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
+			renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
 
-				t.normal(0.0f, 1.0f, 0.0f);
+			t.normal(0.0f, 1.0f, 0.0f);
-		        renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
+			renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
 
-				t.normal(0.0f, 0.0f, -1.0f);
+			t.normal(0.0f, 0.0f, -1.0f);
-		        renderNorth(tile, 0, 0, 0, tile->getTexture(2));
+			renderNorth(tile, 0, 0, 0, tile->getTexture(2));
 
-				t.normal(0.0f, 0.0f, 1.0f);
+			t.normal(0.0f, 0.0f, 1.0f);
-		        renderSouth(tile, 0, 0, 0, tile->getTexture(3));
+			renderSouth(tile, 0, 0, 0, tile->getTexture(3));
 
-				t.normal(-1.0f, 0.0f, 0.0f);
+			t.normal(-1.0f, 0.0f, 0.0f);
-		        renderWest(tile, 0, 0, 0, tile->getTexture(4));
+			renderWest(tile, 0, 0, 0, tile->getTexture(4));
 
-				t.normal(1.0f, 0.0f, 0.0f);
+			t.normal(1.0f, 0.0f, 0.0f);
-		        renderEast(tile, 0, 0, 0, tile->getTexture(5));
+			renderEast(tile, 0, 0, 0, tile->getTexture(5));
-		    }
-			t.draw();
-			t.addOffset(0.5f, 0.5f, 0.5f);
 		}
-		else if (shape == Tile::SHAPE_FENCE) {
+		t.draw();
-			t.addOffset(-0.5f, -0.5f, -0.5f);
+		t.addOffset(0.5f, 0.5f, 0.5f);
-			t.begin();
+	}
-			for (int i = 0; i < 4; i++) {
+	else if (shape == Tile::SHAPE_FENCE) {
-				float w = 2 / 16.0f;
+		t.addOffset(-0.5f, -0.5f, -0.5f);
-				if (i == 0) tile->setShape(0.5f - w, 0, 0, 0.5f + w, 1, w * 2);
+		t.begin();
-				if (i == 1) tile->setShape(0.5f - w, 0, 1 - w * 2, 0.5f + w, 1, 1);
+		for (int i = 0; i < 4; i++) {
-				w = 1 / 16.0f;
+			float w = 2 / 16.0f;
-				if (i == 2) tile->setShape(0.5f - w, 1 - w * 3, -w * 2, 0.5f + w, 1 - w, 1 + w * 2);
+			if (i == 0) tile->setShape(0.5f - w, 0, 0, 0.5f + w, 1, w * 2);
-				if (i == 3) tile->setShape(0.5f - w, 0.5f - w * 3, -w * 2, 0.5f + w, 0.5f - w, 1 + w * 2);
+			if (i == 1) tile->setShape(0.5f - w, 0, 1 - w * 2, 0.5f + w, 1, 1);
+			w = 1 / 16.0f;
+			if (i == 2) tile->setShape(0.5f - w, 1 - w * 3, -w * 2, 0.5f + w, 1 - w, 1 + w * 2);
+			if (i == 3) tile->setShape(0.5f - w, 0.5f - w * 3, -w * 2, 0.5f + w, 0.5f - w, 1 + w * 2);
 
-				t.normal(0.0f, -1.0f, 0.0f);
+			t.normal(0.0f, -1.0f, 0.0f);
-		        renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
+			renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
 
-				t.normal(0.0f, 1.0f, 0.0f);
+			t.normal(0.0f, 1.0f, 0.0f);
-		        renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
+			renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
 
-				t.normal(0.0f, 0.0f, -1.0f);
+			t.normal(0.0f, 0.0f, -1.0f);
-		        renderNorth(tile, 0, 0, 0, tile->getTexture(2));
+			renderNorth(tile, 0, 0, 0, tile->getTexture(2));
 
-				t.normal(0.0f, 0.0f, 1.0f);
+			t.normal(0.0f, 0.0f, 1.0f);
-		        renderSouth(tile, 0, 0, 0, tile->getTexture(3));
+			renderSouth(tile, 0, 0, 0, tile->getTexture(3));
 
-				t.normal(-1.0f, 0.0f, 0.0f);
+			t.normal(-1.0f, 0.0f, 0.0f);
-		        renderWest(tile, 0, 0, 0, tile->getTexture(4));
+			renderWest(tile, 0, 0, 0, tile->getTexture(4));
 
-				t.normal(1.0f, 0.0f, 0.0f);
+			t.normal(1.0f, 0.0f, 0.0f);
-		        renderEast(tile, 0, 0, 0, tile->getTexture(5));
+			renderEast(tile, 0, 0, 0, tile->getTexture(5));
-			}
-			t.draw();
-			t.addOffset(0.5f, 0.5f, 0.5f);
-			tile->setShape(0, 0, 0, 1, 1, 1);
-		} else if (shape == Tile::SHAPE_FENCE_GATE) {
-			t.addOffset(-0.5f, -0.5f, -0.5f);
-			t.begin();
-			for (int i = 0; i < 3; i++) {
-				float w = 1 / 16.0f;
-				if (i == 0) tile->setShape(0.5f - w, .3f, 0, 0.5f + w, 1, w * 2);
-				if (i == 1) tile->setShape(0.5f - w, .3f, 1 - w * 2, 0.5f + w, 1, 1);
-				if (i == 2) tile->setShape(0.5f - w, .5f, w * 2, 0.5f + w, 1 - w, 1 - w * 2);
-
-								t.normal(0.0f, -1.0f, 0.0f);
-		        renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
-
-				t.normal(0.0f, 1.0f, 0.0f);
-		        renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
-
-				t.normal(0.0f, 0.0f, -1.0f);
-		        renderNorth(tile, 0, 0, 0, tile->getTexture(2));
-
-				t.normal(0.0f, 0.0f, 1.0f);
-		        renderSouth(tile, 0, 0, 0, tile->getTexture(3));
-
-				t.normal(-1.0f, 0.0f, 0.0f);
-		        renderWest(tile, 0, 0, 0, tile->getTexture(4));
-
-				t.normal(1.0f, 0.0f, 0.0f);
-		        renderEast(tile, 0, 0, 0, tile->getTexture(5));
-			}
-			t.draw();
-			t.addOffset(0.5f, 0.5f, 0.5f);
-			tile->setShape(0, 0, 0, 1, 1, 1);
 		}
+		t.draw();
+		t.addOffset(0.5f, 0.5f, 0.5f);
+		tile->setShape(0, 0, 0, 1, 1, 1);
+	} else if (shape == Tile::SHAPE_FENCE_GATE) {
+		t.addOffset(-0.5f, -0.5f, -0.5f);
+		t.begin();
+		for (int i = 0; i < 3; i++) {
+			float w = 1 / 16.0f;
+			if (i == 0) tile->setShape(0.5f - w, .3f, 0, 0.5f + w, 1, w * 2);
+			if (i == 1) tile->setShape(0.5f - w, .3f, 1 - w * 2, 0.5f + w, 1, 1);
+			if (i == 2) tile->setShape(0.5f - w, .5f, w * 2, 0.5f + w, 1 - w, 1 - w * 2);
+
+			t.normal(0.0f, -1.0f, 0.0f);
+			renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
+
+			t.normal(0.0f, 1.0f, 0.0f);
+			renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
+
+			t.normal(0.0f, 0.0f, -1.0f);
+			renderNorth(tile, 0, 0, 0, tile->getTexture(2));
+
+			t.normal(0.0f, 0.0f, 1.0f);
+			renderSouth(tile, 0, 0, 0, tile->getTexture(3));
+
+			t.normal(-1.0f, 0.0f, 0.0f);
+			renderWest(tile, 0, 0, 0, tile->getTexture(4));
+
+			t.normal(1.0f, 0.0f, 0.0f);
+			renderEast(tile, 0, 0, 0, tile->getTexture(5));
+		}
+		t.draw();
+		t.addOffset(0.5f, 0.5f, 0.5f);
+		tile->setShape(0, 0, 0, 1, 1, 1);
+	}
 
 }
 

src/client/renderer/TileRenderer.h

@@ -10,6 +10,7 @@ class ThinFenceTile;
 class StairTile;
 class LevelSource;
 class Material;
+class Minecraft;
 
 class TileRenderer
 {
@@ -60,6 +61,10 @@ public:
     void renderTile(Tile* tile, int data);
 	void renderGuiTile(Tile* tile, int data);
 
+	static void setUseTint(bool value) {
+       sideTinting = value;
+    }
+
     static bool canRender(int renderShape);
 private:
     float getWaterHeight(int x, int y, int z, const Material* m);
@@ -68,6 +73,7 @@ private:
 	int fixedTexture;
 	bool xFlipTexture;
 	bool noCulling;
+	static bool sideTinting;
 
 	bool applyAmbienceOcclusion;
 	float ll000, llx00, ll0y0, ll00z, llX00, ll0Y0, ll00Z;

src/client/renderer/entity/ItemRenderer.cpp

@@ -130,12 +130,13 @@ static const signed short _18[] = {79, 80, 81, -1, 79, 80, 81, -1, 79, 80, 81, -
 static const signed short _24[] = {11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _35[] = {52, 59, 58, 57, 56, 55, 54, 53, 67, 66, 65, 64, 63, 62, 61, 60};
 static const signed short _44[] = {28, 32, 30, 29, 31, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+static const signed short _31[] = {37, 82, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _98[] = {1, 2, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _155[] = {34, 36, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _263[] = {230, 151, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _351[] = {-1, 152, 154, -1, 193, 215, 216, -1, -1, 217, 218, 219, 220, 221, 222, 144};
 
-static const signed short _mapper[] = {-1, 7, 9, 8, 0, 5, -2, -1, -1, -1, -1, -1, 14, 15, 39, 38, 37, -2, -2, -1, 49, 41, 46, -1, -2, -1, -1, -1, -1, -1, 235, -1, -1, -1, -1, -2, -1, 134, 135, 136, 137, 43, 44, -1, -2, 6, 76, 71, 4, 47, 129, -1, -1, 22, 74, -1, 40, 45, 72, -1, -1, 75, -1, -1, -1, 128, -1, 21, -1, -1, -1, -1, -1, 42, -1, -1, -1, -1, -1, -1, 48, 77, 10, 236, -1, 69, -1, 20, -1, 50, -1, -1, -1, -1, -1, -1, 68, -1, -2, -1, -1, -1, 130, 78, -1, -1, -1, 70, 23, 25, -1, -1, 19, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, 51, -1, -1, -1, -1, -1, 82, -1, -1, 174, 173, 175, 231, 234, 147, 190, -2, 153, 150, 149, 146, 185, 166, 164, 167, 186, 170, 169, 171, 187, 177, 176, 178, 165, 195, 194, 188, 181, 180, 182, 189, 191, 228, 168, 172, 145, 179, 183, 142, 233, 232, 198, 200, 201, 202, -1, -1, -1, -1, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 192, 156, 157, 133, -1, 148, 131, -1, -1, -1, -1, -1, -1, -1, 226, -1, 199, -1, 159, 158, 138, 224, 225, -1, -1, -1, -1, -1, -1, -1, 227, -1, -1, -2, 223, 229, -1, 132, -1, -1, -1, 184, 196, -1, 143, 160, 161, 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 155, 197};
+static const signed short _mapper[] = {-1, 7, 9, 8, 0, 5, -2, -1, -1, -1, -1, -1, 14, 15, 39, 38, 37, -2, -2, -1, 49, 41, 46, -1, -2, -1, -1, -1, -1, -1, 235, -2, -1, -1, -1, -2, -1, 134, 135, 136, 137, 43, 44, -1, -2, 6, 76, 71, 4, 47, 129, -1, -1, 22, 74, -1, 40, 45, 72, -1, -1, 75, -1, -1, -1, 128, -1, 21, -1, -1, -1, -1, -1, 42, -1, -1, -1, -1, -1, -1, 48, 77, 10, 236, -1, 69, -1, 20, -1, 50, -1, -1, -1, -1, -1, -1, 68, -1, -2, -1, -1, -1, 130, 78, -1, -1, -1, 70, 23, 25, -1, -1, 19, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, 51, -1, -1, -1, -1, -1, 82, -1, -1, 174, 173, 175, 231, 234, 147, 190, -2, 153, 150, 149, 146, 185, 166, 164, 167, 186, 170, 169, 171, 187, 177, 176, 178, 165, 195, 194, 188, 181, 180, 182, 189, 191, 228, 168, 172, 145, 179, 183, 142, 233, 232, 198, 200, 201, 202, -1, -1, -1, -1, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 192, 156, 157, 133, -1, 148, 131, -1, -1, -1, -1, -1, -1, -1, 226, -1, 199, -1, 159, 158, 138, 224, 225, -1, -1, -1, -1, -1, -1, -1, 227, -1, -1, -2, 223, 229, -1, 132, -1, -1, -1, 184, 196, -1, 143, 160, 161, 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 155, 197};
 
 #define IRMAPCASE(x) case x: return  _##x [item->getAuxValue() & 15]
 
@@ -153,6 +154,7 @@ int ItemRenderer::getAtlasPos(const ItemInstance* item) {
 		IRMAPCASE(17);
 		IRMAPCASE(18);
 		IRMAPCASE(24);
+		IRMAPCASE(31);
 		IRMAPCASE(35);
 		IRMAPCASE(44);
 		IRMAPCASE(98);

src/client/renderer/entity/MobRenderer.cpp

@@ -187,10 +187,12 @@ void MobRenderer::scale(Mob* mob, float a) {
 }
 
 void MobRenderer::renderName(Mob* mob, float x, float y, float z) {
-	/*
+	
 	std::stringstream ss; ss << mob->entityId;
+	if (entityRenderDispatcher->minecraft->options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
 	renderNameTag(mob, ss.str(), x, y, z, 64);
-	*/
+	}
+	
 }
 
 void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, float y, float z, int maxDist) {
@@ -205,7 +207,11 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa
 	float s = 1 / 60.0f * size;
 
 	glPushMatrix2();
-	glTranslatef2((float) x + 0, (float) y + 1.0f /*2.3f*/, (float) z);
+	if (mob->isPlayer()){
+		glTranslatef2((float) x + 0, (float) y + 1.0f, (float) z);
+	} else {
+		glTranslatef2((float) x + 0, (float) y + 2.3f, (float) z);
+	}
 
 	glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
 	glRotatef2(entityRenderDispatcher->playerRotX, 1, 0, 0);

src/util/PerfRenderer.cpp

@@ -75,7 +75,7 @@ void PerfRenderer::renderFpsMeter( float tickTime )
 	glDisable2(GL_TEXTURE_2D);
 	Tesselator& t = Tesselator::instance;
 
-	t.begin(GL_TRIANGLES);
+	t.begin(GL_QUADS);
 	int hh1 = (int) (usPer60Fps / 200);
 	float count = (float)frameTimes.size();
 	t.color(0x20000000);
@@ -117,7 +117,8 @@ void PerfRenderer::renderFpsMeter( float tickTime )
 			t.color(0xff000000 + cc * 256);
 		}
 
-		float time = 10 * 1000 * frameTimes[i] / 200;
+//		float time = 10 * 1000 * frameTimes[i] / 200;
+		float time = frameTimes[i] * 4000.0f;
 		float time2 = 10 * 1000 * tickTimes[i] / 200;
 
 		t.vertex(i + 0.5f, _mc->height - time + 0.5f, 0);
@@ -210,12 +211,12 @@ void PerfRenderer::renderFpsMeter( float tickTime )
 		msg << result.name;
 		float xx = (float)(x - r);
 		float yy = (float)(y + r/2 + i * 8 + 20);
-		_font->drawShadow(msg.str(), xx, yy, result.getColor());
+		_font->drawShadow(msg.str(), xx + 10 + 10, yy, result.getColor());
 		std::string msg2 = toPercentString(result.percentage);
 		//LOGI("name: %s: perc: %f == %s @ %d, %d\n", msg.str().c_str(), result.percentage, msg2.c_str(), xx, yy);
-		_font->drawShadow(msg2, xx - 50 - _font->width(msg2), yy, result.getColor());
+		_font->drawShadow(msg2, xx + 10 + 10 - _font->width(msg2), yy, result.getColor());
 		msg2 = toPercentString(result.globalPercentage);
-		_font->drawShadow(msg2, xx - _font->width(msg2), yy, result.getColor());
+		_font->drawShadow(msg2, xx + 10 + 10 - _font->width(msg2), yy, result.getColor());
 	}
 }
 

src/util/PerfTimer.h

@@ -6,7 +6,7 @@
 #include "StringUtils.h"
 
 //package util;
-#ifdef PROFILER
+//#ifdef PROFILER
 	#define TIMER_PUSH(x)		PerfTimer::push(x)
 	#define TIMER_POP()			PerfTimer::pop()
 	#define TIMER_POP_PUSH(x)	PerfTimer::popPush(x)
@@ -16,11 +16,11 @@
 //     #define TIMER_PUSH(x)       ServerProfiler::push(x)
 //     #define TIMER_POP()         ServerProfiler::pop()
 //     #define TIMER_POP_PUSH(x)	ServerProfiler::popPush(x)
-#else
+//#else
-	#define TIMER_PUSH(x)		((void*)0)
+//	#define TIMER_PUSH(x)		((void*)0)
-	#define TIMER_POP()			((void*)0)
+//	#define TIMER_POP()			((void*)0)
-	#define TIMER_POP_PUSH(x)	((void*)0)
+//	#define TIMER_POP_PUSH(x)	((void*)0)
-#endif
+//#endif
 
 class PerfTimer
 {

src/world/entity/animal/Sheep.cpp

@@ -1,5 +1,6 @@
 #include "Sheep.h"
 #include "../../item/DyePowderItem.h"
+#include "../../level/tile/TallGrass.h"
 #include "../../level/tile/LevelEvent.h"
 
 const float Sheep::COLOR[][3] = {
@@ -198,7 +199,7 @@ void Sheep::updateAi()
 		int yy = Mth::floor(y);
 		int zz = Mth::floor(z);
 
-		if (/*(level->getTile(xx, yy, zz) == Tile::tallgrass->id && level->getData(xx, yy, zz) == TallGrass::TALL_GRASS) || */ level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
+		if ((level->getTile(xx, yy, zz) == Tile::tallgrass->id && level->getData(xx, yy, zz) == TallGrass::TALL_GRASS) ||  level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
 			eatAnimationTick = EAT_ANIMATION_TICKS;
 			level->broadcastEntityEvent(this, EntityEvent::EAT_GRASS);
 		}
@@ -208,11 +209,11 @@ void Sheep::updateAi()
 		int zz = Mth::floor(z);
 
 		bool ate = false;
-		/*            if (level->getTile(xx, yy, zz) == Tile::tallgrass->id) {
+		            if (level->getTile(xx, yy, zz) == Tile::tallgrass->id) {
-		level->levelEvent(LevelEvent::PARTICLES_DESTROY_BLOCK, xx, yy, zz, Tile::tallgrass->id + TallGrass::TALL_GRASS * 256);
+		level->levelEvent(NULL, LevelEvent::PARTICLES_DESTROY_BLOCK, xx, yy, zz, Tile::tallgrass->id + TallGrass::TALL_GRASS * 256);
 		level->setTile(xx, yy, zz, 0);
 		ate = true;
-		} else */if (level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
+		} else if (level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
 			level->levelEvent(NULL, LevelEvent::PARTICLES_DESTROY_BLOCK, xx, yy - 1, zz, ((Tile*)Tile::grass)->id);
 			level->setTile(xx, yy - 1, zz, Tile::dirt->id);
 			ate = true;

src/world/entity/player/Inventory.cpp

@@ -3,6 +3,7 @@
 #include "../../level/tile/QuartzBlockTile.h"
 #include "../../level/tile/TreeTile.h"
 #include "../../level/tile/StoneSlabTile.h"
+#include "../../level/tile/TallGrass.h"
 #include "../../item/DyePowderItem.h"
 #include "../../item/crafting/Recipe.h"
 #include "../../item/CoalItem.h"
@@ -229,6 +230,7 @@ void Inventory::setupDefault() {
 
 		addItem(new ItemInstance(((Tile*)Tile::flower)));
 		addItem(new ItemInstance(((Tile*)Tile::rose)));
+		addItem(new ItemInstance(Tile::tallgrass, 1, TallGrass::TALL_GRASS));
 		addItem(new ItemInstance(((Tile*)Tile::mushroom1)));
 		addItem(new ItemInstance(((Tile*)Tile::mushroom2)));
 		addItem(new ItemInstance(Tile::cactus));

src/world/item/DyePowderItem.cpp

@@ -10,6 +10,7 @@
 #include "../level/tile/ClothTile.h"
 #include "../level/tile/CropTile.h"
 #include "../level/tile/StemTile.h"
+#include "../level/tile/TallGrass.h"
 
 const std::string DyePowderItem::COLOR_DESCS[] = {
 	"black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"
@@ -91,9 +92,9 @@ bool DyePowderItem::useOn( ItemInstance* itemInstance, Player* player, Level* le
 						  continue;
 
 					  if (level->getTile(xx, yy, zz) == 0) {
-						  /*if (random.nextInt(10) != 0) {
+						  if (random.nextInt(10) != 0) {
-						  level->setTileAndData(xx, yy, zz, Tile::tallgrass.id, TallGrass.TALL_GRASS);
+						  level->setTileAndData(xx, yy, zz, Tile::tallgrass->id, TallGrass::TALL_GRASS);
-						  } else*/ if (random.nextInt(3) != 0) {
+						  } else if (random.nextInt(3) != 0) {
 							  level->setTile(xx, yy, zz, Tile::flower->id);
 						  } else {
 							  level->setTile(xx, yy, zz, Tile::rose->id);

src/world/item/ShearsItem.h

@@ -22,7 +22,7 @@ public:
 
     /*@Override*/
     bool mineBlock(ItemInstance* itemInstance, int tile, int x, int y, int z/*, Mob* owner*/) {
-        if (tile == ((Tile*)Tile::leaves)->id || tile == Tile::web->id /*|| tile == Tile::tallgrass->id || tile == Tile::vine->id*/) {
+        if (tile == ((Tile*)Tile::leaves)->id || tile == Tile::web->id || tile == Tile::tallgrass->id /*|| tile == Tile::vine->id*/) {
             itemInstance->hurt(1);//, owner);
             return true;
         }

src/world/level/FoliageColor.h

@@ -43,7 +43,7 @@ public:
 	}
 
 	static int getDefaultColor() {
-		return 0xFFFFFF;
+		return 0x48b518;
 	}
 
 private:

src/world/level/Level.cpp

@@ -1165,7 +1165,13 @@ int Level::getSkyDarken(float a) {
 
 	float br = 1 - (Mth::cos(td * Mth::PI * 2) * 2 + 0.5f);
 	if (br < 0.0f) br = 0.0f;
-	if (br > 0.80f) br = 0.80f; //@note; was 1.0f
+	if (dimension->FogType == 1) // @TODO - probably make this not dependent on dimension type honestly - shredder
+	{
+	if (br > 1.0f) br = 1.0f; //@ uses the normal javasky color ramp when java sky type is choosen,
+	} else 
+	{
+	if (br > 0.8f) br = 0.8f; //@note; was 1.0f
+	}
 	return ((int) (br * 11));
 }
 
@@ -1174,7 +1180,14 @@ Vec3 Level::getSkyColor(Entity* source, float a) {
 
 	float br = Mth::cos(td * Mth::PI * 2) * 2 + 0.5f;
 	if (br < 0.0f) br = 0.0f;
-	if (br > 0.75f) br = 0.75f; //@note; was 1.0f
+	if (dimension->FogType == 1) // @TODO - probably make this not dependent on dimension type honestly - shredder
+	{
+	if (br > 1.0f) br = 1.0f; //@ uses the normal javasky color ramp when java sky type is choosen,
+	} else 
+	{
+	if (br > 0.8f) br = 0.8f; //@note; was 1.0f
+	}
+
 
 	int xx = Mth::floor(source->x);
 	int zz = Mth::floor(source->z);
@@ -1728,13 +1741,15 @@ void Level::extinguishFire(int x, int y, int z, int face) {
 		setTile(x, y, z, 0);
 	}
 }
-//    String gatherStats() {
+   std::string Level::gatherStats() {
-//        return "All: " + this.entities.size();
+	   std::stringstream ss;
-//    }
+	   ss << "All: " << entities.size();
-//
+       return ss.str();
-//    String gatherChunkSourceStats() {
+    }
-//        return chunkSource.gatherStats();
+
-//    }
+    std::string Level::gatherChunkSourceStats() {
+        return _chunkSource->gatherStats();
+   }
 //
 TileEntity* Level::getTileEntity(int x, int y, int z) {
 	LevelChunk* lc = getChunk(x >> 4, z >> 4);

src/world/level/Level.h

@@ -202,6 +202,9 @@ public:
 	bool checkAndHandleWater(const AABB& box, const Material* material, Entity* e);
     void extinguishFire(int x, int y, int z, int face);
 
+	std::string gatherStats();
+	std::string gatherChunkSourceStats();
+
 	//void addEntities(const EntityList& list);
 	//void removeEntities(const EntityList& list);
 	//void ensureAdded(Entity* entity);

src/world/level/biome/Biome.cpp

@@ -9,6 +9,7 @@
 #include "../../level/tile/TallGrass.h"
 
 #include "../../../util/Color.h"
+#include "../GrassColor.h"
 
 Biome* Biome::rainForest	 = NULL;
 Biome* Biome::swampland		 = NULL;
@@ -217,6 +218,26 @@ int Biome::getSkyColor( float temp )
 	return Color::getHSBColor(224 / 360.0f - temp * 0.05f, 0.50f + temp * 0.1f, 1.0f).getRGB();
 }
 
+float Biome::getDownfall()
+{
+	return downfall;
+}
+
+
+float Biome::getTemperature()
+{
+	return temperature;
+}
+
+
+int Biome::getGrassColor()
+{
+    float temp = Mth::clamp(getTemperature(), 0.0f, 1.0f);
+    float rain = Mth::clamp(getDownfall(), 0.0f, 1.0f);
+
+    return GrassColor::get(temp, rain);
+}
+
 Biome::MobList& Biome::getMobs(const MobCategory& category)
 {
     if (&category == &MobCategory::monster)

src/world/level/biome/Biome.h

@@ -78,7 +78,13 @@ public:
     virtual float adjustScale(float scale);
     virtual float adjustDepth(float depth);
 
+	
+
     virtual int getSkyColor(float temp);
+	virtual int getGrassColor();
+
+	virtual float getDownfall();			
+	virtual float getTemperature();			
 
 	virtual MobList& getMobs(const MobCategory& category);
 	virtual float getCreatureProbability();
@@ -88,6 +94,8 @@ public:
 	char topMaterial;
 	char material;
 	int leafColor;
+	float temperature;
+    float downfall;
 private:
 	static Biome* map[64*64];
 };

src/world/level/chunk/ChunkCache.h

@@ -193,7 +193,10 @@ public:
     }
 
     std::string gatherStats() {
-        return "ChunkCache: 1024";
+   //     return "ChunkCache: 1024";
+		std::stringstream ss;
+		ss << "ChunkCache: " << CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
+		return ss.str();
     }
 	
 	void saveAll(bool onlyUnsaved) {

src/world/level/dimension/Dimension.cpp

@@ -133,22 +133,29 @@ Dimension* Dimension::getNew( int id )
 	return NULL;
 }
 
+std::string Dimension::getDimension(){
+	int currentID = this->id;
+	if (currentID == Dimension::NORMAL) return "Overworld";
+	if (currentID == Dimension::NORMAL_DAYCYCLE) return "Overworld";
+	return "Unknown";
+}
+
 //
 // DimensionFactory
 //
 #include "../storage/LevelData.h"
-Dimension* DimensionFactory::createDefaultDimension(LevelData* data )
+	Dimension* DimensionFactory::createDefaultDimension(LevelData* data )
-{
+	{
-	int dimensionId = Dimension::NORMAL;
+		int dimensionId = Dimension::NORMAL;
 
-	switch(data->getGameType()) {
+		switch(data->getGameType()) {
-	case GameType::Survival: dimensionId = Dimension::NORMAL_DAYCYCLE;
+		case GameType::Survival: dimensionId = Dimension::NORMAL_DAYCYCLE;
-		break;
+			break;
-	case GameType::Creative:
+		case GameType::Creative:
-	default:
+		default:
-		dimensionId = Dimension::NORMAL;
+			dimensionId = Dimension::NORMAL;
-		break;
+			break;
-	}
+		}
 
 	return Dimension::getNew(dimensionId);
 }

src/world/level/dimension/Dimension.h

@@ -49,7 +49,7 @@ public:
 	bool hasCeiling;
 	float brightnessRamp[16];//Level::MAX_BRIGHTNESS + 1];
 	int id;
-
+	std::string getDimension();
 	// shredder added
 	int FogType; // lets us choose between what fog we want ig
 protected:

src/world/level/levelgen/RandomLevelSource.cpp

@@ -11,6 +11,7 @@
 #include "../tile/Tile.h"
 #include "../tile/HeavyTile.h"
 #include "../../../util/Random.h"
+#include "../../level/tile/TallGrass.h"
 
 const float RandomLevelSource::SNOW_CUTOFF = 0.5f;
 const float RandomLevelSource::SNOW_SCALE = 0.3f;
@@ -225,7 +226,7 @@ void RandomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) {
 	int zo = zt * 16;
 
 	Biome* biome = level->getBiomeSource()->getBiome(xo + 16, zo + 16);
-	//    Biome* biome = Biome::forest;
+//	    Biome* biome = Biome::forest;
 
 	random.setSeed(level->getSeed());
 	int xScale = random.nextInt() / 2 * 2 + 1;
@@ -419,17 +420,46 @@ void RandomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) {
 		FlowerFeature feature(Tile::mushroom2->id);
 		feature.place(level, &random, x, y, z);
 	}
-	/*int grassCount = 1;
+	// normally unused in mcpe but how its supposed to do it
-	for (int i = 0; i < grassCount; i++) {
+	//int grassCount = 1;
-	int x = xo + random.nextInt(16) + 8;
+	//for (int i = 0; i < grassCount; i++) {
-	int y = random.nextInt(Level::genDepth);
+	//int x = xo + random.nextInt(16) + 8;
-	int z = zo + random.nextInt(16) + 8;
+	//int y = random.nextInt(Level::genDepth);
-	Feature* grassFeature = biome->getGrassFeature(&random);
+	//int z = zo + random.nextInt(16) + 8;
-	if (grassFeature) {
+	//Feature* grassFeature = biome->getGrassFeature(&random);
-	grassFeature->place(level, &random, x, y, z);
+	//if (grassFeature) {
-	delete grassFeature;
+	//grassFeature->place(level, &random, x, y, z);
-	}
+	//delete grassFeature;
-	}*/
+	//}
+	//}
+
+	// reworked code from above to generate ferns and shrubs to just like in beta java
+int grassCount = 0;
+
+if (biome == Biome::forest) { grassCount = 2; }
+else if (biome == Biome::rainForest) { grassCount = 10; }
+else if (biome == Biome::seasonalForest) { grassCount = 2; }
+else if (biome == Biome::taiga) { grassCount = 1; }
+else if (biome == Biome::plains) { grassCount = 10; }
+
+for (int i = 0; i < grassCount; i++) {
+    int grassMetadata = TallGrass::TALL_GRASS;
+    
+    
+    if (biome == Biome::rainForest && random.nextInt(3) != 0) {
+        grassMetadata = TallGrass::FERN;
+    }
+
+    int x = xo + random.nextInt(16) + 8;
+     
+    int z = zo + random.nextInt(16) + 8;
+	int y = level->getHeightmap(x, z);
+
+    TallgrassFeature grassFeature(Tile::tallgrass->id, grassMetadata);
+    grassFeature.place(level, &random, x, y, z);
+}
+
+
 	for (int i = 0; i < 10; i++) {
 		int x = xo + random.nextInt(16) + 8;
 		int y = random.nextInt(128);

src/world/level/levelgen/feature/FeatureInclude.h

@@ -10,5 +10,6 @@
 #include "OreFeature.h"
 #include "ReedsFeature.h"
 #include "SpringFeature.h"
+#include "TallgrassFeature.h"
 
 #endif /*FEATURE_INCLUDE__H__*/

src/world/level/tile/LeafTile.h

@@ -60,6 +60,7 @@ public:
 			return FoliageColor::getDefaultColor();
 		}
 
+		
  //       return FoliageColor::getDefaultColor(); we need to hook this up with OPTION_FOLIAGE_TINT
 		level->getBiomeSource()->getBiomeBlock(x, z, 1, 1);
 		float temperature = level->getBiomeSource()->temperatures[0];

src/world/level/tile/TallGrass.cpp

@@ -1,8 +1,12 @@
 #include "TallGrass.h"
 #include "../FoliageColor.h"
+#include "../GrassColor.h"
 #include "../../entity/player/Player.h"
 #include "../../item/Item.h"
 #include "../../item/ShearsItem.h"
+#include "../Level.h"
+#include "../LevelSource.h"
+#include "../biome/BiomeSource.h"
 
 TallGrass::TallGrass( int id, int tex ) : super(id, tex, Material::replaceable_plant) {
 	float ss = 0.4f;
@@ -17,21 +21,40 @@ int TallGrass::getTexture( int face, int data ) {
 }
 
 int TallGrass::getColor() {
-	/*double temp = 0.5;
+	//double temp = 0.5;
-	double rain = 1.0;
+	//double rain = 1.0;
-	return GrassColor.get(temp, rain);*/
+	// converted to float for consistency - shredder
+	float temp = 0.5;
+	float rain = 1.0;
+	if (GrassColor::useTint){
+		return GrassColor::get(temp, rain);
+	}
 	return 0x339933;
 }
 
 int TallGrass::getColor( int auxData ) {
-	if(auxData == DEAD_SHRUB) return 0xffffffff;
+	if(auxData == DEAD_SHRUB);
+	if (!FoliageColor::useTint && auxData == DEAD_SHRUB){
+		return 0xffffff;
+	}
 	return FoliageColor::getDefaultColor();
 }
 
 int TallGrass::getColor( LevelSource* level, int x, int y, int z ) {
 	int d = level->getData(x, y, z);
-	if (d == DEAD_SHRUB) return 0xffffff;
+	if (d == DEAD_SHRUB); //return 0xffffff; // i removed this to make it accurate to beta 1.6.6 instead of early java release versions
-
+	float temp = level->getBiomeSource()->temperatures[0]; // shredder added
+	float rain = level->getBiomeSource()->downfalls[0]; // shredder added
+	if (!GrassColor::useTint && d == DEAD_SHRUB){
+		return 0xffffff;
+	}
+	if (GrassColor::useTint){
+		return GrassColor::get(temp, rain);
+	}
+	// @TODO port this function from beta 1.6.6 probably, for now im using biomesource to tint it directly above - shredder
+	//if (GrassColor::useTint){ 
+	//return level->getBiome(x, z)->getGrassColor();
+	//}
 	return 0x339933;//level->getBiome(x, z)->getGrassColor();
 }
 

src/world/level/tile/Tile.cpp

@@ -285,6 +285,7 @@ void Tile::initTiles() {
 	Item::items[sandStone->id] = (new AuxDataTileItem(sandStone->id - 256, sandStone))->setCategory(ItemCategory::Structures)->setDescriptionId("sandStone");
 
 	Item::items[quartzBlock->id] = (new AuxDataTileItem(quartzBlock->id - 256, quartzBlock))->setCategory(ItemCategory::Structures)->setDescriptionId("quartzBlock");
+	Item::items[tallgrass->id] = (new AuxDataTileItem(tallgrass->id - 256, tallgrass))->setCategory(ItemCategory::Decorations);
 
     for (int i = 0; i < 256; i++) {
         if (Tile::tiles[i] != NULL) {