added missing audio random.burp when finishing a food item

Reviewed-on: https://192.168.0.2:3000/Kolyah35/minecraft-pe-0.6.1/pulls/13

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

@@ -129,6 +129,7 @@ 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/gamemode/CreativeMode.cpp

@@ -1,69 +1,56 @@
-#include "CreativeMode.h"
+#include "CreativeMode.h"
-#include "../Minecraft.h"
+#include "../Minecraft.h"
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-#include "../particle/ParticleEngine.h"
+#include "../particle/ParticleEngine.h"
-#endif
+#endif
-#include "../player/LocalPlayer.h"
+#include "../player/LocalPlayer.h"
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-#include "../renderer/LevelRenderer.h"
+#include "../renderer/LevelRenderer.h"
-#include "../sound/SoundEngine.h"
+#include "../sound/SoundEngine.h"
-#endif
+#endif
-#include "../../world/level/Level.h"
+#include "../../world/level/Level.h"
-//#include "../../network/Packet.h"
+//#include "../../network/Packet.h"
-#include "../../network/packet/RemoveBlockPacket.h"
+#include "../../network/packet/RemoveBlockPacket.h"
-#include "../../world/entity/player/Abilities.h"
+#include "../../world/entity/player/Abilities.h"
-
+
-static const int DestructionTickDelay = 5;
+static const int DestructionTickDelay = 5;
-
+
-CreativeMode::CreativeMode(Minecraft* minecraft)
+CreativeMode::CreativeMode(Minecraft* minecraft)
-: 	super(minecraft)
+: 	super(minecraft)
-{
+{
-}
+}
-
+
-void CreativeMode::startDestroyBlock(int x, int y, int z, int face) {
+void CreativeMode::startDestroyBlock(int x, int y, int z, int face) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
+	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
+		return;
-
+
-	creativeDestroyBlock(x, y, z, face);
+	creativeDestroyBlock(x, y, z, face);
-	destroyDelay = DestructionTickDelay;
+	destroyDelay = DestructionTickDelay;
-}
+}
-
+
-void CreativeMode::creativeDestroyBlock(int x, int y, int z, int face) {
+void CreativeMode::creativeDestroyBlock(int x, int y, int z, int face) {
-	minecraft->level->extinguishFire(x, y, z, face);
+	minecraft->level->extinguishFire(x, y, z, face);
-	destroyBlock(x, y, z, face);
+	destroyBlock(x, y, z, face);
-}
+}
-
+
-void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
+void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
-	destroyDelay--;
+	destroyDelay--;
-	if (destroyDelay <= 0) {
+	if (destroyDelay <= 0) {
-		destroyDelay = DestructionTickDelay;
+		destroyDelay = DestructionTickDelay;
-		creativeDestroyBlock(x, y, z, face);
+		creativeDestroyBlock(x, y, z, face);
-	}
+	}
-}
+}
-
+
-void CreativeMode::stopDestroyBlock() {
+void CreativeMode::stopDestroyBlock() {
-	destroyDelay = 0;
+	destroyDelay = 0;
-}
+}
-
+
-void CreativeMode::initAbilities( Abilities& abilities ) {
+void CreativeMode::initAbilities( Abilities& abilities ) {
-	abilities.mayfly = true;
+	abilities.mayfly = true;
-	abilities.instabuild = true;
+	abilities.instabuild = true;
-	abilities.invulnerable = true;
+	abilities.invulnerable = true;
-}
+}
-
+
-bool CreativeMode::isCreativeType() {
+bool CreativeMode::isCreativeType() {
-	return true;
+	return true;
-}
+}
-
-void CreativeMode::releaseUsingItem( Player* player ) {
-	if(player->getCarriedItem() != NULL) {
-		int oldItemId = player->getCarriedItem()->id;
-		int oldAux = player->getAuxData();
-		super::releaseUsingItem(player);
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
-			player->getCarriedItem()->setAuxValue(oldAux);
-		}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}

src/client/gamemode/CreativeMode.h

@@ -1,27 +1,26 @@
-#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
+#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
-#define NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
+#define NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
-
+
-//package net.minecraft.client.gamemode;
+//package net.minecraft.client.gamemode;
-
+
-#include "GameMode.h"
+#include "GameMode.h"
-
+
-class CreativeMode: public GameMode
+class CreativeMode: public GameMode
-{
+{
-	typedef GameMode super;
+	typedef GameMode super;
-public:
+public:
-    CreativeMode(Minecraft* minecraft);
+    CreativeMode(Minecraft* minecraft);
-
+
-    void startDestroyBlock(int x, int y, int z, int face);
+    void startDestroyBlock(int x, int y, int z, int face);
-    void continueDestroyBlock(int x, int y, int z, int face);
+    void continueDestroyBlock(int x, int y, int z, int face);
-    void stopDestroyBlock();
+    void stopDestroyBlock();
-
+
-	bool isCreativeType();
+	bool isCreativeType();
-
+
-	void initAbilities(Abilities& abilities);
+	void initAbilities(Abilities& abilities);
-
+
-	void releaseUsingItem(Player* player);
+private:
-private:
+	void creativeDestroyBlock(int x, int y, int z, int face);
-	void creativeDestroyBlock(int x, int y, int z, int face);
+};
-};
+
-
+#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__*/
-#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__*/

src/client/gamemode/CreatorMode.cpp

