Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 48 insertions, 48 deletions

diff --git a/Minecraft.World/PumpkinTile.cpp b/Minecraft.World/PumpkinTile.cpp
index 577b9a17..2bc36972 100644
--- a/Minecraft.World/PumpkinTile.cpp
+++ b/Minecraft.World/PumpkinTile.cpp
@@ -11,47 +11,47 @@
 const wstring PumpkinTile::TEXTURE_FACE = L"pumpkin_face";
 const wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack";
 
-PumpkinTile::PumpkinTile(int id, bool lit) : DirectionalTile(id, Material::vegetable)
+PumpkinTile::PumpkinTile(int id, bool lit) : DirectionalTile(id, Material::vegetable, isSolidRender() )
 {
-    iconTop = NULL;
+	iconTop = NULL;
 	iconFace = NULL;
-    setTicking(true);
-    this->lit = lit;
+	setTicking(true);
+	this->lit = lit;
 }
 
 Icon *PumpkinTile::getTexture(int face, int data)
 {
-    if (face == Facing::UP) return iconTop;
-    if (face == Facing::DOWN) return iconTop;
+	if (face == Facing::UP) return iconTop;
+	if (face == Facing::DOWN) return iconTop;
 
-    if (data == DIR_NORTH && face == Facing::NORTH) return iconFace;
-    if (data == DIR_EAST && face == Facing::EAST) return iconFace;
-    if (data == DIR_SOUTH && face == Facing::SOUTH) return iconFace;
-    if (data == DIR_WEST && face == Facing::WEST) return iconFace;
+	if (data == DIR_NORTH && face == Facing::NORTH) return iconFace;
+	if (data == DIR_EAST && face == Facing::EAST) return iconFace;
+	if (data == DIR_SOUTH && face == Facing::SOUTH) return iconFace;
+	if (data == DIR_WEST && face == Facing::WEST) return iconFace;
 
-    else return icon;
+	else return icon;
 }
 
 void PumpkinTile::onPlace(Level *level, int x, int y, int z)
 {
 	Tile::onPlace(level, x, y, z);
-    if (level->getTile(x, y - 1, z) == Tile::snow_Id && level->getTile(x, y - 2, z) == Tile::snow_Id)
+	if (level->getTile(x, y - 1, z) == Tile::snow_Id && level->getTile(x, y - 2, z) == Tile::snow_Id)
 	{
-        if (!level->isClientSide)
+		if (!level->isClientSide)
 		{
 			// 4J - added limit of number of snowmen that can be spawned
 			if( level->canCreateMore( eTYPE_SNOWMAN, Level::eSpawnType_Egg) )
 			{
-				level->setTileNoUpdate(x, y, z, 0);
-				level->setTileNoUpdate(x, y - 1, z, 0);
-				level->setTileNoUpdate(x, y - 2, z, 0);
+				level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
+				level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
+				level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
 				shared_ptr<SnowMan> snowMan = shared_ptr<SnowMan>(new SnowMan(level));
 				snowMan->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
 				level->addEntity(snowMan);
 
-                level->tileUpdated(x, y, z, 0);
-                level->tileUpdated(x, y - 1, z, 0);
-                level->tileUpdated(x, y - 2, z, 0);
+				level->tileUpdated(x, y, z, 0);
+				level->tileUpdated(x, y - 1, z, 0);
+				level->tileUpdated(x, y - 2, z, 0);
 			}
 			else
 			{
@@ -59,15 +59,15 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
 				Tile::spawnResources(level, x, y, z, level->getData(x, y, z), 0);
 				Tile::tiles[Tile::snow_Id]->spawnResources(level, x, y - 1, z, level->getData(x, y - 1, z), 0);
 				Tile::tiles[Tile::snow_Id]->spawnResources(level, x, y - 2, z, level->getData(x, y - 2, z), 0);
-				level->setTile(x, y, z, 0);
-				level->setTile(x, y - 1, z, 0);
-				level->setTile(x, y - 2, z, 0);
+				level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
+				level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
+				level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
 			}
-        }
-        for (int i = 0; i < 120; i++)
+		}
+		for (int i = 0; i < 120; i++)
 		{
-            level->addParticle(eParticleType_snowshovel, x + level->random->nextDouble(), y - 2 + level->random->nextDouble() * 2.5, z + level->random->nextDouble(), 0, 0, 0);
-        }
+			level->addParticle(eParticleType_snowshovel, x + level->random->nextDouble(), y - 2 + level->random->nextDouble() * 2.5, z + level->random->nextDouble(), 0, 0, 0);
+		}
 	}
 	else if (level->getTile(x, y - 1, z) == Tile::ironBlock_Id && level->getTile(x, y - 2, z) == Tile::ironBlock_Id)
 	{
@@ -80,18 +80,18 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
 				// 4J - added limit of number of golems that can be spawned
 				if( level->canCreateMore( eTYPE_VILLAGERGOLEM, Level::eSpawnType_Egg) )
 				{
-					level->setTileNoUpdate(x, y, z, 0);
-					level->setTileNoUpdate(x, y - 1, z, 0);
-					level->setTileNoUpdate(x, y - 2, z, 0);
+					level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
+					level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
+					level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
 					if (xArms)
 					{
-						level->setTileNoUpdate(x - 1, y - 1, z, 0);
-						level->setTileNoUpdate(x + 1, y - 1, z, 0);
+						level->setTileAndData(x - 1, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
+						level->setTileAndData(x + 1, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
 					}
 					else
 					{
-						level->setTileNoUpdate(x, y - 1, z - 1, 0);
-						level->setTileNoUpdate(x, y - 1, z + 1, 0);
+						level->setTileAndData(x, y - 1, z - 1, 0, 0, Tile::UPDATE_CLIENTS);
+						level->setTileAndData(x, y - 1, z + 1, 0, 0, Tile::UPDATE_CLIENTS);
 					}
 
 					shared_ptr<VillagerGolem> villagerGolem = shared_ptr<VillagerGolem>(new VillagerGolem(level));
@@ -124,23 +124,23 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
 					Tile::spawnResources(level, x, y, z, level->getData(x, y, z), 0);
 					Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 1, z, level->getData(x, y - 1, z), 0);
 					Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 2, z, level->getData(x, y - 2, z), 0);
-					level->setTile(x, y, z, 0);
-					level->setTile(x, y - 1, z, 0);
-					level->setTile(x, y - 2, z, 0);
+					level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
+					level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
+					level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
 
 					if(xArms)
 					{
 						Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x - 1, y - 1, z, level->getData(x - 1, y - 1, z), 0);
 						Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x + 1, y - 1, z, level->getData(x + 1, y - 1, z), 0);
-						level->setTile(x - 1, y - 1, z, 0);
-						level->setTile(x + 1, y - 1, z, 0);
+						level->setTileAndData(x - 1, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
+						level->setTileAndData(x + 1, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
 					}
 					else
 					{
 						Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 1, z - 1, level->getData(x, y - 1, z - 1), 0);
 						Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 1, z + 1, level->getData(x, y - 1, z + 1), 0);
-						level->setTile(x, y - 1, z - 1, 0);
-						level->setTile(x, y - 1, z + 1, 0);
+						level->setTileAndData(x, y - 1, z - 1, 0, 0, Tile::UPDATE_CLIENTS);
+						level->setTileAndData(x, y - 1, z + 1, 0, 0, Tile::UPDATE_CLIENTS);
 					}
 				}
 			}
