Isometric-view

project/android_java/src/com/mojang/minecraftpe/sound/SoundPlayer.java

@@ -129,7 +129,6 @@ public class SoundPlayer
 			new SoundId(R.raw.eat1, "random.eat"),
 			new SoundId(R.raw.eat2, "random.eat"),
 			new SoundId(R.raw.eat3, "random.eat"),
-			new SoundId(R.raw.burp1, "random.burp"),
 			new SoundId(R.raw.fuse, "random.fuse"),
 
 			new SoundId(R.raw.zpig1, "mob.zombiepig.zpig"),

src/client/Minecraft.cpp

@@ -857,7 +857,6 @@ void Minecraft::tickInput() {
 			for (int i = 0; i < 5 * SharedConstants::TicksPerSecond; ++i)
 				level->tick();
 		}
-
 #endif
 	}
 
@@ -883,9 +882,6 @@ void Minecraft::tickInput() {
 			handleBuildAction(&bai);
 		} else {
 			gameMode->stopDestroyBlock();
-			if (player && player->isUsingItem()) {
-                gameMode->releaseUsingItem(player);
-            }
 		}
 	} else {
 		// Desktop: left mouse = destroy/attack

src/client/gui/Gui.cpp

@@ -224,59 +224,59 @@ void Gui::handleClick(int button, int x, int y) {
 	}
 }
 