@@ -1,115 +1,102 @@
-#include "CreatorMode.h"
+#include "CreatorMode.h"
-#include "../Minecraft.h"
+#include "../Minecraft.h"
-#include "../particle/ParticleEngine.h"
+#include "../particle/ParticleEngine.h"
-#include "../player/LocalPlayer.h"
+#include "../player/LocalPlayer.h"
-#include "../renderer/LevelRenderer.h"
+#include "../renderer/LevelRenderer.h"
-#include "../sound/SoundEngine.h"
+#include "../sound/SoundEngine.h"
-#include "../../world/level/Level.h"
+#include "../../world/level/Level.h"
-//#include "../../network/Packet.h"
+//#include "../../network/Packet.h"
-#include "../../network/packet/RemoveBlockPacket.h"
+#include "../../network/packet/RemoveBlockPacket.h"
-#include "../../world/entity/player/Abilities.h"
+#include "../../world/entity/player/Abilities.h"
-
+
-static const int DestructionTickDelay = 5;
+static const int DestructionTickDelay = 5;
-
+
-class Creator: public ICreator {
+class Creator: public ICreator {
-	//virtual void getEvents();
+	//virtual void getEvents();
-
+
-public:
+public:
-	Creator(/*int eventLifeTime*/)
+	Creator(/*int eventLifeTime*/)
-	:	_tileEvents(32),
+	:	_tileEvents(32),
-		_tickId(0)
+		_tickId(0)
-	{
+	{
-	}
+	}
-
+
-	void setTick(int tick) {
+	void setTick(int tick) {
-		_tickId = tick;
+		_tickId = tick;
-	}
+	}
-
+
-	EventList<TileEvent>& getTileEvents() { return _tileEvents; }
+	EventList<TileEvent>& getTileEvents() { return _tileEvents; }
-
+
-	void addevent_blockUse(int entityId, int x, int y, int z, int face) {
+	void addevent_blockUse(int entityId, int x, int y, int z, int face) {
-		TileEvent t = {
+		TileEvent t = {
-			entityId,
+			entityId,
-			x,y,z,
+			x,y,z,
-			face
+			face
-		};
+		};
-		_tileEvents.add(t, _tickId);
+		_tileEvents.add(t, _tickId);
-	}
+	}
-
+
-private:
+private:
-	EventList<TileEvent> _tileEvents;
+	EventList<TileEvent> _tileEvents;
-	int _tickId;
+	int _tickId;
-};
+};
-
+
-CreatorMode::CreatorMode(Minecraft* minecraft)
+CreatorMode::CreatorMode(Minecraft* minecraft)
-:	super(minecraft)
+:	super(minecraft)
-{
+{
-	_creator = new Creator();
+	_creator = new Creator();
-}
+}
-
+
-CreatorMode::~CreatorMode() {
+CreatorMode::~CreatorMode() {
-	delete _creator;
+	delete _creator;
-}
+}
-
+
-void CreatorMode::startDestroyBlock(int x, int y, int z, int face) {
+void CreatorMode::startDestroyBlock(int x, int y, int z, int face) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
+	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
+		return;
-
+
-	CreatorDestroyBlock(x, y, z, face);
+	CreatorDestroyBlock(x, y, z, face);
-	destroyDelay = DestructionTickDelay;
+	destroyDelay = DestructionTickDelay;
-}
+}
-
+
-void CreatorMode::CreatorDestroyBlock(int x, int y, int z, int face) {
+void CreatorMode::CreatorDestroyBlock(int x, int y, int z, int face) {
-	minecraft->level->extinguishFire(x, y, z, face);
+	minecraft->level->extinguishFire(x, y, z, face);
-	destroyBlock(x, y, z, face);
+	destroyBlock(x, y, z, face);
-}
+}
-
+
-void CreatorMode::continueDestroyBlock(int x, int y, int z, int face) {
+void CreatorMode::continueDestroyBlock(int x, int y, int z, int face) {
-	destroyDelay--;
+	destroyDelay--;
-	if (destroyDelay <= 0) {
+	if (destroyDelay <= 0) {
-		destroyDelay = DestructionTickDelay;
+		destroyDelay = DestructionTickDelay;
-		CreatorDestroyBlock(x, y, z, face);
+		CreatorDestroyBlock(x, y, z, face);
-	}
+	}
-}
+}
-
+
-bool CreatorMode::useItemOn( Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit ) {
+bool CreatorMode::useItemOn( Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit ) {
-	if (item && item->id == ((Item*)Item::sword_iron)->id)
+	if (item && item->id == ((Item*)Item::sword_iron)->id)
-		_creator->addevent_blockUse(player->entityId, x, y, z, face);
+		_creator->addevent_blockUse(player->entityId, x, y, z, face);
-	return super::useItemOn(player, level, item, x, y, z, face, hit);
+	return super::useItemOn(player, level, item, x, y, z, face, hit);
-}
+}
-
+
-void CreatorMode::stopDestroyBlock() {
+void CreatorMode::stopDestroyBlock() {
-	destroyDelay = 0;
+	destroyDelay = 0;
-}
+}
-
+
-void CreatorMode::initAbilities( Abilities& abilities ) {
+void CreatorMode::initAbilities( Abilities& abilities ) {
-	abilities.mayfly = true;
+	abilities.mayfly = true;
-	abilities.instabuild = true;
+	abilities.instabuild = true;
-	abilities.invulnerable = true;
+	abilities.invulnerable = true;
-}
+}
-
+
-bool CreatorMode::isCreativeType() {
+bool CreatorMode::isCreativeType() {
-	return true;
+	return true;
-}
+}
-
+
-void CreatorMode::releaseUsingItem( Player* player ) {
+ICreator* CreatorMode::getCreator() {
-	if(player->getCarriedItem() != NULL) {
+	return _creator;
-		int oldItemId = player->getCarriedItem()->id;
+}
-		int oldAux = player->getAuxData();
+
-		super::releaseUsingItem(player);
+void CreatorMode::tick() {
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
+	_creator->setTick(minecraft->level->getTime());
-			player->getCarriedItem()->setAuxValue(oldAux);
+	super::tick();
-		}
+}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}
-
-ICreator* CreatorMode::getCreator() {
-	return _creator;
-}
-
-void CreatorMode::tick() {
-	_creator->setTick(minecraft->level->getTime());
-	super::tick();
-}

src/client/gamemode/CreatorMode.h