@@ -150,20 +150,20 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
 
 bool PumpkinTile::mayPlace(Level *level, int x, int y, int z)
 {
-    int t = level->getTile(x, y, z);
-    return (t == 0 || Tile::tiles[t]->material->isReplaceable()) && level->isTopSolidBlocking(x, y - 1, z);
+	int t = level->getTile(x, y, z);
+	return (t == 0 || Tile::tiles[t]->material->isReplaceable()) && level->isTopSolidBlocking(x, y - 1, z);
 
 }
 
-void PumpkinTile::setPlacedBy(Level *level, int x, int y, int z, shared_ptr<Mob> by)
+void PumpkinTile::setPlacedBy(Level *level, int x, int y, int z, shared_ptr<LivingEntity> by, shared_ptr<ItemInstance> itemInstance)
 {
-    int dir = Mth::floor(by->yRot * 4 / (360) + 2.5) & 3;
-    level->setData(x, y, z, dir);
+	int dir = Mth::floor(by->yRot * 4 / (360) + 2.5) & 3;
+	level->setData(x, y, z, dir, Tile::UPDATE_CLIENTS);
 }
 
 void PumpkinTile::registerIcons(IconRegister *iconRegister)
 {
-	iconFace = iconRegister->registerIcon(lit ? TEXTURE_LANTERN : TEXTURE_FACE);
-	iconTop = iconRegister->registerIcon(L"pumpkin_top");
-	icon = iconRegister->registerIcon(L"pumpkin_side");
+	iconFace = iconRegister->registerIcon(getIconName() + L"_face_" + (lit ? L"on" : L"off"));
+	iconTop = iconRegister->registerIcon(getIconName() + L"_top");
+	icon = iconRegister->registerIcon(getIconName() + L"_side");
 }