-	void Gui::handleKeyPressed(int key)
-	{
-		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
-		if (isChatting) {
-			// Allow scrolling the chat history with the mouse/keyboard when chat is open
-			if (key == 38) { // VK_UP
-				scrollChat(1);
-				return;
-			} else if (key == 40) { // VK_DOWN
-				scrollChat(-1);
-				return;
-			} else if (key == 33) { // VK_PRIOR (Page Up)
-				// Scroll by a page
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(maxVisible);
-				return;
-			} else if (key == 34) { // VK_NEXT (Page Down)
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(-maxVisible);
-				return;
-			}
-		}
-
-		if (key == Keyboard::KEY_F1) {
-			minecraft->options.toggle(OPTIONS_HIDEGUI);
-		}
-
-		if (key == 99)
-		{
-			if (minecraft->player->inventory->selected > 0)
-			{
-				minecraft->player->inventory->selected--;
-			}
-		}
-		else if (key == 4)
-		{
-			if (minecraft->player->inventory->selected < (getNumSlots() - 2))
-			{
-				minecraft->player->inventory->selected++;
-			}
-		}
-		else if (key == 100)
-		{
-			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-		}
-		else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
-		{
-			minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+void Gui::handleKeyPressed(int key)
+{
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	if (isChatting) {
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		if (key == 38) { // VK_UP
+			scrollChat(1);
+			return;
+		} else if (key == 40) { // VK_DOWN
+			scrollChat(-1);
+			return;
+		} else if (key == 33) { // VK_PRIOR (Page Up)
+			// Scroll by a page
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(maxVisible);
+			return;
+		} else if (key == 34) { // VK_NEXT (Page Down)
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(-maxVisible);
+			return;
 		}
 	}
 
+	if (key == Keyboard::KEY_F1) {
+		minecraft->options.toggle(OPTIONS_HIDEGUI);
+	}
+
+	if (key == 99)
+	{
+		if (minecraft->player->inventory->selected > 0)
+		{
+			minecraft->player->inventory->selected--;
+		}
+	}
+	else if (key == 4)
+	{
+		if (minecraft->player->inventory->selected < (getNumSlots() - 2))
+		{
+			minecraft->player->inventory->selected++;
+		}
+	}
+	else if (key == 100)
+	{
+		minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
+	}
+	else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
+	{
+		minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+	}
+}
+
 void Gui::scrollChat(int delta) {
 	if (delta == 0)
 		return;
@@ -782,25 +782,6 @@ void Gui::renderDebugInfo() {
 	long day       = worldTime / Level::TICKS_PER_DAY;
 	long seed      = lvl ? lvl->getSeed() : 0;
 
-	// Block looking at
-	std::string CurrentTile = "Air";
-	if (minecraft->hitResult.type == TILE) {
-		int LookingX = minecraft->hitResult.x;
-		int LookingY = minecraft->hitResult.y;
-		int LookingZ = minecraft->hitResult.z;
-
-		int tileID = minecraft->level->getTile(LookingX, LookingY, LookingZ);
-		if (tileID > 0 && tileID < 256){
-			Tile* LookingTile = Tile::tiles[tileID];
-			if (LookingTile != NULL) {
-				CurrentTile = LookingTile->getDescriptionId();
-			} else {
-				CurrentTile = "Unknown Tile";
-			}
-		} else {
-			CurrentTile = "Air";
-		}
-	}
 	// Build lines (NULL entry = blank gap)
 	Font* font = minecraft->font;
 
@@ -839,9 +820,6 @@ void Gui::renderDebugInfo() {
 
 	sprintf(buf, "Biome: %s", biomeName);
 	drawString(font, buf, 2, 124, 0xE0E0E0);
-
-	sprintf(buf, "Looking at: %s", CurrentTile.c_str());
-		drawString(font, buf, 2, 134, 0xE0E0E0);
 	}
 	else if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 1){
 	

src/client/gui/screens/PauseScreen.cpp

@@ -8,6 +8,7 @@
 #include "client/Options.h"
 #include "client/gui/components/Button.h"
 #include "client/gui/screens/OptionsScreen.h"
+#include "UploadPhotoScreen.h"
 
 PauseScreen::PauseScreen(bool wasBackPaused)
 	:	saveStep(0),
@@ -17,6 +18,7 @@ PauseScreen::PauseScreen(bool wasBackPaused)
 	bOptions(0),
 	bQuitAndSaveLocally(0),
 	bServerVisibility(0),
+	bPhotoMode(0),
 	//	bThirdPerson(0),
 	wasBackPaused(wasBackPaused),
 	// bSound(OPTIONS_SOUND_VOLUME, 1, 0),
@@ -43,6 +45,7 @@ PauseScreen::~PauseScreen() {
 	delete bQuit;
 	delete bQuitAndSaveLocally;
 	delete bServerVisibility;
+	delete bPhotoMode;
 	delete bOptions;
 	//	delete bThirdPerson;
 }
@@ -51,6 +54,7 @@ void PauseScreen::init() {
 	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
 		bContinue = new Touch::TButton(1, "Back to game");
 		bOptions = new Touch::TButton(5, "Options");
+		bPhotoMode = new Touch::TButton(6, "Photo Mode");
 		bQuit = new Touch::TButton(2, "Quit to title");
 		bQuitAndSaveLocally = new Touch::TButton(3, "Quit and copy map");
 		bServerVisibility = new Touch::TButton(4, "");
@@ -58,6 +62,7 @@ void PauseScreen::init() {
 	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
 		bContinue = new Button(1, "Back to game");
 		bOptions = new Button(5, "Options");
+		bPhotoMode = new Button(6, "Photo Mode");
 		bQuit = new Button(2, "Quit to title");
 		bQuitAndSaveLocally = new Button(3, "Quit and copy map");
 		bServerVisibility = new Button(4, "");
@@ -66,6 +71,7 @@ void PauseScreen::init() {
 		bContinue = new Button(1, 0, 0, 200, 20, "Back to game");
 		bServerVisibility = new Button(4, 0, 0, 200, 20, "");
 		bOptions = new Button(5, 0, 0, 200, 20, "Options...");
+		bPhotoMode = new Button(6, 0, 0, 200, 20, "Photo Mode");
 		bQuit = new Button(2, 0, 0, 200, 20, "Save and quit to title");
 		bQuitAndSaveLocally = new Button(3, 0, 0, 200, 20, "Copy and quit map");
 		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
@@ -74,6 +80,7 @@ void PauseScreen::init() {
 	buttons.push_back(bContinue);
 	buttons.push_back(bQuit);
 	buttons.push_back(bOptions);
+	buttons.push_back(bPhotoMode);
 	// bSound.updateImage(&minecraft->options);
 	bThirdPerson.updateImage(&minecraft->options);
 	bHideGui.updateImage(&minecraft->options);
@@ -115,7 +122,7 @@ void PauseScreen::setupPositions() {
 	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
 		yBase = 50;
 
-		bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 200;
+		bContinue->width = bOptions->width = bPhotoMode->width = bQuit->width = /*bThirdPerson->w =*/ 200;
 		bQuitAndSaveLocally->width = bServerVisibility->width = 200;
 
 		bContinue->x = (width - bContinue->width) / 2;
@@ -124,6 +131,9 @@ void PauseScreen::setupPositions() {
 		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
 		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 24 * 2;
 
+		bPhotoMode->x = (width - bPhotoMode->width) / 2;
+		bPhotoMode->y = yBase + 24 * 3;
+
 		bOptions->x = (width - bOptions->width) / 2;
 		bOptions->y = yBase + 24 * 3 + 24;
 
@@ -131,7 +141,7 @@ void PauseScreen::setupPositions() {
 		bQuit->y = yBase + 24 * 4 + 24;
 
 	} else {
-		bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
+		bContinue->width = bOptions->width = bPhotoMode->width = bQuit->width = /*bThirdPerson->w =*/ 160;
 		bQuitAndSaveLocally->width = bServerVisibility->width = 160;
 
 		bContinue->x = (width - bContinue->width) / 2;
@@ -140,15 +150,18 @@ void PauseScreen::setupPositions() {
 		bOptions->x = (width - bOptions->width) / 2;
 		bOptions->y = yBase + 32 * 2;
 
+		bPhotoMode->x = (width - bPhotoMode->width) / 2;
+		bPhotoMode->y = yBase + 32 * 3;
+
 		bQuit->x = (width - bQuit->width) / 2;
-		bQuit->y = yBase + 32 * 3;
+		bQuit->y = yBase + 32 * 4;
 
 #if APPLE_DEMO_PROMOTION
 		bQuit->y += 16;
 #endif
 
 		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
+		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 5;
 	}
 
 
@@ -192,6 +205,9 @@ void PauseScreen::buttonClicked(Button* button) {
 	if (button->id == bQuit->id) {
 		minecraft->leaveGame();
 	}
+	if (button->id == bPhotoMode->id) {
+		minecraft->setScreen(new UploadPhotoScreen());
+	}
 	if (button->id == bQuitAndSaveLocally->id) {
 		minecraft->leaveGame(true);
 	}

src/client/gui/screens/PauseScreen.h

@@ -33,6 +33,7 @@ private:
 	Button* bQuit;
 	Button* bQuitAndSaveLocally;
 	Button* bServerVisibility;
+	Button* bPhotoMode;
 	Button* bOptions;
 
 	//	Button* bThirdPerson;

src/client/gui/screens/UploadPhotoScreen.cpp

@@ -1,177 +1,160 @@
-#if 0
-
-#include "UploadPhotoScreen.h"
-#include "../renderer/TileRenderer.h"
-#include "../player/LocalPlayer.h"
-#include "../../world/entity/player/Inventory.h"
-
-UploadPhotoScreen::UploadPhotoScreen()
-	:
-selectedItem(0)
-{
-}
-
-void UploadPhotoScreen::init()
-{
-	int currentSelection = minecraft->player->inventory->getSelectedItemId();
-	for (int i = 0; i < Inventory::INVENTORY_SIZE; i++)
-	{
-		if (currentSelection == minecraft->player->inventory->getSelectionSlotItemId(i + Inventory::SELECTION_SIZE))
-		{
-			selectedItem = i;
-			break;
-		}
-	}
-
-}
-
-void UploadPhotoScreen::renderSlots()
-{
-	glColor4f2(1, 1, 1, 1);
-
-	blitOffset = -90;
-
-	minecraft->textures->loadAndBindTexture("gui/gui.png");
-	for (int r = 0; r < Inventory::INVENTORY_ROWS; r++)
-	{
-		blit(width / 2 - 182 / 2, height - 22 * 3 - 22 * r, 0, 0, 182, 22);
-	}
-	if (selectedItem >= 0)
-	{
-		int x = width / 2 - 182 / 2 - 1 + (selectedItem % Inventory::SELECTION_SIZE) * 20;
-		int y = height - 22 * 3 - 1 - (selectedItem / Inventory::SELECTION_SIZE) * 22;
-		blit(x, y, 0, 22, 24, 22);
-	}
-
-	for (int r = 0; r < Inventory::INVENTORY_ROWS; r++)
-	{
-		for (int i = 0; i < 9; i++) {
-			int x = width / 2 - 9 * 10 + i * 20 + 2;
-			int y = height - 16 - 3 - 22 * 2 - 22 * r;
-			renderSlot(r * 9 + i + Inventory::SELECTION_SIZE, x, y, 0);
-		}
-	}
-
-}
-
-void UploadPhotoScreen::renderSlot(int slot, int x, int y, float a)
-{
-	int itemId = minecraft->player->inventory->getSelectionSlotItemId(slot);
-	if (itemId < 0) return;
-
-	const bool fancy = false;
-
-	if (fancy && itemId < 256 && TileRenderer::canRender(Tile::tiles[itemId]->getRenderShape())) {
-
-	} else {
-		if (itemId < 256) {
-			Tile* tile = Tile::tiles[itemId];
-			if (tile == NULL) return;
-
-			minecraft->textures->loadAndBindTexture("terrain.png");
-
-			int textureId = tile->getTexture(2, 0);
-			blit(x, y, textureId % 16 * 16, textureId / 16 * 16, 16, 16);
-		}
-	}
-
-}
-
-void UploadPhotoScreen::keyPressed(int eventKey)
-{
-	int selX = selectedItem % Inventory::SELECTION_SIZE;
-	int selY = selectedItem / Inventory::SELECTION_SIZE;
-
-	Options& o = minecraft->options;
-	if (eventKey == o.keyLeft.key && selX > 0)
-	{
-		selectedItem -= 1;
-	}
-	else if (eventKey == o.keyRight.key && selX < (Inventory::SELECTION_SIZE - 1))
-	{
-		selectedItem += 1;
-	}
-	else if (eventKey == o.keyDown.key && selY > 0)
-	{
-		selectedItem -= Inventory::SELECTION_SIZE;
-	}
-	else if (eventKey == o.keyUp.key && selY < (Inventory::INVENTORY_ROWS - 1))
-	{
-		selectedItem += Inventory::SELECTION_SIZE;
-	}
-
-	if (eventKey == o.keyMenuOk.key)
-	{
-		selectSlotAndClose();
-	}
-}
-
-int UploadPhotoScreen::getSelectedSlot(int x, int y)
-{
-	int left = 3 + width / 2 - Inventory::SELECTION_SIZE * 10;
-	int top = height - 16 - 3 - 22 * 2 - 22 * Inventory::INVENTORY_ROWS;
-
-	if (x >= left && y >= top)
-	{
-		int xSlot = (x - left) / 20;
-		if (xSlot < Inventory::SELECTION_SIZE)
-		{
-			// rows are rendered upsidedown
-			return xSlot + Inventory::INVENTORY_SIZE - ((y - top) / 22) * Inventory::SELECTION_SIZE;
-		}
-	}
-	return -1;
-}
-
-void UploadPhotoScreen::mouseClicked(int x, int y, int buttonNum) {
-	if (buttonNum == MouseAction::ACTION_LEFT) {
-
-		int slot = getSelectedSlot(x, y);
-		if (slot >= 0 && slot < Inventory::INVENTORY_SIZE)
-		{
-			selectedItem = slot;
-			//minecraft->soundEngine->playUI("random.click", 1, 1);
-		}
-	}
-}
-
-void UploadPhotoScreen::mouseReleased(int x, int y, int buttonNum)
-{
-	if (buttonNum == MouseAction::ACTION_LEFT) {
-
-		int slot = getSelectedSlot(x, y);
-		if (slot >= 0 && slot < Inventory::INVENTORY_SIZE && slot == selectedItem)
-		{
-			selectSlotAndClose();
-		}
-	}
-}
-
-void UploadPhotoScreen::selectSlotAndClose()
-{
-	Inventory* inventory = minecraft->player->inventory;
-
-	int itemId = inventory->getSelectionSlotItemId(selectedItem + Inventory::SELECTION_SIZE);
-	int i = 0;
-
-	for (; i < Inventory::SELECTION_SIZE - 2; i++)
-	{
-		if (itemId == inventory->getSelectionSlotItemId(i))
-		{
-			break;
-		}
-	}
-
-	// update selection list
-	for (; i >= 1; i--)
-	{
-		inventory->setSelectionSlotItemId(i, inventory->getSelectionSlotItemId(i - 1));
-	}
-	inventory->setSelectionSlotItemId(0, itemId);
-	inventory->selectSlot(0);
-
-	minecraft->soundEngine->playUI("random.click", 1, 1);
-	minecraft->setScreen(NULL);
-}
-
-#endif
+#include "UploadPhotoScreen.h"
+
+#include "../components/Button.h"
+#include "../../Minecraft.h"
+#include "../../player/LocalPlayer.h"
+#include "../../../world/entity/item/TripodCamera.h"
+#include "../../../world/level/Level.h"
+#include "../../../platform/input/Keyboard.h"
+#include "../../renderer/GameRenderer.h"
+#include "../../renderer/LevelRenderer.h"
+
+UploadPhotoScreen::UploadPhotoScreen()
+: hasAppliedPhotoMode(false),
+  oldHideGui(false),
+  oldThirdPerson(false),
+  oldFixedCamera(false),
+  hasOldPose(false),
+  oldX(0),
+  oldY(0),
+  oldZ(0),
+  oldYaw(0),
+  oldPitch(0),
+  photoCameraTarget(NULL),
+  photoCameraX(0),
+  photoCameraY(0),
+  photoCameraZ(0),
+  bBack(0)
+{
+}
+
+UploadPhotoScreen::~UploadPhotoScreen()
+{
+	restorePhotoMode();
+	delete photoCameraTarget;
+	delete bBack;
+}
+
+void UploadPhotoScreen::init()
+{
+	applyPhotoMode();
+
+	if (minecraft->useTouchscreen()) {
+		bBack = new Touch::TButton(1, "Back");
+	} else {
+		bBack = new Button(1, "Back");
+	}
+
+	buttons.push_back(bBack);
+	tabButtons.push_back(bBack);
+}
+
+void UploadPhotoScreen::removed()
+{
+	restorePhotoMode();
+}
+
+void UploadPhotoScreen::applyPhotoMode()
+{
+	if (hasAppliedPhotoMode || !minecraft || !minecraft->gameRenderer) return;
+
+	if (minecraft->player) {
+		oldX = minecraft->player->x;
+		oldY = minecraft->player->y;
+		oldZ = minecraft->player->z;
+		oldYaw = minecraft->player->yRot;
+		oldPitch = minecraft->player->xRot;
+		hasOldPose = true;
+	}
+
+	oldHideGui = minecraft->options.getBooleanValue(OPTIONS_HIDEGUI);
+	oldThirdPerson = minecraft->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW);
+	oldFixedCamera = minecraft->options.getBooleanValue(OPTIONS_FIXED_CAMERA);
+	Pos spawn = minecraft->level->getSharedSpawnPos();
+	photoCameraX = (float) spawn.x;
+	photoCameraY = 128.0f;
+	photoCameraZ = (float) spawn.z;
+	if (!photoCameraTarget) {
+		photoCameraTarget = new TripodCamera(minecraft->level, minecraft->player, photoCameraX, photoCameraY, photoCameraZ);
+	}
+	photoCameraTarget->setPos(photoCameraX, photoCameraY, photoCameraZ);
+	photoCameraTarget->xo = photoCameraTarget->xOld = photoCameraX;
+	photoCameraTarget->yo = photoCameraTarget->yOld = photoCameraY;
+	photoCameraTarget->zo = photoCameraTarget->zOld = photoCameraZ;
+
+	if (!oldHideGui) minecraft->options.toggle(OPTIONS_HIDEGUI);
+	if (!oldThirdPerson) minecraft->options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+	if (!oldFixedCamera) minecraft->options.toggle(OPTIONS_FIXED_CAMERA);
+
+	minecraft->gameRenderer->setPhotoModeIsometric();
+	minecraft->levelRenderer->allChanged();
+	hasAppliedPhotoMode = true;
+}
+
+void UploadPhotoScreen::tick()
+{
+	if (!hasAppliedPhotoMode || !minecraft || !minecraft->player || !minecraft->level) return;
+
+	if (photoCameraTarget) {
+		photoCameraTarget->setPos(photoCameraX, photoCameraY, photoCameraZ);
+		photoCameraTarget->xo = photoCameraTarget->xOld = photoCameraX;
+		photoCameraTarget->yo = photoCameraTarget->yOld = photoCameraY;
+		photoCameraTarget->zo = photoCameraTarget->zOld = photoCameraZ;
+		photoCameraTarget->yRot = photoCameraTarget->yRotO = 45.0f;
+		photoCameraTarget->xRot = photoCameraTarget->xRotO = 68.0f;
+		minecraft->cameraTargetPlayer = photoCameraTarget;
+	}
+}
+
+void UploadPhotoScreen::restorePhotoMode()
+{
+	if (!hasAppliedPhotoMode || !minecraft) return;
+
+	if (minecraft->options.getBooleanValue(OPTIONS_HIDEGUI) != oldHideGui) minecraft->options.toggle(OPTIONS_HIDEGUI);
+	if (minecraft->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW) != oldThirdPerson) minecraft->options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+	if (minecraft->options.getBooleanValue(OPTIONS_FIXED_CAMERA) != oldFixedCamera) minecraft->options.toggle(OPTIONS_FIXED_CAMERA);
+	minecraft->gameRenderer->clearPhotoModeIsometric();
+	minecraft->cameraTargetPlayer = minecraft->player;
+
+	if (hasOldPose && minecraft->player) {
+		minecraft->player->yRot = oldYaw;
+		minecraft->player->xRot = oldPitch;
+	}
+
+	hasAppliedPhotoMode = false;
+}
+
+void UploadPhotoScreen::keyPressed(int eventKey)
+{
+	if (eventKey == Keyboard::KEY_ESCAPE) {
+		restorePhotoMode();
+		minecraft->setScreen(NULL);
+		return;
+	}
+
+	Screen::keyPressed(eventKey);
+}
+
+void UploadPhotoScreen::buttonClicked(Button* button)
+{
+	if (!button || button->id != 1) return;
+
+	restorePhotoMode();
+	minecraft->setScreen(NULL);
+}
+
+void UploadPhotoScreen::setupPositions()
+{
+	const int buttonWidth = 120;
+	const int buttonHeight = 24;
+	bBack->width = buttonWidth;
+	bBack->height = buttonHeight;
+	bBack->x = (width - buttonWidth) / 2;
+	bBack->y = height - 32;
+}
+
+void UploadPhotoScreen::render(int xm, int ym, float a)
+{
+	drawCenteredString(font, "Photo Mode - Isometric", width / 2, 12, 0xffffff);
+	Screen::render(xm, ym, a);
+}

src/client/gui/screens/UploadPhotoScreen.h

@@ -1,36 +1,50 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
-#define NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
-
-#include "Screen.h"
-
-class UploadPhotoScreen : public Screen
-{
-public:
-
-	UploadPhotoScreen();
-	virtual ~UploadPhotoScreen() {}
-
-	virtual void init();
-
-	void render(int xm, int ym, float a) {
-		Screen::render(xm, ym, a);
-	}
-
-protected:
-
-	virtual void mouseClicked(int x, int y, int buttonNum);
-	virtual void mouseReleased(int x, int y, int buttonNum);
-	virtual void keyPressed(int eventKey);
-
-private:
-
-	int selectedItem;
-
-	void renderSlots();
-	void renderSlot(int slot, int x, int y, float a);
-
-	int getSelectedSlot(int x, int y);
-	void selectSlotAndClose();
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__*/
+#ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
+#define NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
+
+#include "../Screen.h"
+
+class Button;
+class Mob;
+
+class UploadPhotoScreen : public Screen
+{
+public:
+
+	UploadPhotoScreen();
+	virtual ~UploadPhotoScreen();
+
+	virtual void init();
+	virtual void setupPositions();
+	virtual void tick();
+	virtual void removed();
+	virtual void keyPressed(int eventKey);
+
+	virtual void render(int xm, int ym, float a);
+
+protected:
+
+	virtual void buttonClicked(Button* button);
+
+private:
+
+	void applyPhotoMode();
+	void restorePhotoMode();
+
+	bool hasAppliedPhotoMode;
+	bool oldHideGui;
+	bool oldThirdPerson;
+	bool oldFixedCamera;
+	bool hasOldPose;
+	float oldX;
+	float oldY;
+	float oldZ;
+	float oldYaw;
+	float oldPitch;
+	Mob* photoCameraTarget;
+	float photoCameraX;
+	float photoCameraY;
+	float photoCameraZ;
+	Button* bBack;
+};
+
+#endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__*/

src/client/model/HumanoidModel.cpp

@@ -40,9 +40,10 @@ HumanoidModel::HumanoidModel( float g /*= 0*/, float yOffset /*= 0*/, int texW /
 	head.addBox(-4, -8, -4, 8, 8, 8, g); // Head
 	head.setPos(0, 0 + yOffset, 0);
 
-	hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
-	hair.setPos(0, 0 + yOffset, 0);
-
+	if (modernSkin) {
+		hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
+		hair.setPos(0, 0 + yOffset, 0);
+	}
 
 	body.addBox(-4, 0, -2, 8, 12, 4, g); // Body
 	body.setPos(0, 0 + yOffset, 0);
@@ -98,17 +99,17 @@ void HumanoidModel::render(Entity* e, float time, float r, float bob, float yRot
 	setupAnim(time, r, bob, yRot, xRot, scale);
 	
 	// Sync overlay with head rotation/position
-	
-	hair.xRot = head.xRot;
-	hair.yRot = head.yRot;
-	hair.zRot = head.zRot;
-	hair.y = head.y;
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.xRot = head.xRot;
+		hair.yRot = head.yRot;
+		hair.zRot = head.zRot;
+		hair.y = head.y;
+	}
 
 	head.render(scale);
-	
-	hair.render(scale);
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.render(scale);
+	}
 	body.render(scale);
 	arm0.render(scale);
 	arm1.render(scale);
@@ -122,12 +123,12 @@ void HumanoidModel::render( HumanoidModel* model, float scale )
 	head.yRot = model->head.yRot;
 	head.y = model->head.y;
 	head.xRot = model->head.xRot;
-	
-	hair.yRot = head.yRot;
-	hair.xRot = head.xRot;
-	hair.zRot = head.zRot;
-	hair.y = head.y;
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.yRot = head.yRot;
+		hair.xRot = head.xRot;
+		hair.zRot = head.zRot;
+		hair.y = head.y;
+	}
 
 	arm0.xRot = model->arm0.xRot;
 	arm0.zRot = model->arm0.zRot;
@@ -272,7 +273,7 @@ void HumanoidModel::onGraphicsReset()
 	arm1.onGraphicsReset();
 	leg0.onGraphicsReset();
 	leg1.onGraphicsReset();
-	hair.onGraphicsReset();
+	//hair.onGraphicsReset();
 }
 
 //void renderHair(float scale) {

src/client/player/LocalPlayer.cpp

@@ -355,11 +355,7 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string&
 	armorTypeHash(0),
 	sprinting(false),
 	sprintDoubleTapTimer(0),
-	prevForwardHeld(false),
-	xBob(0.0f),
-	yBob(0.0f),
-	xBobO(0.0f),
-	yBobO(0.0f)
+	prevForwardHeld(false)
 {
 	this->dimension = dimension;
 	_init();
@@ -554,10 +550,6 @@ void LocalPlayer::aiStep() {
 
 	//if (onGround && abilities.flying)
 	//	abilities.flying = false;
-	yBobO = yBob;
-	xBobO = xBob;
-	xBob += (xRot - xBob) * 0.5;
-	yBob += (yRot - yBob) * 0.5;
 
 	if (interpolateOnly())
 		updateAi();

src/client/player/LocalPlayer.h

@@ -22,10 +22,6 @@ public:
 	virtual void reset();
 
 	void tick();
-
-	float yBob, xBob;	// shredder added from b1.8/4j for the hand swaying animation
-	float yBobO, xBobO; // shredder added from b1.8/4j for the hand swaying animation
-
     void move(float xa, float ya, float za);
 
     void aiStep();

src/client/renderer/GameRenderer.cpp

@@ -34,6 +34,7 @@ static int _shTicks = -1;
 GameRenderer::GameRenderer( Minecraft* mc )
 	:	mc(mc),
 	renderDistance(0),
+	photoModeIsometric(false),
 	_tick(0),
 	_lastTickT(0),
 	fovOffset(0),
@@ -90,7 +91,7 @@ void renderCursor(float x, float y, Minecraft* minecraft) {
 
 /*private*/
 void GameRenderer::setupCamera(float a, int eye) {
-	renderDistance = (float) (16 * 16 >> (mc->options.getIntValue(OPTIONS_VIEW_DISTANCE)));
+    renderDistance = photoModeIsometric ? 1024.0f : (float) (16 * 16 >> (mc->options.getIntValue(OPTIONS_VIEW_DISTANCE)));
 #if defined(ANDROID)
 	if (mc->isPowerVR() && mc->options.getIntValue(OPTIONS_VIEW_DISTANCE) <= 2)
 		renderDistance *= 0.8f;
@@ -314,7 +315,7 @@ void GameRenderer::renderLevel(float a) {
 		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)) { 
+		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && !photoModeIsometric) { 
 			prepareAndRenderClouds(levelRenderer, a);
 		}
 		}
@@ -347,7 +348,6 @@ void GameRenderer::renderLevel(float a) {
 		Lighting::turnOff();
 		glDisable2(GL_BLEND);
 		glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		Lighting::turnOff();
 		setupFog(0);
 		glEnable2(GL_BLEND);
 		glDisable2(GL_CULL_FACE);
@@ -574,6 +574,14 @@ void GameRenderer::bobView(float a) {
 
 /*private*/
 void GameRenderer::setupFog(int i) {
+	if (photoModeIsometric) {
+		glDisable2(GL_FOG);
+		glFogf(GL_FOG_START, 0.0f);
+		glFogf(GL_FOG_END, 1024.0f);
+		glEnable2(GL_COLOR_MATERIAL);
+		return;
+	}
+
 	Mob* player = mc->cameraTargetPlayer;
 	float fogBuffer[4] = {fr, fg, fb, 1};
 
@@ -830,6 +838,14 @@ void GameRenderer::tick(int nTick, int maxTick) {
 
 /*private*/
 void GameRenderer::setupClearColor(float a) {
+	if (photoModeIsometric) {
+		fr = 0.47f;
+		fg = 0.78f;
+		fb = 1.0f;
+		glClearColor(fr, fg, fb, 1.0f);
+		return;
+	}
+
 	Level* level = mc->level;
 	Mob* player = mc->cameraTargetPlayer;
 
@@ -943,6 +959,28 @@ void GameRenderer::onGraphicsReset()
 	if (itemInHandRenderer) itemInHandRenderer->onGraphicsReset();
 }
 
+void GameRenderer::setPhotoModeIsometric()
+{
+	photoModeIsometric = true;
+	thirdDistance = thirdDistanceO = 128.0f;
+	thirdRotation = thirdRotationO = 45.0f;
+	thirdTilt = thirdTiltO = 56.0f;
+	zoom = 1.0f;
+	zoom_x = 0.0f;
+	zoom_y = 0.0f;
+	cameraRoll = cameraRollO = 0.0f;
+}
+
+void GameRenderer::clearPhotoModeIsometric()
+{
+	photoModeIsometric = false;
+}
+
+bool GameRenderer::isPhotoModeIsometric() const
+{
+	return photoModeIsometric;
+}
+
 void GameRenderer::saveMatrices()
 {
 #if defined(RPI)

src/client/renderer/GameRenderer.h

@@ -33,6 +33,9 @@ public:
 	void renderItemInHand(float a, int eye);
 
 	void onGraphicsReset();
+	void setPhotoModeIsometric();
+	void clearPhotoModeIsometric();
+	bool isPhotoModeIsometric() const;
 
 	void setupCamera(float a, int eye);
 	void moveCameraToPlayer(float a);
@@ -58,6 +61,7 @@ private:
 	Minecraft* mc;
 
 	float renderDistance;
+	bool photoModeIsometric;
 	int _tick;
 	Vec3 pickDirection;
 

src/client/renderer/ItemInHandRenderer.cpp

@@ -280,9 +280,6 @@ void ItemInHandRenderer::render( float a )
 	float h = oHeight + (height - oHeight) * a;
 	Player* player = mc->player;
 	// if (selectedTile==NULL) return;
-	LocalPlayer* localPlayer = (LocalPlayer*)(player);
-
-	float xr = player->xRotO + (player->xRot - player->xRotO) * a; // shredder added for hand swaying
 
 	glPushMatrix2();
 	glRotatef2(player->xRotO + (player->xRot - player->xRotO) * a, 1, 0, 0);
@@ -291,16 +288,6 @@ void ItemInHandRenderer::render( float a )
 	Lighting::turnOn(mc);
 	glPopMatrix2();
 
-	 if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
-	{
-        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
-        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
-		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
-		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
-        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
-        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
-    }
-
 	float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
 
 	ItemInstance* item;// = selectedItem;

src/client/renderer/LevelRenderer.cpp

@@ -193,7 +193,9 @@ void LevelRenderer::allChanged()
 	TileRenderer::setUseTint(sideTint);
 
 
-	int dist = (512 >> 3) << (3 - lastViewDistance);
+	int dist = mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()
+		? 1024
+		: (512 >> 3) << (3 - lastViewDistance);
 	if (lastViewDistance <= 2 && mc->isPowerVR())
 		dist = (int)((float)dist * 0.8f);
 	LOGI("last: %d, power: %d\n", lastViewDistance, mc->isPowerVR());
@@ -202,7 +204,9 @@ void LevelRenderer::allChanged()
 	dist *= 0.6f;
 #endif
 
-	if (dist > 400) dist = 400;
+	if (!(mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric())) {
+		if (dist > 400) dist = 400;
+	}
 	/*
 	* if (Minecraft.FLYBY_MODE) { dist = 512 - CHUNK_SIZE * 2; }
 	*/
@@ -674,9 +678,11 @@ void LevelRenderer::tick()
 
 bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 {
-	bool slow = false;
+	bool slow = mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric();
 
 	if (slow) {
+		const int visibleLimit = 12;
+		const int invisibleLimit = 4;
 		DirtyChunkSorter dirtySorter(player);
 		std::sort(dirtyChunks.begin(), dirtyChunks.end(), dirtySorter);
 		int s = dirtyChunks.size() - 1;
@@ -686,9 +692,9 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 			if (!force) {
 				if (chunk->distanceToSqr(player) > 16 * 16) {
 					if (chunk->visible) {
-						if (i >= MAX_VISIBLE_REBUILDS_PER_FRAME) return false;
+						if (i >= visibleLimit) return false;
 					} else {
-						if (i >= MAX_INVISIBLE_REBUILDS_PER_FRAME) return false;
+						if (i >= invisibleLimit) return false;
 					}
 				}
 			} else {
@@ -702,10 +708,9 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 
 		return dirtyChunks.size() == 0;
 	} else {
-		const int count = 3;
-
+		const int count = (mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()) ? 32 : 3;
+		Chunk* toAdd[24] = {NULL};
 		DirtyChunkSorter dirtyChunkSorter(player);
-		Chunk* toAdd[count] = {NULL};
 		std::vector<Chunk*>* nearChunks = NULL;
 
 		int pendingChunkSize = dirtyChunks.size();
@@ -715,7 +720,7 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 			Chunk* chunk = dirtyChunks[i];
 
 			if (!force) {
-				if (chunk->distanceToSqr(player) > 1024.0f) {
+				if (chunk->distanceToSqr(player) > ((mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()) ? 65536.0f : 1024.0f)) {
 					int index;
 
 					// is this chunk in the closest <count>?
@@ -754,7 +759,7 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 
 		// if there are nearby chunks that need to be prepared for
 		// rendering, sort them and then process them
-		static const float MaxFrameTime = 1.0f / 100.0f;
+		static const float MaxFrameTime = (mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()) ? (1.0f / 75.0f) : (1.0f / 100.0f);
 		Stopwatch chunkWatch;
 		chunkWatch.start();
 

src/client/renderer/entity/EntityRenderer.cpp

@@ -133,8 +133,6 @@ void EntityRenderer::postRender(Entity* entity, float x, float y, float z, float
 	}
 		if (entity->isOnFire()) renderFlame(entity, x, y, z, a);
 }
-// duplicate renderflame below is the pre b1.6.6 way flame rendered on player and mobs, probs gonna make it an option. - shredder
-/*
 void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
 	glDisable(GL_LIGHTING);
 	int tex = ((Tile*)Tile::fire)->tex;
@@ -180,75 +178,6 @@ void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a)
 	glPopMatrix2();
 	glEnable2(GL_LIGHTING);
 }
-*/
-// new renderflame ported from b1.6.6, fixes player height offset and also uses the newer style - shredder
-void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
-    glDisable(GL_LIGHTING);
-    int tex = ((Tile*)Tile::fire)->tex;
-
-    int xt = (tex & 0xf) << 4;
-    int yt = tex & 0xf0;
-
-    float u0 = (xt) / 256.0f;
-    float u1 = (xt + 15.99f) / 256.0f;
-    float v0 = (yt) / 256.0f;
-    float v1 = (yt + 15.99f) / 256.0f;
-
-    glPushMatrix2();
-    glTranslatef2((float) x, (float) y, (float) z);
-
-    float s = e->bbWidth * 1.4f;
-    glScalef2(s, s, s);
-    bindTexture("terrain.png");
-    Tesselator& t = Tesselator::instance;
-
-    float r = 0.5f; 
-    float xo = 0.0f;
-
-    float h = e->bbHeight / s;
-	float yo = (float)(e->y - e->bb.y0) / s; 
-
-    glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
-    glTranslatef2(0, 0, -0.3f + ((int) h) * 0.02f);
-    glColor4f2(1, 1, 1, 1);
-    
-    float zo = 0.0f; 
-    int cycle_counter = 0;
-
-    t.begin();
-    while (h > 0.0f) {
-        float current_u0 = u0;
-        float current_u1 = u1;
-        float current_v0 = v0;
-        float current_v1 = v1;
-
-        if (cycle_counter % 2 != 0) {
-            current_v0 = (yt + 16) / 256.0f;
-            current_v1 = (yt + 16 + 15.99f) / 256.0f;
-        }
-
-        if ((cycle_counter / 2) % 2 == 0) {
-            float tmp = current_u1;
-            current_u1 = current_u0;
-            current_u0 = tmp;
-        }
-
-        t.vertexUV(r - xo, 0.0f - yo, zo, current_u1, current_v1);
-        t.vertexUV(-r - xo, 0.0f - yo, zo, current_u0, current_v1);
-        t.vertexUV(-r - xo, 1.4f - yo, zo, current_u0, current_v0);
-        t.vertexUV(r - xo, 1.4f - yo, zo, current_u1, current_v0);
-        
-        h -= 0.45f;
-        yo -= 0.45f;
-        r *= 0.9f;   
-        zo += 0.03f;
-        cycle_counter++;
-    }
-    t.draw();
-    
-    glPopMatrix2();
-    glEnable2(GL_LIGHTING);
-}
 
 void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float pow, float a) { //
 	glEnable2(GL_BLEND);
@@ -300,8 +229,6 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 			glColor4f2(1, 1, 1, 1);
 			glDisable2(GL_BLEND);
 			glDepthMask(true);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 }
 
 Level* EntityRenderer::getLevel() {

src/client/renderer/entity/MobRenderer.cpp

@@ -218,8 +218,6 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa
 
 	glScalef2(-s, -s, s);
 
-	glDisable(GL_LIGHTING);
-
 	glDepthMask(false);
 	glDisable2(GL_DEPTH_TEST);
 	glEnable2(GL_BLEND);
@@ -243,7 +241,6 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa
 
 	glDepthMask(true);
 	font->draw(name, (float) fnameWidth, 0, 0xffffffff);
-	glEnable(GL_LIGHTING);
 	glDisable2(GL_BLEND);
 	glColor4f2(1, 1, 1, 1);
 	glPopMatrix2();

src/client/sound/Sound.cpp

@@ -111,7 +111,6 @@
 #include "data/eat1.pcm"
 #include "data/eat2.pcm"
 #include "data/eat3.pcm"
-#include "data/burp1.pcm"
 #include "data/fuse.pcm"
 
 SoundDesc SA_cloth1((char*)PCM_cloth1);
@@ -222,7 +221,6 @@ SoundDesc SA_creeperdeath((char*)PCM_creeperdeath);
 SoundDesc SA_eat1((char*)PCM_eat1);
 SoundDesc SA_eat2((char*)PCM_eat2);
 SoundDesc SA_eat3((char*)PCM_eat3);
-SoundDesc SA_burp1((char*)PCM_burp1);
 SoundDesc SA_fuse((char*)PCM_fuse);
 
 #endif /*!PRE_ANDROID23 && !__APPLE__*/

src/client/sound/Sound.h

@@ -172,7 +172,6 @@ extern SoundDesc SA_creeperdeath;
 extern SoundDesc SA_eat1;
 extern SoundDesc SA_eat2;
 extern SoundDesc SA_eat3;
-extern SoundDesc SA_burp1;
 extern SoundDesc SA_fuse;
 
 #endif /*!PRE_ANDROID23 && !__APPLE__*/

src/client/sound/SoundEngine.cpp

@@ -144,7 +144,6 @@ void SoundEngine::init( Minecraft* mc, Options* options )
 	sounds.add("random.eat", SA_eat1);
 	sounds.add("random.eat", SA_eat2);
 	sounds.add("random.eat", SA_eat3);
-	sounds.add("random.burp", SA_burp1);
 	sounds.add("random.fuse", SA_fuse);
 
 #endif

src/client/sound/SoundEngine.mm

@@ -227,7 +227,6 @@ void SoundEngine::init( Minecraft* mc, Options* options )
     sounds.add( "random.eat",  _pp("eat1"));
     sounds.add( "random.eat",  _pp("eat2"));
     sounds.add( "random.eat",  _pp("eat3"));
-    sounds.add( "random.burp",  _pp("burp1"));
     sounds.add( "random.fuse", _pp("fuse"));
 
     sounds.add(	"step.cloth", _pp("cloth1"));

src/world/entity/Entity.cpp

@@ -465,15 +465,6 @@ void Entity::tick()
 	baseTick();
 }
 
-void Entity::setOnFire(int numberOfSeconds)
-{
-    int newValue = numberOfSeconds * 20;
-    if (onFire < newValue)
-    {
-        onFire = newValue;
-    }
-}
-
 void Entity::baseTick()
 {
 	TIMER_PUSH("entityBaseTick");

src/world/entity/Entity.h

@@ -89,8 +89,6 @@ public:
 	virtual bool isAlive();
 	virtual bool isOnFire();
 
-	virtual void setOnFire(int numberOfSeconds);
-
 	virtual bool isPlayer();
 	virtual bool isCreativeModeAllowed();
 

src/world/entity/Mob.cpp

@@ -169,9 +169,7 @@ void Mob::playAmbientSound()
 		level->playSound(this, ambient, getSoundVolume(), getVoicePitch());
 	}
 }
-bool Mob::isOnFire() {
-    return onFire > 0 || getSharedFlag(SharedFlagsInformation::FLAG_ONFIRE);
-}
+
 void Mob::baseTick()
 {
 	oAttackAnim = attackAnim;
@@ -179,18 +177,6 @@ void Mob::baseTick()
 
 	TIMER_PUSH("mobBaseTick");
 
-// @TODO - check if this section i added to make fire render in mp doesnt break crap - shredder
-	if (!level->isClientSide) {
-        // Server side: Tell the client if this mob/player is still burning
-        setSharedFlag(SharedFlagsInformation::FLAG_ONFIRE, onFire > 0);
-    } else {
-        // Client side: If the server flag says we aren't on fire, extinguish local visual timer
-        if (!getSharedFlag(SharedFlagsInformation::FLAG_ONFIRE)) {
-            onFire = 0;
-        }
-    }
-// todo ends here
-
 	if (((ambientSoundTime++ & 15) == 0) && random.nextInt(2000) < ambientSoundTime) {
 	    ambientSoundTime = -getAmbientSoundInterval();
 	    playAmbientSound();

src/world/entity/Mob.h

@@ -52,7 +52,6 @@ public:
     virtual bool isPickable();
     virtual bool isPushable();
 
-	virtual bool isOnFire();
 	virtual bool isShootable();
 
 	MoveControl* getMoveControl();

src/world/entity/monster/Skeleton.cpp

@@ -19,7 +19,7 @@ void Skeleton::aiStep() {
 		float br = getBrightness(1);
 		if (br > 0.5f) {
 			if (level->canSeeSky(Mth::floor(x), Mth::floor(y), Mth::floor(z)) && random.nextFloat() * 3.5f < (br - 0.4f)) {
-			//	hurt(NULL, 1); // no use anymore since i restored setOnFire - shredder
+				hurt(NULL, 1);
 
 				for (int i = 0; i < 5; ++i) {
 					float xa = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
@@ -27,7 +27,7 @@ void Skeleton::aiStep() {
 					float za = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
 					level->addParticle(PARTICLETYPE(explode), x + random.nextFloat() * bbWidth * 2 - bbWidth, y + random.nextFloat() * bbHeight, z + random.nextFloat() * bbWidth * 2 - bbWidth, xa, ya, za);
 				}
-				setOnFire(8); //@todo
+				//setOnFire(8); //@todo
 			}
 		}
 	}

src/world/entity/monster/Zombie.cpp

@@ -55,7 +55,7 @@ void Zombie::aiStep() {
 		float br = getBrightness(1);
 		if (br > 0.5f) {
 			if (level->canSeeSky(Mth::floor(x), Mth::floor(y), Mth::floor(z)) && random.nextFloat() * 3.5f < (br - 0.4f)) {
-			//	hurt(NULL, 1); // no use anymore since i restored setOnFire - shredder
+				hurt(NULL, 1);
 
 				for (int i = 0; i < 5; ++i) {
 					float xa = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
@@ -63,7 +63,7 @@ void Zombie::aiStep() {
 					float za = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
 					level->addParticle(PARTICLETYPE(explode), x + random.nextFloat() * bbWidth * 2 - bbWidth, y + random.nextFloat() * bbHeight, z + random.nextFloat() * bbWidth * 2 - bbWidth, xa, ya, za);
 				}
-				setOnFire(8); //@todo
+				//setOnFire(8); //@todo
 			}
 		}
 	}

src/world/entity/player/Player.cpp

@@ -216,7 +216,6 @@ bool Player::checkBed() {
 	return (level->getTile(bedPosition.x, bedPosition.y, bedPosition.z) == Tile::bed->id);
 }
 
-
 void Player::tick() {
 	bool shouldSleep = entityData.getFlag<SharedFlagsInformation::SharedFlagsInformationType>(DATA_PLAYER_FLAGS_ID, PLAYER_SLEEP_FLAG);
 	if(shouldSleep != isSleeping()) {
@@ -247,24 +246,11 @@ void Player::tick() {
 	}
     super::tick();
 
-
 	if (!level->isClientSide) {
-		// @TODO - Awful Hack Start, MCPE 0.6 doesn't deal damage with fire to players for some reason on mp, so we force it here to do it, need a better way honestly - shredder
-		if (level->containsFireTile(this->bb)) {
-            hurt(NULL, 1); 
-            
-            if (!isInWater()) {
-                if (onFire <= 0) {
-                    onFire = 20 * 15; 
-                }
-            }
-        }
-		// Awful hack ends here
-
 		foodData.tick(this);
-		//	if (containerMenu != NULL && !containerMenu->stillValid(this)) {
-		//		closeContainer();
-		//	}
+	//	if (containerMenu != NULL && !containerMenu->stillValid(this)) {
+	//		closeContainer();
+	//	}
 	}
 }