@@ -1,61 +1,61 @@
-#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
+#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
-#define NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
+#define NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
-
+
-//package net.minecraft.client.gamemode;
+//package net.minecraft.client.gamemode;
-
+
-#include "GameMode.h"
+#include "GameMode.h"
-#include "../../world/PosTranslator.h"
+#include "../../world/PosTranslator.h"
-
+
-class ICreator {
+class ICreator {
-public:
+public:
-	virtual ~ICreator() {}
+	virtual ~ICreator() {}
-
+
-	struct TileEvent {
+	struct TileEvent {
-		int entityId;
+		int entityId;
-		int x, y, z;
+		int x, y, z;
-		int face;
+		int face;
-
+
-		void write(std::stringstream& ss, IPosTranslator& t) const {
+		void write(std::stringstream& ss, IPosTranslator& t) const {
-			int xx = x, yy = y, zz = z;
+			int xx = x, yy = y, zz = z;
-			t.to(xx, yy, zz);
+			t.to(xx, yy, zz);
-			ss << xx << "," << yy << "," << zz << "," << face << "," << entityId;
+			ss << xx << "," << yy << "," << zz << "," << face << "," << entityId;
-		}
+		}
-	};
+	};
-
+
-	template <class T>
+	template <class T>
-	class EventList {
+	class EventList {
-	public:
+	public:
-		EventList(int size) {
+		EventList(int size) {
-			_events.reserve(size);
+			_events.reserve(size);
-			_maxSize = (int)size;
+			_maxSize = (int)size;
-			clear();
+			clear();
-		}
+		}
-		void clear() {
+		void clear() {
-			_index = -1;
+			_index = -1;
-			_size = 0;
+			_size = 0;
-		}
+		}
-		void add(const T& item, int tick) {
+		void add(const T& item, int tick) {
-			if (_size < _maxSize) {
+			if (_size < _maxSize) {
-				_events.push_back(Item());
+				_events.push_back(Item());
-				++_size;
+				++_size;
-			}
+			}
-			Item& e = _events[_nextIndex()];
+			Item& e = _events[_nextIndex()];
-			e.item = item;
+			e.item = item;
-			e.timestamp = tick;
+			e.timestamp = tick;
-		}
+		}
-		int size() const {
+		int size() const {
-			return _size;
+			return _size;
-		}
+		}
-
+
-		const T& operator[](int i) const {
+		const T& operator[](int i) const {
-			return _events[_getIndex(i)].item;
+			return _events[_getIndex(i)].item;
-		}
+		}
-
+
-		T& operator[](int i) {
+		T& operator[](int i) {
-			return _events[_getIndex(i)].item;
+			return _events[_getIndex(i)].item;
-		}
+		}
-
+
-		void write(std::stringstream& ss, IPosTranslator& t, int minTimetamp) const {
+		void write(std::stringstream& ss, IPosTranslator& t, int minTimetamp) const {
 			int i = _getFirstNewerIndex(minTimetamp);
 			if (i < 0)
 				return;
@@ -66,63 +66,62 @@ public:
 				ss << "|";
 				if (++i == _size) i = 0;
 			}
-		}
+		}
-
+
-	private:
+	private:
-		int _getIndex(int i) const { return (1 + _index + i) % _size; }
+		int _getIndex(int i) const { return (1 + _index + i) % _size; }
-		int _nextIndex() {
+		int _nextIndex() {
-			if (++_index == _size) _index = 0;
+			if (++_index == _size) _index = 0;
-			return _index;
+			return _index;
-		}
+		}
-
+
-		int _getFirstNewerIndex(int timestamp) const {
+		int _getFirstNewerIndex(int timestamp) const {
-			for (int i = _index + 1, j = 0; j < _size; ++i, ++j) {
+			for (int i = _index + 1, j = 0; j < _size; ++i, ++j) {
-				if (i == _size) i = 0;
+				if (i == _size) i = 0;
-				if (_events[i].timestamp >= timestamp) return i;
+				if (_events[i].timestamp >= timestamp) return i;
-			}
+			}
-			return -1;
+			return -1;
-		}
+		}
-		struct Item {
+		struct Item {
-			int timestamp;
+			int timestamp;
-			T item;
+			T item;
-		};
+		};
-
+
-		int _index;
+		int _index;
-		int _size;
+		int _size;
-		int _maxSize;
+		int _maxSize;
-		std::vector<Item> _events;
+		std::vector<Item> _events;
-	};
+	};
-
+
-	virtual EventList<TileEvent>& getTileEvents() = 0;
+	virtual EventList<TileEvent>& getTileEvents() = 0;
-};
+};
-
+
-class Creator;
+class Creator;
-
+
-class CreatorMode: public GameMode
+class CreatorMode: public GameMode
-{
+{
-	typedef GameMode super;
+	typedef GameMode super;
-public:
+public:
-    CreatorMode(Minecraft* minecraft);
+    CreatorMode(Minecraft* minecraft);
-	~CreatorMode();
+	~CreatorMode();
-
+
-    void startDestroyBlock(int x, int y, int z, int face);
+    void startDestroyBlock(int x, int y, int z, int face);
-    void continueDestroyBlock(int x, int y, int z, int face);
+    void continueDestroyBlock(int x, int y, int z, int face);
-    void stopDestroyBlock();
+    void stopDestroyBlock();
-
+
-	bool useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit);
+	bool useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit);
-
+
-	void tick();
+	void tick();
-	ICreator* getCreator();
+	ICreator* getCreator();
-
+
-	bool isCreativeType();
+	bool isCreativeType();
-
+
-	void initAbilities(Abilities& abilities);
+	void initAbilities(Abilities& abilities);
-
+
-	void releaseUsingItem(Player* player);
+private:
-private:
+	void CreatorDestroyBlock(int x, int y, int z, int face);
-	void CreatorDestroyBlock(int x, int y, int z, int face);
+
-
+	Creator* _creator;
-	Creator* _creator;
+};
-};
+
-
+#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__*/
-#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__*/

src/client/gamemode/GameMode.cpp

@@ -1,174 +1,174 @@
-#include "GameMode.h"
+#include "GameMode.h"
-#include "../Minecraft.h"
+#include "../Minecraft.h"
-#include "../../network/packet/UseItemPacket.h"
+#include "../../network/packet/UseItemPacket.h"
-#include "../../network/packet/PlayerActionPacket.h"
+#include "../../network/packet/PlayerActionPacket.h"
-#include "../../world/level/Level.h"
+#include "../../world/level/Level.h"
-#include "../../world/item/ItemInstance.h"
+#include "../../world/item/ItemInstance.h"
-#include "../player/LocalPlayer.h"
+#include "../player/LocalPlayer.h"
-#include "client/Options.h"
+#include "client/Options.h"
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-#include "../sound/SoundEngine.h"
+#include "../sound/SoundEngine.h"
-#include "../particle/ParticleEngine.h"
+#include "../particle/ParticleEngine.h"
-#endif
+#endif
-#include "../../network/RakNetInstance.h"
+#include "../../network/RakNetInstance.h"
-#include "../../network/packet/RemoveBlockPacket.h"
+#include "../../network/packet/RemoveBlockPacket.h"
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-#include "../renderer/LevelRenderer.h"
+#include "../renderer/LevelRenderer.h"
-#endif
+#endif
-#include "../../world/level/material/Material.h"
+#include "../../world/level/material/Material.h"
-
+
-GameMode::GameMode( Minecraft* minecraft)
+GameMode::GameMode( Minecraft* minecraft)
-:	minecraft(minecraft),
+:	minecraft(minecraft),
-	destroyProgress(0),
+	destroyProgress(0),
-	oDestroyProgress(0),
+	oDestroyProgress(0),
-	destroyTicks(0),
+	destroyTicks(0),
-	destroyDelay(0)
+	destroyDelay(0)
-{
+{
-}
+}
-
+
-/*virtual*/
+/*virtual*/
-Player* GameMode::createPlayer(Level* level) {
+Player* GameMode::createPlayer(Level* level) {
-    return new LocalPlayer(minecraft, level, minecraft->options.getStringValue(OPTIONS_USERNAME), level->dimension->id, isCreativeType());
+    return new LocalPlayer(minecraft, level, minecraft->options.getStringValue(OPTIONS_USERNAME), level->dimension->id, isCreativeType());
-}
+}
-
+
-/*virtual*/
+/*virtual*/
-void GameMode::interact(Player* player, Entity* entity) {
+void GameMode::interact(Player* player, Entity* entity) {
-    player->interact(entity);
+    player->interact(entity);
-}
+}
-
+
-/*virtual*/
+/*virtual*/
-void GameMode::attack(Player* player, Entity* entity) {
+void GameMode::attack(Player* player, Entity* entity) {
-	if (minecraft->level->adventureSettings.noPvP && entity->isPlayer())
+	if (minecraft->level->adventureSettings.noPvP && entity->isPlayer())
-		return;
+		return;
-	if (minecraft->level->adventureSettings.noPvM && entity->isMob())
+	if (minecraft->level->adventureSettings.noPvM && entity->isMob())
-		return;
+		return;
-    player->attack(entity);
+    player->attack(entity);
-}
+}
-
+
-/* virtual */
+/* virtual */
-void GameMode::startDestroyBlock( int x, int y, int z, int face ) {
+void GameMode::startDestroyBlock( int x, int y, int z, int face ) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
+	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
+		return;
-	destroyBlock(x, y, z, face);
+	destroyBlock(x, y, z, face);
-}
+}
-
+
-/*virtual*/
+/*virtual*/
-bool GameMode::destroyBlock(int x, int y, int z, int face) {
+bool GameMode::destroyBlock(int x, int y, int z, int face) {
-    Level* level = minecraft->level;
+    Level* level = minecraft->level;
-    Tile* oldTile = Tile::tiles[level->getTile(x, y, z)];
+    Tile* oldTile = Tile::tiles[level->getTile(x, y, z)];
-	if (!oldTile)
+	if (!oldTile)
-		return false;
+		return false;
-
+
-    if (level->adventureSettings.immutableWorld) {
+    if (level->adventureSettings.immutableWorld) {
-        if (oldTile != (Tile*)Tile::leaves
+        if (oldTile != (Tile*)Tile::leaves
-         && oldTile->material != Material::plant) {
+         && oldTile->material != Material::plant) {
-             return false;
+             return false;
-        }
+        }
-    }
+    }
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-	minecraft->particleEngine->destroy(x, y, z);
+	minecraft->particleEngine->destroy(x, y, z);
-#endif
+#endif
-	int data = level->getData(x, y, z);
+	int data = level->getData(x, y, z);
-    bool changed = level->setTile(x, y, z, 0);
+    bool changed = level->setTile(x, y, z, 0);
-    if (changed) {
+    if (changed) {
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-        minecraft->soundEngine->play(oldTile->soundType->getBreakSound(), x + 0.5f, y + 0.5f, z + 0.5f, (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
+        minecraft->soundEngine->play(oldTile->soundType->getBreakSound(), x + 0.5f, y + 0.5f, z + 0.5f, (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
-#endif
+#endif
-        oldTile->destroy(level, x, y, z, data);
+        oldTile->destroy(level, x, y, z, data);
-		if (minecraft->options.getBooleanValue(OPTIONS_DESTROY_VIBRATION)) minecraft->platform()->vibrate(24);
+		if (minecraft->options.getBooleanValue(OPTIONS_DESTROY_VIBRATION)) minecraft->platform()->vibrate(24);
-
+
-		if (minecraft->isOnline()) {
+		if (minecraft->isOnline()) {
-			RemoveBlockPacket packet(minecraft->player, x, y, z);
+			RemoveBlockPacket packet(minecraft->player, x, y, z);
-			minecraft->raknetInstance->send(packet);
+			minecraft->raknetInstance->send(packet);
-		}
+		}
-	}
+	}
-    return changed;
+    return changed;
-}
+}
-/*virtual*/
+/*virtual*/
-bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit) {
+bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit) {
-	float clickX = hit.x - x;
+	float clickX = hit.x - x;
-	float clickY = hit.y - y;
+	float clickY = hit.y - y;
-	float clickZ = hit.z - z;
+	float clickZ = hit.z - z;
-	item = player->inventory->getSelected();
+	if (level->isClientSide) {
-	if(level->isClientSide) {
+		item = player->inventory->getSelected();
-		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
+		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
-		minecraft->raknetInstance->send(packet);
+		minecraft->raknetInstance->send(packet);
-	}
+	}
-    int t = level->getTile(x, y, z);
+    int t = level->getTile(x, y, z);
-	if (t == Tile::invisible_bedrock->id) return false;
+	if (t == Tile::invisible_bedrock->id) return false;
-    if (t > 0 && Tile::tiles[t]->use(level, x, y, z, player))
+    if (t > 0 && Tile::tiles[t]->use(level, x, y, z, player))
-		return true;
+		return true;
-
+
-	if (item == NULL) return false;
+	if (item == NULL) return false;
-	if(isCreativeType()) {
+	if(isCreativeType()) {
-		int aux = item->getAuxValue();
+		int aux = item->getAuxValue();
-		int count = item->count;
+		int count = item->count;
-		bool success = item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
+		bool success = item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
-		item->setAuxValue(aux);
+		item->setAuxValue(aux);
-		item->count = count;
+		item->count = count;
-		return success;
+		return success;
-	} else {
+	} else {
-		return item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
+		return item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
-	}
+	}
-}
+}
-
+
-bool GameMode::useItem( Player* player, Level* level, ItemInstance* item ) {
+bool GameMode::useItem( Player* player, Level* level, ItemInstance* item ) {
-	int oldCount = item->count;
+	int oldCount = item->count;
-
+
-	ItemInstance* itemInstance = item->use(level, player);
+	ItemInstance* itemInstance = item->use(level, player);
-	if(level->isClientSide) {
+	if(level->isClientSide) {
-		UseItemPacket packet(item, player->entityId, player->aimDirection);
+		UseItemPacket packet(item, player->entityId, player->aimDirection);
-		minecraft->raknetInstance->send(packet);
+		minecraft->raknetInstance->send(packet);
-	}
+	}
-	if (itemInstance != item || (itemInstance != NULL && itemInstance->count != oldCount)) {
+	if (itemInstance != item || (itemInstance != NULL && itemInstance->count != oldCount)) {
-	    //player.inventory.items[player.inventory.selected] = itemInstance;
+	    //player.inventory.items[player.inventory.selected] = itemInstance;
-	    //if (itemInstance.count == 0) {
+	    //if (itemInstance.count == 0) {
-	    //    player.inventory.items[player.inventory.selected] = NULL;
+	    //    player.inventory.items[player.inventory.selected] = NULL;
-	    //}
+	    //}
-	    return true;
+	    return true;
-	}
+	}
-	return false;
+	return false;
-}
+}
-
+
-ItemInstance* GameMode::handleInventoryMouseClick( int containerId, int slotNum, int buttonNum, Player* player ) {
+ItemInstance* GameMode::handleInventoryMouseClick( int containerId, int slotNum, int buttonNum, Player* player ) {
-	//return player.containerMenu.clicked(slotNum, buttonNum, player);
+	//return player.containerMenu.clicked(slotNum, buttonNum, player);
-	return NULL;
+	return NULL;
-}
+}
-
+
-void GameMode::handleCloseInventory( int containerId, Player* player ) {
+void GameMode::handleCloseInventory( int containerId, Player* player ) {
-	//player.containerMenu.removed(player);
+	//player.containerMenu.removed(player);
-	//player.containerMenu = player.inventoryMenu;
+	//player.containerMenu = player.inventoryMenu;
-}
+}
-
+
-float GameMode::getPickRange() {
+float GameMode::getPickRange() {
-	return 5.0f;
+	return 5.0f;
-}
+}
-
+
-void GameMode::initPlayer( Player* player ) {
+void GameMode::initPlayer( Player* player ) {
-	initAbilities(player->abilities);
+	initAbilities(player->abilities);
-}
+}
-
+
-void GameMode::releaseUsingItem(Player* player){
+void GameMode::releaseUsingItem(Player* player){
-	if(minecraft->level->isClientSide) {
+	if (minecraft->level->isClientSide && player->isUsingItem()) {
-		PlayerActionPacket packet(PlayerActionPacket::RELEASE_USE_ITEM,  0, 0, 0, 0, player->entityId);
+		PlayerActionPacket packet(PlayerActionPacket::RELEASE_USE_ITEM,  0, 0, 0, 0, player->entityId);
-		minecraft->raknetInstance->send(packet);
+		minecraft->raknetInstance->send(packet);
-	}
+	}
-	player->releaseUsingItem();
+	player->releaseUsingItem();
-}
+}
-
+
-void GameMode::tick() {
+void GameMode::tick() {
-	oDestroyProgress = destroyProgress;
+	oDestroyProgress = destroyProgress;
-}
+}
-
+
-void GameMode::render( float a ) {
+void GameMode::render( float a ) {
-#ifndef STANDALONE_SERVER
+#ifndef STANDALONE_SERVER
-	if (destroyProgress <= 0) {
+	if (destroyProgress <= 0) {
-		minecraft->gui.progress = 0;
+		minecraft->gui.progress = 0;
-		minecraft->levelRenderer->destroyProgress = 0;
+		minecraft->levelRenderer->destroyProgress = 0;
-	} else {
+	} else {
-		float dp = oDestroyProgress + (destroyProgress - oDestroyProgress) * a;
+		float dp = oDestroyProgress + (destroyProgress - oDestroyProgress) * a;
-		minecraft->gui.progress = dp;
+		minecraft->gui.progress = dp;
-		minecraft->levelRenderer->destroyProgress = dp;
+		minecraft->levelRenderer->destroyProgress = dp;
-	}
+	}
-#endif
+#endif
-}
+}

src/client/gui/components/ScrollingPane.cpp

@@ -20,6 +20,9 @@ static const float kMinimumTrackingForDrag = 5;
 static const float kMinIndicatorLength = 34.0f / 3;
 static const float PKScrollIndicatorEndSize = 3;
 static const float PKScrollIndicatorThickness = 7.0f /3;
+static const float kWheelOverscrollMax = 80.0f;
+static const float kWheelOverscrollDamping = 0.6f;
+static const float kWheelOverscrollRestoreAlpha = 0.18f;
 
 ScrollingPane::ScrollingPane(
 		int optionFlags,
@@ -70,13 +73,19 @@ ScrollingPane::ScrollingPane(
 	}
 	//LOGI("%d, %d :: %d\n", bbox.w, itemBbox.w, this->columns);
 
-	rows = 1 + (numItems-1) / this->columns,
+	rows = 1 + (numItems-1) / this->columns;
 
 	/*
 	if (columns * itemBbox.w <= bbox.w) flags |= SF_LockX;
 	if (rows    * itemBbox.h <= bbox.h) flags |= SF_LockY;
 	*/
 
+	// initialize content bounds immediately
+	adjustContentSize();
+	minPoint.set((float)(this->size.w - this->adjustedContentSize.w), (float)(this->size.h - this->adjustedContentSize.h), 0);
+	this->snapContentOffsetToBounds(false);
+
+
 	dragDeltas.reserve(128);
 
 	te_moved = 0;
@@ -114,6 +123,34 @@ void ScrollingPane::tick() {
 		updateScrollFade(vScroll);
 		updateScrollFade(hScroll);
 	}
+
+	if (isNotSet(SF_HardLimits) && !Mouse::isButtonDown(MouseAction::ACTION_LEFT) && !dragging && !tracking && !decelerating) {
+		float targetX = _contentOffset.x;
+		float targetY = _contentOffset.y;
+		bool corrected = false;
+
+		if (targetX > 0.0f) {
+			targetX = Mth::lerp(targetX, 0.0f, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		} else if (targetX < minPoint.x) {
+			targetX = Mth::lerp(targetX, minPoint.x, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		}
+
+		if (targetY > 0.0f) {
+			targetY = Mth::lerp(targetY, 0.0f, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		} else if (targetY < minPoint.y) {
+			targetY = Mth::lerp(targetY, minPoint.y, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		}
+
+		if (corrected) {
+			if (Mth::abs(targetX - _contentOffset.x) < 0.25f) targetX = (targetX > 0.0f ? 0.0f : (targetX < minPoint.x ? minPoint.x : targetX));
+			if (Mth::abs(targetY - _contentOffset.y) < 0.25f) targetY = (targetY > 0.0f ? 0.0f : (targetY < minPoint.y ? minPoint.y : targetY));
+			setContentOffset(Vec3(targetX, targetY, 0));
+		}
+	}
 }
 
 bool ScrollingPane::getGridItemFor_slow(int itemIndex, GridItem& out) {
@@ -549,11 +586,39 @@ void ScrollingPane::stepThroughDecelerationAnimation(bool noAnimation) {
 }
 
 void ScrollingPane::scrollBy(float dx, float dy) {
-	// adjust the translation offsets fpx/fpy by the requested amount
+	// compute target content offset from wheel delta (in screen-space w/ opposite sign)
-	float nfpx = fpx + dx;
+	float targetX = _contentOffset.x - dx;
-	float nfpy = fpy + dy;
+	float targetY = _contentOffset.y - dy;
-	// convert back to content offset (fpx = -contentOffset.x)
+
-	setContentOffset(Vec3(-nfpx, -nfpy, 0));
+	if (isSet(SF_LockX)) targetX = _contentOffset.x;
+	if (isSet(SF_LockY)) targetY = _contentOffset.y;
+
+	if (isSet(SF_HardLimits)) {
+		targetX = Mth::clamp(targetX, minPoint.x, 0.0f);
+		targetY = Mth::clamp(targetY, minPoint.y, 0.0f);
+	} else {
+		if (targetX > 0.0f) {
+			float overshoot = targetX;
+			overshoot = Mth::Min(overshoot, kWheelOverscrollMax);
+			targetX = overshoot * kWheelOverscrollDamping;
+		} else if (targetX < minPoint.x) {
+			float overshoot = targetX - minPoint.x;
+			overshoot = Mth::Max(overshoot, -kWheelOverscrollMax);
+			targetX = minPoint.x + overshoot * kWheelOverscrollDamping;
+		}
+
+		if (targetY > 0.0f) {
+			float overshoot = targetY;
+			overshoot = Mth::Min(overshoot, kWheelOverscrollMax);
+			targetY = overshoot * kWheelOverscrollDamping;
+		} else if (targetY < minPoint.y) {
+			float overshoot = targetY - minPoint.y;
+			overshoot = Mth::Max(overshoot, -kWheelOverscrollMax);
+			targetY = minPoint.y + overshoot * kWheelOverscrollDamping;
+		}
+	}
+
+	setContentOffset(Vec3(targetX, targetY, 0));
 }
 
 void ScrollingPane::setContentOffset(float x, float y) {

src/client/gui/screens/CreditsScreen.cpp

@@ -28,6 +28,7 @@ void CreditsScreen::init() {
     buttons.push_back(bHeader);
     buttons.push_back(btnBack);
 
+    // TODO: rewrite it
     // prepare text lines
     _lines.clear();
     _lines.push_back("Minecraft: Pocket Edition");
@@ -39,6 +40,7 @@ void CreditsScreen::init() {
     _lines.push_back("Kolyah35");
     _lines.push_back("karson");
     _lines.push_back("deepfriedwaffles");
+    _lines.push_back("EpikIzCool");
     _lines.push_back("");
     // avoid color tags around the URL so it isn't mangled by the parser please
     _lines.push_back("Join our Discord server: https://discord.gg/c58YesBxve");

src/client/gui/screens/touch/TouchIngameBlockSelectionScreen.cpp

@@ -1,291 +1,293 @@
-#include "TouchIngameBlockSelectionScreen.h"
+#include "TouchIngameBlockSelectionScreen.h"
-#include "../crafting/WorkbenchScreen.h"
+#include "../crafting/WorkbenchScreen.h"
-#include "../../Screen.h"
+#include "../../Screen.h"
-#include "../../components/ImageButton.h"
+#include "../../components/ImageButton.h"
-#include "../../components/InventoryPane.h"
+#include "../../components/InventoryPane.h"
-#include "../../../gamemode/GameMode.h"
+#include "../../../gamemode/GameMode.h"
-#include "../../../renderer/TileRenderer.h"
+#include "../../../renderer/TileRenderer.h"
-#include "../../../player/LocalPlayer.h"
+#include "../../../player/LocalPlayer.h"
-#include "../../../renderer/gles.h"
+#include "../../../renderer/gles.h"
-#include "../../../renderer/entity/ItemRenderer.h"
+#include "../../../renderer/entity/ItemRenderer.h"
-#include "../../../renderer/Tesselator.h"
+#include "../../../renderer/Tesselator.h"
-#include "../../../renderer/Textures.h"
+#include "../../../renderer/Textures.h"
-#include "../../../Minecraft.h"
+#include "../../../Minecraft.h"
-#include "../../../sound/SoundEngine.h"
+#include "../../../sound/SoundEngine.h"
-#include "../../../../world/entity/player/Inventory.h"
+#include "../../../../world/entity/player/Inventory.h"
-#include "../../../../platform/input/Mouse.h"
+#include "../../../../platform/input/Mouse.h"
-#include "../../../../util/Mth.h"
+#include "../../../../util/Mth.h"
-#include "../../../../world/item/ItemInstance.h"
+#include "../../../../world/item/ItemInstance.h"
-#include "../../../../world/entity/player/Player.h"
+#include "../../../../world/entity/player/Player.h"
-#include "../../../../world/item/crafting/Recipe.h"
+#include "../../../../world/item/crafting/Recipe.h"
-#include "../../../player/input/touchscreen/TouchAreaModel.h"
+#include "../../../player/input/touchscreen/TouchAreaModel.h"
-#include "../ArmorScreen.h"
+#include "../ArmorScreen.h"
-
+
-namespace Touch {
+namespace Touch {
-
+
-#if defined(__APPLE__)
+#if defined(__APPLE__)
-    static const std::string demoVersionString("Not available in the Lite version");
+    static const std::string demoVersionString("Not available in the Lite version");
-#else
+#else
-    static const std::string demoVersionString("Not available in the demo version");
+    static const std::string demoVersionString("Not available in the demo version");
-#endif
+#endif
-
+
-#ifdef __APPLE__
+#ifdef __APPLE__
-    static const float BorderPixels = 4;
+    static const float BorderPixels = 4;
-    #ifdef DEMO_MODE
+    #ifdef DEMO_MODE
-        static const float BlockPixels = 22;
+        static const float BlockPixels = 22;
-    #else
+    #else
-        static const float BlockPixels = 22;
+        static const float BlockPixels = 22;
-    #endif
+    #endif
-#else
+#else
-    static const float BorderPixels = 4;
+    static const float BorderPixels = 4;
-    static const float BlockPixels = 24;
+    static const float BlockPixels = 24;
-#endif
+#endif
-
+
-static const int ItemSize = (int)(BlockPixels + 2*BorderPixels);
+static const int ItemSize = (int)(BlockPixels + 2*BorderPixels);
-
+
-static const int Bx = 10; // Border Frame width
+static const int Bx = 10; // Border Frame width
-static const int By = 6; // Border Frame height
+static const int By = 6; // Border Frame height
-    
+    
-//
+//
-// Block selection screen
+// Block selection screen
-//
+//
-IngameBlockSelectionScreen::IngameBlockSelectionScreen() 
+IngameBlockSelectionScreen::IngameBlockSelectionScreen() 
-:	selectedItem(0),
+:	selectedItem(0),
-	_blockList(NULL),
+	_blockList(NULL),
-	_pendingClose(false),
+	_pendingClose(false),
-	bArmor  (4, "Armor"),
+	bArmor  (4, "Armor"),
-	bDone   (3, ""),
+	bDone   (3, ""),
-	//bDone   (3, "Done"),
+	//bDone   (3, "Done"),
-	bMenu   (2, "Menu"),
+	bMenu   (2, "Menu"),
-	bCraft  (1, "Craft"),
+	bCraft  (1, "Craft"),
-	bHeader (0, "Select blocks")
+	bHeader (0, "Select blocks")
-{
+{
-}
+}
-
+
-IngameBlockSelectionScreen::~IngameBlockSelectionScreen()
+IngameBlockSelectionScreen::~IngameBlockSelectionScreen()
-{
+{
-	delete _blockList;
+	delete _blockList;
-}
+}
-
+
-void IngameBlockSelectionScreen::init()
+void IngameBlockSelectionScreen::init()
-{
+{
-	Inventory* inventory = minecraft->player->inventory;
+	Inventory* inventory = minecraft->player->inventory;
-
+
-	//const int itemWidth = 2 * BorderPixels + 
+	//const int itemWidth = 2 * BorderPixels + 
-
+
-	int maxWidth = width - Bx - Bx;
+	int maxWidth = width - Bx - Bx;
-	InventoryColumns = maxWidth / ItemSize;
+	InventoryColumns = maxWidth / ItemSize;
-	const int realWidth = InventoryColumns * ItemSize;
+	const int realWidth = InventoryColumns * ItemSize;
-	const int realBx = (width - realWidth) / 2;
+	const int realBx = (width - realWidth) / 2;
-
+
-	IntRectangle rect(realBx,
+	IntRectangle rect(realBx,
-#ifdef __APPLE__
+#ifdef __APPLE__
-		24 + By - ((width==240)?1:0), realWidth, ((width==240)?1:0) + height-By-By-20-24);
+		24 + By - ((width==240)?1:0), realWidth, ((width==240)?1:0) + height-By-By-20-24);
-#else
+#else
-		24 + By, realWidth, height-By-By-20-24);
+		24 + By, realWidth, height-By-By-20-24);
-#endif
+#endif
-
+
-	_blockList = new InventoryPane(this, minecraft, rect, width, BorderPixels, inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE, ItemSize, (int)BorderPixels);
+	_blockList = new InventoryPane(this, minecraft, rect, width, BorderPixels, inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE, ItemSize, (int)BorderPixels);
-	_blockList->fillMarginX = realBx;
+	_blockList->fillMarginX = realBx;
-
+
-	//for (int i = 0; i < inventory->getContainerSize(); ++i)
+	//for (int i = 0; i < inventory->getContainerSize(); ++i)
-		//LOGI("> %d - %s\n", i, inventory->getItem(i)? inventory->getItem(i)->getDescriptionId().c_str() : "<-->\n");
+		//LOGI("> %d - %s\n", i, inventory->getItem(i)? inventory->getItem(i)->getDescriptionId().c_str() : "<-->\n");
-
+
-	InventorySize = inventory->getContainerSize();
+	// Grid indices are 0..N-1 for main inventory only; slots 0..MAX_SELECTION_SIZE-1 are hotbar links.
-	InventoryRows = 1 + (InventorySize-1) / InventoryColumns;
+	InventorySize = inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE;
-
+	InventoryRows = 1 + (InventorySize-1) / InventoryColumns;
-    //
+
-    // Buttons
+    //
-    //
+    // Buttons
-	ImageDef def;
+    //
-	def.name = "gui/spritesheet.png";
+	ImageDef def;
-	def.x = 0;
+	def.name = "gui/spritesheet.png";
-	def.y = 1;
+	def.x = 0;
-	def.width = def.height = 18;
+	def.y = 1;
-	def.setSrc(IntRectangle(60, 0, 18, 18));
+	def.width = def.height = 18;
-	bDone.setImageDef(def, true);
+	def.setSrc(IntRectangle(60, 0, 18, 18));
-    bDone.width = bDone.height = 19;
+	bDone.setImageDef(def, true);
-
+    bDone.width = bDone.height = 19;
-	bDone.scaleWhenPressed = false;
+
-
+	bDone.scaleWhenPressed = false;
-	buttons.push_back(&bHeader);
+
-	buttons.push_back(&bDone);
+	buttons.push_back(&bHeader);
-	if (!minecraft->isCreativeMode()) {
+	buttons.push_back(&bDone);
-		buttons.push_back(&bCraft);
+	if (!minecraft->isCreativeMode()) {
-		buttons.push_back(&bArmor);
+		buttons.push_back(&bCraft);
-	}
+		buttons.push_back(&bArmor);
-}
+	}
-
+}
-void IngameBlockSelectionScreen::setupPositions() {
+
-	bHeader.y = bDone.y = bCraft.y = 0;
+void IngameBlockSelectionScreen::setupPositions() {
-	bDone.x   = width -  bDone.width;
+	bHeader.y = bDone.y = bCraft.y = 0;
-	bCraft.x  = 0;//width - bDone.w - bCraft.w;
+	bDone.x   = width -  bDone.width;
-	bCraft.width = bArmor.width = 48;
+	bCraft.x  = 0;//width - bDone.w - bCraft.w;
-	bArmor.x = bCraft.width;
+	bCraft.width = bArmor.width = 48;
-
+	bArmor.x = bCraft.width;
-	if (minecraft->isCreativeMode()) {
+
-		bHeader.x = 0;
+	if (minecraft->isCreativeMode()) {
-		bHeader.width = width;// -  bDone.w;
+		bHeader.x = 0;
-		bHeader.xText = width/2; // Center of the screen
+		bHeader.width = width;// -  bDone.w;
-	} else {
+		bHeader.xText = width/2; // Center of the screen
-		bHeader.x = bCraft.width + bArmor.width;
+	} else {
-		bHeader.width = width - bCraft.width - bArmor.width;// -  bDone.w;
+		bHeader.x = bCraft.width + bArmor.width;
-		bHeader.xText = bHeader.x + (bHeader.width - bDone.width) /2;
+		bHeader.width = width - bCraft.width - bArmor.width;// -  bDone.w;
-	}
+		bHeader.xText = bHeader.x + (bHeader.width - bDone.width) /2;
-
+	}
-	clippingArea.x = 0;
+
-	clippingArea.w = minecraft->width;
+	clippingArea.x = 0;
-	clippingArea.y = 0;
+	clippingArea.w = minecraft->width;
-	clippingArea.h = (int)(Gui::GuiScale * 24);
+	clippingArea.y = 0;
-}
+	clippingArea.h = (int)(Gui::GuiScale * 24);
-
+}
-void IngameBlockSelectionScreen::removed()
+
-{
+void IngameBlockSelectionScreen::removed()
-	minecraft->gui.inventoryUpdated();
+{
-}
+	minecraft->gui.inventoryUpdated();
-
+}
-int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
+
-    // @todo: Number of columns
+int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
-	return width / 2 - InventoryColumns * 10 + slotX * 20 + 2;
+    // @todo: Number of columns
-}
+	return width / 2 - InventoryColumns * 10 + slotX * 20 + 2;
-
+}
-int IngameBlockSelectionScreen::getSlotPosY(int slotY) {
+
-	return height - 16 - 3 - 22 * 2 - 22 * slotY;
+int IngameBlockSelectionScreen::getSlotPosY(int slotY) {
-}
+	return height - 16 - 3 - 22 * 2 - 22 * slotY;
-
+}
-int IngameBlockSelectionScreen::getSlotHeight() {
+
-	// same as non-touch implementation
+int IngameBlockSelectionScreen::getSlotHeight() {
-	return 22;
+	// same as non-touch implementation
-}
+	return 22;
-
+}
-void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum) {
+
-	_pendingClose = _blockList->_clickArea->isInside((float)x, (float)y);
+void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum) {
-	if (!_pendingClose)
+	_pendingClose = _blockList->_clickArea->isInside((float)x, (float)y);
-		super::mouseClicked(x, y, buttonNum);
+	if (!_pendingClose)
-}
+		super::mouseClicked(x, y, buttonNum);
-
+}
-void IngameBlockSelectionScreen::mouseReleased(int x, int y, int buttonNum) {
+
-	if (_pendingClose && _blockList->_clickArea->isInside((float)x, (float)y))
+void IngameBlockSelectionScreen::mouseReleased(int x, int y, int buttonNum) {
-		minecraft->setScreen(NULL);
+	if (_pendingClose && _blockList->_clickArea->isInside((float)x, (float)y))
-	else
+		minecraft->setScreen(NULL);
-		super::mouseReleased(x, y, buttonNum);
+	else
-}
+		super::mouseReleased(x, y, buttonNum);
-
+}
-void IngameBlockSelectionScreen::mouseWheel(int dx, int dy, int xm, int ym)
+
-{
+void IngameBlockSelectionScreen::mouseWheel(int dx, int dy, int xm, int ym)
-	if (dy == 0) return;
+{
-	if (_blockList) {
+	if (dy == 0) return;
-		float amount = -dy * getSlotHeight();
+	if (_blockList) {
-		_blockList->scrollBy(0, amount);
+		float amount = -dy * getSlotHeight();
-	}
+		_blockList->scrollBy(0, amount);
-	int cols = InventoryColumns;
+	}
-	int maxIndex = InventorySize - 1;
+	int cols = InventoryColumns;
-	int idx = selectedItem;
+	int maxIndex = InventorySize - 1;
-	if (dy > 0) {
+	int idx = selectedItem;
-		if (idx >= cols) idx -= cols;
+	if (dy > 0) {
-	} else {
+		if (idx >= cols) idx -= cols;
-		if (idx + cols <= maxIndex) idx += cols;
+	} else {
-	}
+		if (idx + cols <= maxIndex) idx += cols;
-	selectedItem = idx;
+	}
-}
+	selectedItem = idx;
-
+}
-bool IngameBlockSelectionScreen::addItem(const InventoryPane* pane, int itemId)
+
-{
+bool IngameBlockSelectionScreen::addItem(const InventoryPane* pane, int itemId)
-	Inventory* inventory = minecraft->player->inventory;
+{
-	itemId += Inventory::MAX_SELECTION_SIZE;
+	Inventory* inventory = minecraft->player->inventory;
-
+	itemId += Inventory::MAX_SELECTION_SIZE;
-	if (!inventory->getItem(itemId))
+
-		return false;
+	if (!inventory->getItem(itemId))
-
+		return false;
-	inventory->moveToSelectionSlot(0, itemId, true);
+
-
+	inventory->moveToSelectionSlot(0, itemId, true);
-	inventory->selectSlot(0);
+
-#ifdef __APPLE__
+	inventory->selectSlot(0);
-	minecraft->soundEngine->playUI("random.pop", 0.3f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
+#ifdef __APPLE__
-#else
+	minecraft->soundEngine->playUI("random.pop", 0.3f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
-    minecraft->soundEngine->playUI("random.pop2", 1.0f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
+#else
-#endif
+    minecraft->soundEngine->playUI("random.pop2", 1.0f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
-
+#endif
-	// Flash the selected gui item
+
-	minecraft->gui.flashSlot(inventory->selected);
+	// Flash the selected gui item
-    return true;
+	minecraft->gui.flashSlot(inventory->selected);
-}
+    return true;
-
+}
-void IngameBlockSelectionScreen::tick()
+
-{
+void IngameBlockSelectionScreen::tick()
-	_blockList->tick();
+{
-	super::tick();
+	_blockList->tick();
-}
+	super::tick();
-
+}
-void IngameBlockSelectionScreen::render( int xm, int ym, float a )
+
-{
+void IngameBlockSelectionScreen::render( int xm, int ym, float a )
-	glDisable2(GL_DEPTH_TEST);
+{
-	glEnable2(GL_BLEND);
+	glDisable2(GL_DEPTH_TEST);
-
+	glEnable2(GL_BLEND);
-	Screen::render(xm, ym, a);
+
-	_blockList->render(xm, ym, a);
+	Screen::render(xm, ym, a);
-
+	_blockList->render(xm, ym, a);
-	// render frame
+
-	IntRectangle& bbox = _blockList->rect;
+	// render frame
-	Tesselator::instance.colorABGR(0xffffffff);
+	IntRectangle& bbox = _blockList->rect;
-	minecraft->textures->loadAndBindTexture("gui/itemframe.png");
+	Tesselator::instance.colorABGR(0xffffffff);
-	glEnable2(GL_BLEND);
+	minecraft->textures->loadAndBindTexture("gui/itemframe.png");
-	glColor4f2(1, 1, 1, 1);
+	glEnable2(GL_BLEND);
-	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glColor4f2(1, 1, 1, 1);
-	blit(0, bbox.y-By, 0, 0, width, bbox.h+By+By, 215, 256); // why bbox.h + 1*B?
+	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glDisable2(GL_BLEND);
+	blit(0, bbox.y-By, 0, 0, width, bbox.h+By+By, 215, 256); // why bbox.h + 1*B?
-
+	glDisable2(GL_BLEND);
-	glEnable2(GL_DEPTH_TEST);
+
-}
+	glEnable2(GL_DEPTH_TEST);
-
+}
-void IngameBlockSelectionScreen::renderDemoOverlay() {
+
-#ifdef DEMO_MODE
+void IngameBlockSelectionScreen::renderDemoOverlay() {
-	fill(	getSlotPosX(0) - 3, getSlotPosY(1) - 3,
+#ifdef DEMO_MODE
-			getSlotPosX(9) - 3, getSlotPosY(-1) - 3, 0xa0 << 24);
+	fill(	getSlotPosX(0) - 3, getSlotPosY(1) - 3,
-
+			getSlotPosX(9) - 3, getSlotPosY(-1) - 3, 0xa0 << 24);
-	const int centerX = (getSlotPosX(4) + getSlotPosX(5)) / 2;
+
-	const int centerY = (getSlotPosY(0) + getSlotPosY(1)) / 2 + 5;
+	const int centerX = (getSlotPosX(4) + getSlotPosX(5)) / 2;
-	drawCenteredString(minecraft->font, demoVersionString, centerX, centerY, 0xffffffff);
+	const int centerY = (getSlotPosY(0) + getSlotPosY(1)) / 2 + 5;
-#endif /*DEMO_MODE*/
+	drawCenteredString(minecraft->font, demoVersionString, centerX, centerY, 0xffffffff);
-}
+#endif /*DEMO_MODE*/
-
+}
-void IngameBlockSelectionScreen::buttonClicked(Button* button) {
+
-	if (button->id == bDone.id)
+void IngameBlockSelectionScreen::buttonClicked(Button* button) {
-		minecraft->setScreen(NULL);
+	if (button->id == bDone.id)
-
+		minecraft->setScreen(NULL);
-    if (button->id == bMenu.id)
+
-        minecraft->screenChooser.setScreen(SCREEN_PAUSE);
+    if (button->id == bMenu.id)
-
+        minecraft->screenChooser.setScreen(SCREEN_PAUSE);
-	if (button->id == bCraft.id)
+
-		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
+	if (button->id == bCraft.id)
-
+		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
-	if (button == &bArmor)
+
-		minecraft->setScreen(new ArmorScreen());
+	if (button == &bArmor)
-}
+		minecraft->setScreen(new ArmorScreen());
-
+}
-bool IngameBlockSelectionScreen::isAllowed( int slot )
+
-{
+bool IngameBlockSelectionScreen::isAllowed( int slot )
-	if (slot < 0 || slot >= minecraft->player->inventory->getContainerSize())
+{
-		return false;
+	const int gridCount = minecraft->player->inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE;
-
+	if (slot < 0 || slot >= gridCount)
-#ifdef DEMO_MODE
+		return false;
-	if (slot >= (minecraft->isCreativeMode()? 28 : 27)) return false;
+
-#endif
+#ifdef DEMO_MODE
-	return true;
+	if (slot >= (minecraft->isCreativeMode()? 28 : 27)) return false;
-}
+#endif
-
+	return true;
-bool IngameBlockSelectionScreen::hasClippingArea( IntRectangle& out )
+}
-{
+
-	out = clippingArea;
+bool IngameBlockSelectionScreen::hasClippingArea( IntRectangle& out )
-	return true;
+{
-}
+	out = clippingArea;
-
+	return true;
-std::vector<const ItemInstance*> IngameBlockSelectionScreen::getItems( const InventoryPane* forPane )
+}
-{
+
-	std::vector<const ItemInstance*> out;
+std::vector<const ItemInstance*> IngameBlockSelectionScreen::getItems( const InventoryPane* forPane )
-	for (int i = Inventory::MAX_SELECTION_SIZE; i < minecraft->player->inventory->getContainerSize(); ++i)
+{
-		out.push_back(minecraft->player->inventory->getItem(i));
+	std::vector<const ItemInstance*> out;
-	return out;
+	for (int i = Inventory::MAX_SELECTION_SIZE; i < minecraft->player->inventory->getContainerSize(); ++i)
-}
+		out.push_back(minecraft->player->inventory->getItem(i));
-
+	return out;
-}
+}
+
+}

src/client/player/LocalPlayer.cpp

@@ -388,6 +388,12 @@ void LocalPlayer::calculateFlight(float xa, float ya, float za) {
     ya = 0;
     za = za * flySpeed;
 
+    if (sprinting) {
+        float sprintBoost = getWalkingSpeedModifier(); // 1.3x
+        xa *= sprintBoost;
+        za *= sprintBoost;
+    }
+
 #ifdef ANDROID
     if (Keyboard::isKeyDown(103)) ya = .2f * flySpeed;
     if (Keyboard::isKeyDown(102)) ya = -.2f * flySpeed;
@@ -506,7 +512,7 @@ void LocalPlayer::aiStep() {
 		if (sprintDoubleTapTimer > 0) sprintDoubleTapTimer--;
 		prevForwardHeld = forwardHeld;
 	}
-	if (input->sneaking || abilities.flying)
+	if (input->sneaking)
 		sprinting = false;
 
     if (input->sneaking) {

src/client/sound/Sound.cpp

@@ -111,6 +111,7 @@
 #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);
@@ -221,6 +222,7 @@ 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,6 +172,7 @@ 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,6 +144,7 @@ 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,6 +227,7 @@ 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"));