summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage/NBTChunkSerializer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/WorldStorage/NBTChunkSerializer.cpp')
-rw-r--r--src/WorldStorage/NBTChunkSerializer.cpp1073
1 files changed, 537 insertions, 536 deletions
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index c61e6d185..a274b28d9 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -54,11 +54,9 @@
/** Collects and stores the chunk data via the cChunkDataCallback interface */
-class SerializerCollector final :
- public cChunkDataCopyCollector
+class SerializerCollector final : public cChunkDataCopyCollector
{
-public:
-
+ public:
// The data collected from the chunk:
UInt8 Biomes[cChunkDef::Width * cChunkDef::Width];
int Heights[cChunkDef::Width * cChunkDef::Width];
@@ -82,12 +80,8 @@ public:
- SerializerCollector(cFastNBTWriter & aWriter):
- mIsTagOpen(false),
- mHasHadEntity(false),
- mHasHadBlockEntity(false),
- mIsLightValid(false),
- mWriter(aWriter)
+ SerializerCollector(cFastNBTWriter & aWriter) :
+ mIsTagOpen(false), mHasHadEntity(false), mHasHadBlockEntity(false), mIsLightValid(false), mWriter(aWriter)
{
}
@@ -95,10 +89,7 @@ public:
- virtual void LightIsValid(bool a_IsLightValid) override
- {
- mIsLightValid = a_IsLightValid;
- }
+ virtual void LightIsValid(bool a_IsLightValid) override { mIsLightValid = a_IsLightValid; }
@@ -161,20 +152,20 @@ public:
switch (a_Entity->GetEntityType())
{
- case cEntity::etBoat: AddBoatEntity (static_cast<cBoat *> (a_Entity)); break;
- case cEntity::etEnderCrystal: AddEnderCrystalEntity(static_cast<cEnderCrystal *> (a_Entity)); break;
- case cEntity::etFallingBlock: AddFallingBlockEntity(static_cast<cFallingBlock *> (a_Entity)); break;
- case cEntity::etMinecart: AddMinecartEntity (static_cast<cMinecart *> (a_Entity)); break;
- case cEntity::etMonster: AddMonsterEntity (static_cast<cMonster *> (a_Entity)); break;
- case cEntity::etPickup: AddPickupEntity (static_cast<cPickup *> (a_Entity)); break;
- case cEntity::etProjectile: AddProjectileEntity (static_cast<cProjectileEntity *>(a_Entity)); break;
- case cEntity::etTNT: AddTNTEntity (static_cast<cTNTEntity *> (a_Entity)); break;
- case cEntity::etExpOrb: AddExpOrbEntity (static_cast<cExpOrb *> (a_Entity)); break;
- case cEntity::etItemFrame: AddItemFrameEntity (static_cast<cItemFrame *> (a_Entity)); break;
- case cEntity::etLeashKnot: AddLeashKnotEntity (static_cast<cLeashKnot *> (a_Entity)); break;
- case cEntity::etPainting: AddPaintingEntity (static_cast<cPainting *> (a_Entity)); break;
- case cEntity::etPlayer: return; // Players aren't saved into the world
- case cEntity::etFloater: return; // Floaters aren't saved either
+ case cEntity::etBoat: AddBoatEntity(static_cast<cBoat *>(a_Entity)); break;
+ case cEntity::etEnderCrystal: AddEnderCrystalEntity(static_cast<cEnderCrystal *>(a_Entity)); break;
+ case cEntity::etFallingBlock: AddFallingBlockEntity(static_cast<cFallingBlock *>(a_Entity)); break;
+ case cEntity::etMinecart: AddMinecartEntity(static_cast<cMinecart *>(a_Entity)); break;
+ case cEntity::etMonster: AddMonsterEntity(static_cast<cMonster *>(a_Entity)); break;
+ case cEntity::etPickup: AddPickupEntity(static_cast<cPickup *>(a_Entity)); break;
+ case cEntity::etProjectile: AddProjectileEntity(static_cast<cProjectileEntity *>(a_Entity)); break;
+ case cEntity::etTNT: AddTNTEntity(static_cast<cTNTEntity *>(a_Entity)); break;
+ case cEntity::etExpOrb: AddExpOrbEntity(static_cast<cExpOrb *>(a_Entity)); break;
+ case cEntity::etItemFrame: AddItemFrameEntity(static_cast<cItemFrame *>(a_Entity)); break;
+ case cEntity::etLeashKnot: AddLeashKnotEntity(static_cast<cLeashKnot *>(a_Entity)); break;
+ case cEntity::etPainting: AddPaintingEntity(static_cast<cPainting *>(a_Entity)); break;
+ case cEntity::etPlayer: return; // Players aren't saved into the world
+ case cEntity::etFloater: return; // Floaters aren't saved either
default:
{
ASSERT(!"Unhandled entity type is being saved");
@@ -208,30 +199,34 @@ public:
{
// Banners:
case E_BLOCK_STANDING_BANNER:
- case E_BLOCK_WALL_BANNER: AddBannerEntity (static_cast<cBannerEntity *> (a_Entity)); break;
+ case E_BLOCK_WALL_BANNER: AddBannerEntity(static_cast<cBannerEntity *>(a_Entity)); break;
// Others:
- case E_BLOCK_BEACON: AddBeaconEntity (static_cast<cBeaconEntity *> (a_Entity)); break;
- case E_BLOCK_BED: AddBedEntity (static_cast<cBedEntity *> (a_Entity)); break;
- case E_BLOCK_BREWING_STAND: AddBrewingstandEntity (static_cast<cBrewingstandEntity *> (a_Entity)); break;
- case E_BLOCK_CHEST: AddChestEntity (static_cast<cChestEntity *> (a_Entity), a_Entity->GetBlockType()); break;
- case E_BLOCK_COMMAND_BLOCK: AddCommandBlockEntity (static_cast<cCommandBlockEntity *> (a_Entity)); break;
- case E_BLOCK_DISPENSER: AddDispenserEntity (static_cast<cDispenserEntity *> (a_Entity)); break;
- case E_BLOCK_DROPPER: AddDropperEntity (static_cast<cDropperEntity *> (a_Entity)); break;
- case E_BLOCK_ENCHANTMENT_TABLE: AddEnchantingTableEntity(static_cast<cEnchantingTableEntity *>(a_Entity)); break;
- case E_BLOCK_ENDER_CHEST: AddEnderchestEntity (static_cast<cEnderChestEntity *> (a_Entity)); break;
- case E_BLOCK_END_PORTAL: AddEndPortalEntity (static_cast<cEndPortalEntity *> (a_Entity)); break;
- case E_BLOCK_FLOWER_POT: AddFlowerPotEntity (static_cast<cFlowerPotEntity *> (a_Entity)); break;
- case E_BLOCK_FURNACE: AddFurnaceEntity (static_cast<cFurnaceEntity *> (a_Entity)); break;
- case E_BLOCK_HEAD: AddMobHeadEntity (static_cast<cMobHeadEntity *> (a_Entity)); break;
- case E_BLOCK_HOPPER: AddHopperEntity (static_cast<cHopperEntity *> (a_Entity)); break;
- case E_BLOCK_JUKEBOX: AddJukeboxEntity (static_cast<cJukeboxEntity *> (a_Entity)); break;
- case E_BLOCK_LIT_FURNACE: AddFurnaceEntity (static_cast<cFurnaceEntity *> (a_Entity)); break;
- case E_BLOCK_MOB_SPAWNER: AddMobSpawnerEntity (static_cast<cMobSpawnerEntity *> (a_Entity)); break;
- case E_BLOCK_NOTE_BLOCK: AddNoteEntity (static_cast<cNoteEntity *> (a_Entity)); break;
- case E_BLOCK_SIGN_POST: AddSignEntity (static_cast<cSignEntity *> (a_Entity)); break;
- case E_BLOCK_TRAPPED_CHEST: AddChestEntity (static_cast<cChestEntity *> (a_Entity), a_Entity->GetBlockType()); break;
- case E_BLOCK_WALLSIGN: AddSignEntity (static_cast<cSignEntity *> (a_Entity)); break;
+ case E_BLOCK_BEACON: AddBeaconEntity(static_cast<cBeaconEntity *>(a_Entity)); break;
+ case E_BLOCK_BED: AddBedEntity(static_cast<cBedEntity *>(a_Entity)); break;
+ case E_BLOCK_BREWING_STAND: AddBrewingstandEntity(static_cast<cBrewingstandEntity *>(a_Entity)); break;
+ case E_BLOCK_CHEST: AddChestEntity(static_cast<cChestEntity *>(a_Entity), a_Entity->GetBlockType()); break;
+ case E_BLOCK_COMMAND_BLOCK: AddCommandBlockEntity(static_cast<cCommandBlockEntity *>(a_Entity)); break;
+ case E_BLOCK_DISPENSER: AddDispenserEntity(static_cast<cDispenserEntity *>(a_Entity)); break;
+ case E_BLOCK_DROPPER: AddDropperEntity(static_cast<cDropperEntity *>(a_Entity)); break;
+ case E_BLOCK_ENCHANTMENT_TABLE:
+ AddEnchantingTableEntity(static_cast<cEnchantingTableEntity *>(a_Entity));
+ break;
+ case E_BLOCK_ENDER_CHEST: AddEnderchestEntity(static_cast<cEnderChestEntity *>(a_Entity)); break;
+ case E_BLOCK_END_PORTAL: AddEndPortalEntity(static_cast<cEndPortalEntity *>(a_Entity)); break;
+ case E_BLOCK_FLOWER_POT: AddFlowerPotEntity(static_cast<cFlowerPotEntity *>(a_Entity)); break;
+ case E_BLOCK_FURNACE: AddFurnaceEntity(static_cast<cFurnaceEntity *>(a_Entity)); break;
+ case E_BLOCK_HEAD: AddMobHeadEntity(static_cast<cMobHeadEntity *>(a_Entity)); break;
+ case E_BLOCK_HOPPER: AddHopperEntity(static_cast<cHopperEntity *>(a_Entity)); break;
+ case E_BLOCK_JUKEBOX: AddJukeboxEntity(static_cast<cJukeboxEntity *>(a_Entity)); break;
+ case E_BLOCK_LIT_FURNACE: AddFurnaceEntity(static_cast<cFurnaceEntity *>(a_Entity)); break;
+ case E_BLOCK_MOB_SPAWNER: AddMobSpawnerEntity(static_cast<cMobSpawnerEntity *>(a_Entity)); break;
+ case E_BLOCK_NOTE_BLOCK: AddNoteEntity(static_cast<cNoteEntity *>(a_Entity)); break;
+ case E_BLOCK_SIGN_POST: AddSignEntity(static_cast<cSignEntity *>(a_Entity)); break;
+ case E_BLOCK_TRAPPED_CHEST:
+ AddChestEntity(static_cast<cChestEntity *>(a_Entity), a_Entity->GetBlockType());
+ break;
+ case E_BLOCK_WALLSIGN: AddSignEntity(static_cast<cSignEntity *>(a_Entity)); break;
default:
{
ASSERT(!"Unhandled block entity saved into Anvil");
@@ -274,60 +269,60 @@ public:
void AddItem(const cItem & a_Item, int a_Slot, const AString & a_CompoundName = AString())
{
mWriter.BeginCompound(a_CompoundName);
- mWriter.AddShort("id", static_cast<Int16>(a_Item.m_ItemType));
- mWriter.AddShort("Damage", static_cast<Int16>((a_Item.m_ItemDamage)));
- mWriter.AddByte ("Count", static_cast<Byte>(a_Item.m_ItemCount));
+ mWriter.AddShort("id", static_cast<Int16>(a_Item.m_ItemType));
+ mWriter.AddShort("Damage", static_cast<Int16>((a_Item.m_ItemDamage)));
+ mWriter.AddByte("Count", static_cast<Byte>(a_Item.m_ItemCount));
if (a_Slot >= 0)
{
- mWriter.AddByte ("Slot", static_cast<unsigned char>(a_Slot));
+ mWriter.AddByte("Slot", static_cast<unsigned char>(a_Slot));
}
// Write the tag compound (for enchantment, firework, custom name and repair cost):
- if (
- (!a_Item.m_Enchantments.IsEmpty()) ||
+ if ((!a_Item.m_Enchantments.IsEmpty()) ||
((a_Item.m_ItemType == E_ITEM_FIREWORK_ROCKET) || (a_Item.m_ItemType == E_ITEM_FIREWORK_STAR)) ||
- (a_Item.m_RepairCost > 0) ||
- (a_Item.m_CustomName != "") ||
- (!a_Item.m_LoreTable.empty())
- )
+ (a_Item.m_RepairCost > 0) || (a_Item.m_CustomName != "") || (!a_Item.m_LoreTable.empty()))
{
mWriter.BeginCompound("tag");
- if (a_Item.m_RepairCost > 0)
+ if (a_Item.m_RepairCost > 0)
+ {
+ mWriter.AddInt("RepairCost", a_Item.m_RepairCost);
+ }
+
+ if ((a_Item.m_CustomName != "") || (!a_Item.m_LoreTable.empty()))
+ {
+ mWriter.BeginCompound("display");
+ if (a_Item.m_CustomName != "")
{
- mWriter.AddInt("RepairCost", a_Item.m_RepairCost);
+ mWriter.AddString("Name", a_Item.m_CustomName);
}
-
- if ((a_Item.m_CustomName != "") || (!a_Item.m_LoreTable.empty()))
+ if (!a_Item.m_LoreTable.empty())
{
- mWriter.BeginCompound("display");
- if (a_Item.m_CustomName != "")
+ mWriter.BeginList("Lore", TAG_String);
+
+ for (const auto & Line : a_Item.m_LoreTable)
{
- mWriter.AddString("Name", a_Item.m_CustomName);
+ mWriter.AddString("", Line);
}
- if (!a_Item.m_LoreTable.empty())
- {
- mWriter.BeginList("Lore", TAG_String);
- for (const auto & Line : a_Item.m_LoreTable)
- {
- mWriter.AddString("", Line);
- }
-
- mWriter.EndList();
- }
- mWriter.EndCompound();
+ mWriter.EndList();
}
+ mWriter.EndCompound();
+ }
- if ((a_Item.m_ItemType == E_ITEM_FIREWORK_ROCKET) || (a_Item.m_ItemType == E_ITEM_FIREWORK_STAR))
- {
- cFireworkItem::WriteToNBTCompound(a_Item.m_FireworkItem, mWriter, static_cast<ENUM_ITEM_TYPE>(a_Item.m_ItemType));
- }
+ if ((a_Item.m_ItemType == E_ITEM_FIREWORK_ROCKET) || (a_Item.m_ItemType == E_ITEM_FIREWORK_STAR))
+ {
+ cFireworkItem::WriteToNBTCompound(
+ a_Item.m_FireworkItem,
+ mWriter,
+ static_cast<ENUM_ITEM_TYPE>(a_Item.m_ItemType)
+ );
+ }
- if (!a_Item.m_Enchantments.IsEmpty())
- {
- const char * TagName = (a_Item.m_ItemType == E_ITEM_BOOK) ? "StoredEnchantments" : "ench";
- EnchantmentSerializer::WriteToNBTCompound(a_Item.m_Enchantments, mWriter, TagName);
- }
+ if (!a_Item.m_Enchantments.IsEmpty())
+ {
+ const char * TagName = (a_Item.m_ItemType == E_ITEM_BOOK) ? "StoredEnchantments" : "ench";
+ EnchantmentSerializer::WriteToNBTCompound(a_Item.m_Enchantments, mWriter, TagName);
+ }
mWriter.EndCompound();
}
@@ -340,7 +335,8 @@ public:
/** Writes an item grid into the writer.
Begins the stored slot numbers with a_BeginSlotNum.
- Note that it doesn't begin nor end the list tag, so that multiple grids may be concatenated together using this function. */
+ Note that it doesn't begin nor end the list tag, so that multiple grids may be concatenated together using this
+ function. */
void AddItemGrid(const cItemGrid & a_Grid, int a_BeginSlotNum = 0)
{
int NumSlots = a_Grid.GetNumSlots();
@@ -361,9 +357,9 @@ public:
void AddBasicTileEntity(cBlockEntity * a_Entity, const char * a_EntityTypeID)
{
- mWriter.AddInt ("x", a_Entity->GetPosX());
- mWriter.AddInt ("y", a_Entity->GetPosY());
- mWriter.AddInt ("z", a_Entity->GetPosZ());
+ mWriter.AddInt("x", a_Entity->GetPosX());
+ mWriter.AddInt("y", a_Entity->GetPosY());
+ mWriter.AddInt("z", a_Entity->GetPosZ());
mWriter.AddString("id", a_EntityTypeID);
}
@@ -374,12 +370,12 @@ public:
void AddBannerEntity(cBannerEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity,"Banner");
- mWriter.AddInt("Base", static_cast<int>(a_Entity->GetBaseColor()));
- if (!a_Entity->GetCustomName().empty())
- {
- mWriter.AddString("CustomName", a_Entity->GetCustomName());
- }
+ AddBasicTileEntity(a_Entity, "Banner");
+ mWriter.AddInt("Base", static_cast<int>(a_Entity->GetBaseColor()));
+ if (!a_Entity->GetCustomName().empty())
+ {
+ mWriter.AddString("CustomName", a_Entity->GetCustomName());
+ }
mWriter.EndCompound();
}
@@ -390,13 +386,13 @@ public:
void AddBeaconEntity(cBeaconEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "Beacon");
- mWriter.AddInt("Levels", a_Entity->GetBeaconLevel());
- mWriter.AddInt("Primary", static_cast<int>(a_Entity->GetPrimaryEffect()));
- mWriter.AddInt("Secondary", static_cast<int>(a_Entity->GetSecondaryEffect()));
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Entity->GetContents());
- mWriter.EndList();
+ AddBasicTileEntity(a_Entity, "Beacon");
+ mWriter.AddInt("Levels", a_Entity->GetBeaconLevel());
+ mWriter.AddInt("Primary", static_cast<int>(a_Entity->GetPrimaryEffect()));
+ mWriter.AddInt("Secondary", static_cast<int>(a_Entity->GetSecondaryEffect()));
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Entity->GetContents());
+ mWriter.EndList();
mWriter.EndCompound();
}
@@ -419,12 +415,12 @@ public:
void AddBrewingstandEntity(cBrewingstandEntity * a_Brewingstand)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Brewingstand, "Brewingstand");
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Brewingstand->GetContents());
- mWriter.EndList();
- mWriter.AddShort("BrewTime", a_Brewingstand->GetTimeBrewed());
- mWriter.AddShort("Fuel", a_Brewingstand->GetRemainingFuel());
+ AddBasicTileEntity(a_Brewingstand, "Brewingstand");
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Brewingstand->GetContents());
+ mWriter.EndList();
+ mWriter.AddShort("BrewTime", a_Brewingstand->GetTimeBrewed());
+ mWriter.AddShort("Fuel", a_Brewingstand->GetRemainingFuel());
mWriter.EndCompound();
}
@@ -435,10 +431,10 @@ public:
void AddChestEntity(cChestEntity * a_Entity, BLOCKTYPE a_ChestType)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "Chest");
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Entity->GetContents());
- mWriter.EndList();
+ AddBasicTileEntity(a_Entity, "Chest");
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Entity->GetContents());
+ mWriter.EndList();
mWriter.EndCompound();
}
@@ -449,10 +445,10 @@ public:
void AddDispenserEntity(cDispenserEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "Trap");
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Entity->GetContents());
- mWriter.EndList();
+ AddBasicTileEntity(a_Entity, "Trap");
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Entity->GetContents());
+ mWriter.EndList();
mWriter.EndCompound();
}
@@ -463,10 +459,10 @@ public:
void AddDropperEntity(cDropperEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "Dropper");
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Entity->GetContents());
- mWriter.EndList();
+ AddBasicTileEntity(a_Entity, "Dropper");
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Entity->GetContents());
+ mWriter.EndList();
mWriter.EndCompound();
}
@@ -477,11 +473,11 @@ public:
void AddEnchantingTableEntity(cEnchantingTableEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "EnchantingTable");
- if (!a_Entity->GetCustomName().empty())
- {
- mWriter.AddString("CustomName", a_Entity->GetCustomName());
- }
+ AddBasicTileEntity(a_Entity, "EnchantingTable");
+ if (!a_Entity->GetCustomName().empty())
+ {
+ mWriter.AddString("CustomName", a_Entity->GetCustomName());
+ }
mWriter.EndCompound();
}
@@ -491,7 +487,7 @@ public:
void AddEnderchestEntity(cEnderChestEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "EnderChest");
+ AddBasicTileEntity(a_Entity, "EnderChest");
mWriter.EndCompound();
}
@@ -501,7 +497,7 @@ public:
void AddEndPortalEntity(cEndPortalEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "EndPortal");
+ AddBasicTileEntity(a_Entity, "EndPortal");
mWriter.EndCompound();
}
@@ -512,12 +508,12 @@ public:
void AddFurnaceEntity(cFurnaceEntity * a_Furnace)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Furnace, "Furnace");
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Furnace->GetContents());
- mWriter.EndList();
- mWriter.AddShort("BurnTime", static_cast<Int16>(a_Furnace->GetFuelBurnTimeLeft()));
- mWriter.AddShort("CookTime", static_cast<Int16>(a_Furnace->GetTimeCooked()));
+ AddBasicTileEntity(a_Furnace, "Furnace");
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Furnace->GetContents());
+ mWriter.EndList();
+ mWriter.AddShort("BurnTime", static_cast<Int16>(a_Furnace->GetFuelBurnTimeLeft()));
+ mWriter.AddShort("CookTime", static_cast<Int16>(a_Furnace->GetTimeCooked()));
mWriter.EndCompound();
}
@@ -528,10 +524,10 @@ public:
void AddHopperEntity(cHopperEntity * a_Entity)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Entity, "Hopper");
- mWriter.BeginList("Items", TAG_Compound);
- AddItemGrid(a_Entity->GetContents());
- mWriter.EndList();
+ AddBasicTileEntity(a_Entity, "Hopper");
+ mWriter.BeginList("Items", TAG_Compound);
+ AddItemGrid(a_Entity->GetContents());
+ mWriter.EndList();
mWriter.EndCompound();
}
@@ -542,8 +538,8 @@ public:
void AddJukeboxEntity(cJukeboxEntity * a_Jukebox)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Jukebox, "RecordPlayer");
- mWriter.AddInt("Record", a_Jukebox->GetRecord());
+ AddBasicTileEntity(a_Jukebox, "RecordPlayer");
+ mWriter.AddInt("Record", a_Jukebox->GetRecord());
mWriter.EndCompound();
}
@@ -554,15 +550,15 @@ public:
void AddMobSpawnerEntity(cMobSpawnerEntity * a_MobSpawner)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_MobSpawner, "MobSpawner");
- mWriter.AddString("EntityId", NamespaceSerializer::From(a_MobSpawner->GetEntity()));
- mWriter.AddShort("SpawnCount", a_MobSpawner->GetSpawnCount());
- mWriter.AddShort("SpawnRange", a_MobSpawner->GetSpawnRange());
- mWriter.AddShort("Delay", a_MobSpawner->GetSpawnDelay());
- mWriter.AddShort("MinSpawnDelay", a_MobSpawner->GetMinSpawnDelay());
- mWriter.AddShort("MaxSpawnDelay", a_MobSpawner->GetMaxSpawnDelay());
- mWriter.AddShort("MaxNearbyEntities", a_MobSpawner->GetMaxNearbyEntities());
- mWriter.AddShort("RequiredPlayerRange", a_MobSpawner->GetRequiredPlayerRange());
+ AddBasicTileEntity(a_MobSpawner, "MobSpawner");
+ mWriter.AddString("EntityId", NamespaceSerializer::From(a_MobSpawner->GetEntity()));
+ mWriter.AddShort("SpawnCount", a_MobSpawner->GetSpawnCount());
+ mWriter.AddShort("SpawnRange", a_MobSpawner->GetSpawnRange());
+ mWriter.AddShort("Delay", a_MobSpawner->GetSpawnDelay());
+ mWriter.AddShort("MinSpawnDelay", a_MobSpawner->GetMinSpawnDelay());
+ mWriter.AddShort("MaxSpawnDelay", a_MobSpawner->GetMaxSpawnDelay());
+ mWriter.AddShort("MaxNearbyEntities", a_MobSpawner->GetMaxNearbyEntities());
+ mWriter.AddShort("RequiredPlayerRange", a_MobSpawner->GetRequiredPlayerRange());
mWriter.EndCompound();
}
@@ -573,8 +569,8 @@ public:
void AddNoteEntity(cNoteEntity * a_Note)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Note, "Music");
- mWriter.AddByte("note", static_cast<Byte>(a_Note->GetNote()));
+ AddBasicTileEntity(a_Note, "Music");
+ mWriter.AddByte("note", static_cast<Byte>(a_Note->GetNote()));
mWriter.EndCompound();
}
@@ -585,11 +581,11 @@ public:
void AddCommandBlockEntity(cCommandBlockEntity * a_CmdBlock)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_CmdBlock, "Control");
- mWriter.AddString("Command", a_CmdBlock->GetCommand());
- mWriter.AddInt ("SuccessCount", a_CmdBlock->GetResult());
- mWriter.AddString("LastOutput", a_CmdBlock->GetLastOutput());
- mWriter.AddByte ("TrackOutput", 1); // TODO 2014-01-18 xdot: Figure out what TrackOutput is and save it.
+ AddBasicTileEntity(a_CmdBlock, "Control");
+ mWriter.AddString("Command", a_CmdBlock->GetCommand());
+ mWriter.AddInt("SuccessCount", a_CmdBlock->GetResult());
+ mWriter.AddString("LastOutput", a_CmdBlock->GetLastOutput());
+ mWriter.AddByte("TrackOutput", 1); // TODO 2014-01-18 xdot: Figure out what TrackOutput is and save it.
mWriter.EndCompound();
}
@@ -600,11 +596,11 @@ public:
void AddSignEntity(cSignEntity * a_Sign)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_Sign, "Sign");
- mWriter.AddString("Text1", a_Sign->GetLine(0));
- mWriter.AddString("Text2", a_Sign->GetLine(1));
- mWriter.AddString("Text3", a_Sign->GetLine(2));
- mWriter.AddString("Text4", a_Sign->GetLine(3));
+ AddBasicTileEntity(a_Sign, "Sign");
+ mWriter.AddString("Text1", a_Sign->GetLine(0));
+ mWriter.AddString("Text2", a_Sign->GetLine(1));
+ mWriter.AddString("Text3", a_Sign->GetLine(2));
+ mWriter.AddString("Text4", a_Sign->GetLine(3));
mWriter.EndCompound();
}
@@ -615,23 +611,23 @@ public:
void AddMobHeadEntity(cMobHeadEntity * a_MobHead)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_MobHead, "Skull");
- mWriter.AddByte ("SkullType", a_MobHead->GetType() & 0xFF);
- mWriter.AddByte ("Rot", a_MobHead->GetRotation() & 0xFF);
-
- // The new Block Entity format for a Mob Head. See: https://minecraft.wiki/w/Head#Block_entity
- mWriter.BeginCompound("Owner");
- mWriter.AddString("Id", a_MobHead->GetOwnerUUID().ToShortString());
- mWriter.AddString("Name", a_MobHead->GetOwnerName());
- mWriter.BeginCompound("Properties");
- mWriter.BeginList("textures", TAG_Compound);
- mWriter.BeginCompound("");
- mWriter.AddString("Signature", a_MobHead->GetOwnerTextureSignature());
- mWriter.AddString("Value", a_MobHead->GetOwnerTexture());
- mWriter.EndCompound();
- mWriter.EndList();
- mWriter.EndCompound();
- mWriter.EndCompound();
+ AddBasicTileEntity(a_MobHead, "Skull");
+ mWriter.AddByte("SkullType", a_MobHead->GetType() & 0xFF);
+ mWriter.AddByte("Rot", a_MobHead->GetRotation() & 0xFF);
+
+ // The new Block Entity format for a Mob Head. See: https://minecraft.wiki/w/Head#Block_entity
+ mWriter.BeginCompound("Owner");
+ mWriter.AddString("Id", a_MobHead->GetOwnerUUID().ToShortString());
+ mWriter.AddString("Name", a_MobHead->GetOwnerName());
+ mWriter.BeginCompound("Properties");
+ mWriter.BeginList("textures", TAG_Compound);
+ mWriter.BeginCompound("");
+ mWriter.AddString("Signature", a_MobHead->GetOwnerTextureSignature());
+ mWriter.AddString("Value", a_MobHead->GetOwnerTexture());
+ mWriter.EndCompound();
+ mWriter.EndList();
+ mWriter.EndCompound();
+ mWriter.EndCompound();
mWriter.EndCompound();
}
@@ -642,9 +638,9 @@ public:
void AddFlowerPotEntity(cFlowerPotEntity * a_FlowerPot)
{
mWriter.BeginCompound("");
- AddBasicTileEntity(a_FlowerPot, "FlowerPot");
- mWriter.AddInt ("Item", static_cast<Int32>(a_FlowerPot->GetItem().m_ItemType));
- mWriter.AddInt ("Data", static_cast<Int32>(a_FlowerPot->GetItem().m_ItemDamage));
+ AddBasicTileEntity(a_FlowerPot, "FlowerPot");
+ mWriter.AddInt("Item", static_cast<Int32>(a_FlowerPot->GetItem().m_ItemType));
+ mWriter.AddInt("Data", static_cast<Int32>(a_FlowerPot->GetItem().m_ItemDamage));
mWriter.EndCompound();
}
@@ -656,18 +652,18 @@ public:
{
mWriter.AddString("id", a_ClassName);
mWriter.BeginList("Pos", TAG_Double);
- mWriter.AddDouble("", a_Entity->GetPosX());
- mWriter.AddDouble("", a_Entity->GetPosY());
- mWriter.AddDouble("", a_Entity->GetPosZ());
+ mWriter.AddDouble("", a_Entity->GetPosX());
+ mWriter.AddDouble("", a_Entity->GetPosY());
+ mWriter.AddDouble("", a_Entity->GetPosZ());
mWriter.EndList();
mWriter.BeginList("Motion", TAG_Double);
- mWriter.AddDouble("", a_Entity->GetSpeedX());
- mWriter.AddDouble("", a_Entity->GetSpeedY());
- mWriter.AddDouble("", a_Entity->GetSpeedZ());
+ mWriter.AddDouble("", a_Entity->GetSpeedX());
+ mWriter.AddDouble("", a_Entity->GetSpeedY());
+ mWriter.AddDouble("", a_Entity->GetSpeedZ());
mWriter.EndList();
mWriter.BeginList("Rotation", TAG_Double);
- mWriter.AddDouble("", a_Entity->GetYaw());
- mWriter.AddDouble("", a_Entity->GetPitch());
+ mWriter.AddDouble("", a_Entity->GetYaw());
+ mWriter.AddDouble("", a_Entity->GetPitch());
mWriter.EndList();
mWriter.AddFloat("Health", a_Entity->GetHealth());
}
@@ -679,8 +675,8 @@ public:
void AddBoatEntity(cBoat * a_Boat)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_Boat, "Boat");
- mWriter.AddString("Type", cBoat::MaterialToString(a_Boat->GetMaterial()));
+ AddBasicEntity(a_Boat, "Boat");
+ mWriter.AddString("Type", cBoat::MaterialToString(a_Boat->GetMaterial()));
mWriter.EndCompound();
}
@@ -691,17 +687,17 @@ public:
void AddEnderCrystalEntity(cEnderCrystal * a_EnderCrystal)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_EnderCrystal, "EnderCrystal");
- mWriter.AddByte("ShowBottom", a_EnderCrystal->ShowsBottom() ? 1 : 0);
- if (a_EnderCrystal->DisplaysBeam())
- {
- mWriter.BeginCompound("BeamTarget");
- const auto & BeamTarget = a_EnderCrystal->GetBeamTarget();
- mWriter.AddInt("X", BeamTarget.x);
- mWriter.AddInt("Y", BeamTarget.y);
- mWriter.AddInt("Z", BeamTarget.z);
- mWriter.EndCompound();
- }
+ AddBasicEntity(a_EnderCrystal, "EnderCrystal");
+ mWriter.AddByte("ShowBottom", a_EnderCrystal->ShowsBottom() ? 1 : 0);
+ if (a_EnderCrystal->DisplaysBeam())
+ {
+ mWriter.BeginCompound("BeamTarget");
+ const auto & BeamTarget = a_EnderCrystal->GetBeamTarget();
+ mWriter.AddInt("X", BeamTarget.x);
+ mWriter.AddInt("Y", BeamTarget.y);
+ mWriter.AddInt("Z", BeamTarget.z);
+ mWriter.EndCompound();
+ }
mWriter.EndCompound();
}
@@ -712,12 +708,12 @@ public:
void AddFallingBlockEntity(cFallingBlock * a_FallingBlock)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_FallingBlock, "FallingSand");
- mWriter.AddInt("TileID", a_FallingBlock->GetBlockType());
- mWriter.AddByte("Data", a_FallingBlock->GetBlockMeta());
- mWriter.AddByte("Time", 1); // Unused in Cuberite, Vanilla said to need nonzero
- mWriter.AddByte("DropItem", 1);
- mWriter.AddByte("HurtEntities", a_FallingBlock->GetBlockType() == E_BLOCK_ANVIL);
+ AddBasicEntity(a_FallingBlock, "FallingSand");
+ mWriter.AddInt("TileID", a_FallingBlock->GetBlockType());
+ mWriter.AddByte("Data", a_FallingBlock->GetBlockMeta());
+ mWriter.AddByte("Time", 1); // Unused in Cuberite, Vanilla said to need nonzero
+ mWriter.AddByte("DropItem", 1);
+ mWriter.AddByte("HurtEntities", a_FallingBlock->GetBlockType() == E_BLOCK_ANVIL);
mWriter.EndCompound();
}
@@ -729,38 +725,38 @@ public:
{
mWriter.BeginCompound("");
- switch (a_Minecart->GetPayload())
+ switch (a_Minecart->GetPayload())
+ {
+ case cMinecart::mpChest:
{
- case cMinecart::mpChest:
- {
- AddBasicEntity(a_Minecart, "MinecartChest");
- // Add chest contents into the Items tag:
- AddMinecartChestContents(static_cast<cMinecartWithChest *>(a_Minecart));
- break;
- }
- case cMinecart::mpFurnace:
- {
- AddBasicEntity(a_Minecart, "MinecartFurnace");
- // TODO: Add "Push" and "Fuel" tags
- break;
- }
- case cMinecart::mpHopper:
- {
- AddBasicEntity(a_Minecart, "MinecartHopper");
- // TODO: Add hopper contents?
- break;
- }
- case cMinecart::mpTNT:
- {
- AddBasicEntity(a_Minecart, "MinecartTNT");
- break;
- }
- case cMinecart::mpNone:
- {
- AddBasicEntity(a_Minecart, "MinecartRideable");
- break;
- }
- } // switch (Payload)
+ AddBasicEntity(a_Minecart, "MinecartChest");
+ // Add chest contents into the Items tag:
+ AddMinecartChestContents(static_cast<cMinecartWithChest *>(a_Minecart));
+ break;
+ }
+ case cMinecart::mpFurnace:
+ {
+ AddBasicEntity(a_Minecart, "MinecartFurnace");
+ // TODO: Add "Push" and "Fuel" tags
+ break;
+ }
+ case cMinecart::mpHopper:
+ {
+ AddBasicEntity(a_Minecart, "MinecartHopper");
+ // TODO: Add hopper contents?
+ break;
+ }
+ case cMinecart::mpTNT:
+ {
+ AddBasicEntity(a_Minecart, "MinecartTNT");
+ break;
+ }
+ case cMinecart::mpNone:
+ {
+ AddBasicEntity(a_Minecart, "MinecartRideable");
+ break;
+ }
+ } // switch (Payload)
mWriter.EndCompound();
}
@@ -772,244 +768,247 @@ public:
void AddMonsterEntity(cMonster * a_Monster)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_Monster, NamespaceSerializer::From(a_Monster->GetMobType()));
- mWriter.BeginList("DropChances", TAG_Float);
- mWriter.AddFloat("", a_Monster->GetDropChanceWeapon());
- mWriter.AddFloat("", a_Monster->GetDropChanceHelmet());
- mWriter.AddFloat("", a_Monster->GetDropChanceChestplate());
- mWriter.AddFloat("", a_Monster->GetDropChanceLeggings());
- mWriter.AddFloat("", a_Monster->GetDropChanceBoots());
- mWriter.EndList();
- mWriter.AddByte("CanPickUpLoot", (a_Monster->CanPickUpLoot())? 1 : 0);
- mWriter.AddString("CustomName", a_Monster->GetCustomName());
- mWriter.AddByte("CustomNameVisible", static_cast<Byte>(a_Monster->IsCustomNameAlwaysVisible()));
+ AddBasicEntity(a_Monster, NamespaceSerializer::From(a_Monster->GetMobType()));
+ mWriter.BeginList("DropChances", TAG_Float);
+ mWriter.AddFloat("", a_Monster->GetDropChanceWeapon());
+ mWriter.AddFloat("", a_Monster->GetDropChanceHelmet());
+ mWriter.AddFloat("", a_Monster->GetDropChanceChestplate());
+ mWriter.AddFloat("", a_Monster->GetDropChanceLeggings());
+ mWriter.AddFloat("", a_Monster->GetDropChanceBoots());
+ mWriter.EndList();
+ mWriter.AddByte("CanPickUpLoot", (a_Monster->CanPickUpLoot()) ? 1 : 0);
+ mWriter.AddString("CustomName", a_Monster->GetCustomName());
+ mWriter.AddByte("CustomNameVisible", static_cast<Byte>(a_Monster->IsCustomNameAlwaysVisible()));
- // Mob was leashed
- if (a_Monster->IsLeashed() || (a_Monster->GetLeashToPos() != nullptr))
- {
- mWriter.AddByte("Leashed", 1);
+ // Mob was leashed
+ if (a_Monster->IsLeashed() || (a_Monster->GetLeashToPos() != nullptr))
+ {
+ mWriter.AddByte("Leashed", 1);
- const Vector3d * LeashedToPos = nullptr;
+ const Vector3d * LeashedToPos = nullptr;
- if (a_Monster->GetLeashToPos() != nullptr)
- {
- LeashedToPos = a_Monster->GetLeashToPos();
- }
- else if (a_Monster->GetLeashedTo()->IsLeashKnot())
- {
- LeashedToPos = & a_Monster->GetLeashedTo()->GetPosition();
- }
+ if (a_Monster->GetLeashToPos() != nullptr)
+ {
+ LeashedToPos = a_Monster->GetLeashToPos();
+ }
+ else if (a_Monster->GetLeashedTo()->IsLeashKnot())
+ {
+ LeashedToPos = &a_Monster->GetLeashedTo()->GetPosition();
+ }
- if (LeashedToPos != nullptr)
- {
- mWriter.BeginCompound("Leash");
- mWriter.AddDouble("X", LeashedToPos->x);
- mWriter.AddDouble("Y", LeashedToPos->y);
- mWriter.AddDouble("Z", LeashedToPos->z);
- mWriter.EndCompound();
- }
+ if (LeashedToPos != nullptr)
+ {
+ mWriter.BeginCompound("Leash");
+ mWriter.AddDouble("X", LeashedToPos->x);
+ mWriter.AddDouble("Y", LeashedToPos->y);
+ mWriter.AddDouble("Z", LeashedToPos->z);
+ mWriter.EndCompound();
}
+ }
- switch (a_Monster->GetMobType())
+ switch (a_Monster->GetMobType())
+ {
+ case mtBat:
{
- case mtBat:
- {
- mWriter.AddByte("BatFlags", static_cast<const cBat *>(a_Monster)->IsHanging());
- break;
- }
- case mtCreeper:
- {
- const cCreeper *Creeper = static_cast<const cCreeper *>(a_Monster);
- mWriter.AddByte("powered", Creeper->IsCharged());
- mWriter.AddByte("ignited", Creeper->IsBlowing());
- break;
- }
- case mtEnderman:
- {
- const cEnderman *Enderman = static_cast<const cEnderman *>(a_Monster);
- mWriter.AddShort("carried", static_cast<Int16>(Enderman->GetCarriedBlock()));
- mWriter.AddShort("carriedData", static_cast<Int16>(Enderman->GetCarriedMeta()));
- break;
- }
- case mtHorse:
- {
- const cHorse *Horse = static_cast<const cHorse *>(a_Monster);
- mWriter.AddByte("ChestedHorse", Horse->IsChested()? 1 : 0);
- mWriter.AddByte("EatingHaystack", Horse->IsEating()? 1 : 0);
- mWriter.AddByte("Tame", Horse->IsTame()? 1: 0);
- mWriter.AddInt ("Type", Horse->GetHorseType());
- mWriter.AddInt ("Color", Horse->GetHorseColor());
- mWriter.AddInt ("Style", Horse->GetHorseStyle());
- mWriter.AddInt ("ArmorType", Horse->GetHorseArmour());
- mWriter.AddByte("Saddle", Horse->IsSaddled()? 1 : 0);
- mWriter.AddInt ("Age", Horse->GetAge());
- break;
- }
- case mtMagmaCube:
- {
- mWriter.AddInt("Size", static_cast<const cMagmaCube *>(a_Monster)->GetSize());
- break;
- }
- case mtOcelot:
- {
- const auto *Ocelot = static_cast<const cOcelot *>(a_Monster);
- if (!Ocelot->GetOwnerName().empty())
- {
- mWriter.AddString("Owner", Ocelot->GetOwnerName());
- }
- if (!Ocelot->GetOwnerUUID().IsNil())
- {
- mWriter.AddString("OwnerUUID", Ocelot->GetOwnerUUID().ToShortString());
- }
- mWriter.AddByte("Sitting", Ocelot->IsSitting() ? 1 : 0);
- mWriter.AddInt("CatType", Ocelot->GetOcelotType());
- mWriter.AddInt("Age", Ocelot->GetAge());
- break;
- }
- case mtPig:
- {
- mWriter.AddInt("Age", static_cast<const cPig *>(a_Monster)->GetAge());
- break;
- }
- case mtRabbit:
- {
- const cRabbit * Rabbit = static_cast<const cRabbit *>(a_Monster);
- mWriter.AddInt("RabbitType", static_cast<Int32>(Rabbit->GetRabbitType()));
- mWriter.AddInt("MoreCarrotTicks", Rabbit->GetMoreCarrotTicks());
- mWriter.AddInt("Age", Rabbit->GetAge());
- break;
- }
- case mtSheep:
- {
- const cSheep *Sheep = static_cast<const cSheep *>(a_Monster);
- mWriter.AddByte("Sheared", Sheep->IsSheared()? 1 : 0);
- mWriter.AddByte("Color", static_cast<Byte>(Sheep->GetFurColor()));
- mWriter.AddInt ("Age", Sheep->GetAge());
- break;
- }
- case mtSlime:
- {
- mWriter.AddInt("Size", static_cast<const cSlime *>(a_Monster)->GetSize());
- break;
- }
- case mtVillager:
- {
- const cVillager *Villager = static_cast<const cVillager *>(a_Monster);
- mWriter.AddInt("Profession", Villager->GetVilType());
- mWriter.AddInt("Age", Villager->GetAge());
- mWriter.BeginList("Inventory", TAG_Compound);
- AddItemGrid(Villager->GetInventory());
- mWriter.EndList();
- break;
- }
- case mtWither:
- {
- mWriter.AddInt("Invul", static_cast<Int32>(static_cast<const cWither *>(a_Monster)->GetWitherInvulnerableTicks()));
- break;
- }
- case mtWolf:
- {
- const cWolf *Wolf = static_cast<const cWolf *>(a_Monster);
- if (!Wolf->GetOwnerName().empty())
- {
- mWriter.AddString("Owner", Wolf->GetOwnerName());
- }
- if (!Wolf->GetOwnerUUID().IsNil())
- {
- mWriter.AddString("OwnerUUID", Wolf->GetOwnerUUID().ToShortString());
- }
- mWriter.AddByte("Sitting", Wolf->IsSitting() ? 1 : 0);
- mWriter.AddByte("Angry", Wolf->IsAngry() ? 1 : 0);
- mWriter.AddByte("CollarColor", static_cast<Byte>(Wolf->GetCollarColor()));
- mWriter.AddInt ("Age", Wolf->GetAge());
- break;
- }
- case mtZombie:
- {
- mWriter.AddInt("Age", static_cast<const cZombie *>(a_Monster)->GetAge());
- break;
- }
- case mtZombiePigman:
- {
- mWriter.AddInt("Age", static_cast<const cZombiePigman *>(a_Monster)->GetAge());
- break;
- }
- case mtZombieVillager:
+ mWriter.AddByte("BatFlags", static_cast<const cBat *>(a_Monster)->IsHanging());
+ break;
+ }
+ case mtCreeper:
+ {
+ const cCreeper * Creeper = static_cast<const cCreeper *>(a_Monster);
+ mWriter.AddByte("powered", Creeper->IsCharged());
+ mWriter.AddByte("ignited", Creeper->IsBlowing());
+ break;
+ }
+ case mtEnderman:
+ {
+ const cEnderman * Enderman = static_cast<const cEnderman *>(a_Monster);
+ mWriter.AddShort("carried", static_cast<Int16>(Enderman->GetCarriedBlock()));
+ mWriter.AddShort("carriedData", static_cast<Int16>(Enderman->GetCarriedMeta()));
+ break;
+ }
+ case mtHorse:
+ {
+ const cHorse * Horse = static_cast<const cHorse *>(a_Monster);
+ mWriter.AddByte("ChestedHorse", Horse->IsChested() ? 1 : 0);
+ mWriter.AddByte("EatingHaystack", Horse->IsEating() ? 1 : 0);
+ mWriter.AddByte("Tame", Horse->IsTame() ? 1 : 0);
+ mWriter.AddInt("Type", Horse->GetHorseType());
+ mWriter.AddInt("Color", Horse->GetHorseColor());
+ mWriter.AddInt("Style", Horse->GetHorseStyle());
+ mWriter.AddInt("ArmorType", Horse->GetHorseArmour());
+ mWriter.AddByte("Saddle", Horse->IsSaddled() ? 1 : 0);
+ mWriter.AddInt("Age", Horse->GetAge());
+ break;
+ }
+ case mtMagmaCube:
+ {
+ mWriter.AddInt("Size", static_cast<const cMagmaCube *>(a_Monster)->GetSize());
+ break;
+ }
+ case mtOcelot:
+ {
+ const auto * Ocelot = static_cast<const cOcelot *>(a_Monster);
+ if (!Ocelot->GetOwnerName().empty())
{
- const cZombieVillager *ZombieVillager = reinterpret_cast<const cZombieVillager *>(a_Monster);
- mWriter.AddInt("Profession", ZombieVillager->GetProfession());
- mWriter.AddInt("ConversionTime", ZombieVillager->ConversionTime());
- mWriter.AddInt("Age", ZombieVillager->GetAge());
- break;
+ mWriter.AddString("Owner", Ocelot->GetOwnerName());
}
- case mtBlaze:
- case mtCaveSpider:
- case mtChicken:
- case mtCow:
- case mtEnderDragon:
- case mtGhast:
- case mtGiant:
- case mtGuardian:
- case mtIronGolem:
- case mtMooshroom:
- case mtSilverfish:
- case mtSkeleton:
- case mtSnowGolem:
- case mtSpider:
- case mtSquid:
- case mtWitch:
- case mtWitherSkeleton:
+ if (!Ocelot->GetOwnerUUID().IsNil())
{
- // Other mobs have no special tags.
- break;
+ mWriter.AddString("OwnerUUID", Ocelot->GetOwnerUUID().ToShortString());
}
- case mtCat:
- case mtCod:
- case mtDolphin:
- case mtDonkey:
- case mtDrowned:
- case mtElderGuardian:
- case mtEndermite:
- case mtEvoker:
- case mtFox:
- case mtHoglin:
- case mtHusk:
- case mtIllusioner:
- case mtLlama:
- case mtMule:
- case mtPanda:
- case mtParrot:
- case mtPhantom:
- case mtPiglin:
- case mtPiglinBrute:
- case mtPillager:
- case mtPolarBear:
- case mtPufferfish:
- case mtRavager:
- case mtSalmon:
- case mtShulker:
- case mtSkeletonHorse:
- case mtStray:
- case mtStrider:
- case mtTraderLlama:
- case mtTropicalFish:
- case mtTurtle:
- case mtVex:
- case mtVindicator:
- case mtWanderingTrader:
- case mtZoglin:
- case mtZombieHorse:
+ mWriter.AddByte("Sitting", Ocelot->IsSitting() ? 1 : 0);
+ mWriter.AddInt("CatType", Ocelot->GetOcelotType());
+ mWriter.AddInt("Age", Ocelot->GetAge());
+ break;
+ }
+ case mtPig:
+ {
+ mWriter.AddInt("Age", static_cast<const cPig *>(a_Monster)->GetAge());
+ break;
+ }
+ case mtRabbit:
+ {
+ const cRabbit * Rabbit = static_cast<const cRabbit *>(a_Monster);
+ mWriter.AddInt("RabbitType", static_cast<Int32>(Rabbit->GetRabbitType()));
+ mWriter.AddInt("MoreCarrotTicks", Rabbit->GetMoreCarrotTicks());
+ mWriter.AddInt("Age", Rabbit->GetAge());
+ break;
+ }
+ case mtSheep:
+ {
+ const cSheep * Sheep = static_cast<const cSheep *>(a_Monster);
+ mWriter.AddByte("Sheared", Sheep->IsSheared() ? 1 : 0);
+ mWriter.AddByte("Color", static_cast<Byte>(Sheep->GetFurColor()));
+ mWriter.AddInt("Age", Sheep->GetAge());
+ break;
+ }
+ case mtSlime:
+ {
+ mWriter.AddInt("Size", static_cast<const cSlime *>(a_Monster)->GetSize());
+ break;
+ }
+ case mtVillager:
+ {
+ const cVillager * Villager = static_cast<const cVillager *>(a_Monster);
+ mWriter.AddInt("Profession", Villager->GetVilType());
+ mWriter.AddInt("Age", Villager->GetAge());
+ mWriter.BeginList("Inventory", TAG_Compound);
+ AddItemGrid(Villager->GetInventory());
+ mWriter.EndList();
+ break;
+ }
+ case mtWither:
+ {
+ mWriter.AddInt(
+ "Invul",
+ static_cast<Int32>(static_cast<const cWither *>(a_Monster)->GetWitherInvulnerableTicks())
+ );
+ break;
+ }
+ case mtWolf:
+ {
+ const cWolf * Wolf = static_cast<const cWolf *>(a_Monster);
+ if (!Wolf->GetOwnerName().empty())
{
- // All the entities not added
- LOGD("Saving unimplemented entity type: %d", NamespaceSerializer::From(a_Monster->GetMobType()));
- break;
+ mWriter.AddString("Owner", Wolf->GetOwnerName());
}
- case mtInvalidType:
+ if (!Wolf->GetOwnerUUID().IsNil())
{
- ASSERT(!"NBTChunkSerializer::SerializerCollector::AddMonsterEntity: Recieved mob of invalid type");
- break;
+ mWriter.AddString("OwnerUUID", Wolf->GetOwnerUUID().ToShortString());
}
+ mWriter.AddByte("Sitting", Wolf->IsSitting() ? 1 : 0);
+ mWriter.AddByte("Angry", Wolf->IsAngry() ? 1 : 0);
+ mWriter.AddByte("CollarColor", static_cast<Byte>(Wolf->GetCollarColor()));
+ mWriter.AddInt("Age", Wolf->GetAge());
+ break;
+ }
+ case mtZombie:
+ {
+ mWriter.AddInt("Age", static_cast<const cZombie *>(a_Monster)->GetAge());
+ break;
+ }
+ case mtZombiePigman:
+ {
+ mWriter.AddInt("Age", static_cast<const cZombiePigman *>(a_Monster)->GetAge());
+ break;
+ }
+ case mtZombieVillager:
+ {
+ const cZombieVillager * ZombieVillager = reinterpret_cast<const cZombieVillager *>(a_Monster);
+ mWriter.AddInt("Profession", ZombieVillager->GetProfession());
+ mWriter.AddInt("ConversionTime", ZombieVillager->ConversionTime());
+ mWriter.AddInt("Age", ZombieVillager->GetAge());
+ break;
+ }
+ case mtBlaze:
+ case mtCaveSpider:
+ case mtChicken:
+ case mtCow:
+ case mtEnderDragon:
+ case mtGhast:
+ case mtGiant:
+ case mtGuardian:
+ case mtIronGolem:
+ case mtMooshroom:
+ case mtSilverfish:
+ case mtSkeleton:
+ case mtSnowGolem:
+ case mtSpider:
+ case mtSquid:
+ case mtWitch:
+ case mtWitherSkeleton:
+ {
+ // Other mobs have no special tags.
+ break;
}
+ case mtCat:
+ case mtCod:
+ case mtDolphin:
+ case mtDonkey:
+ case mtDrowned:
+ case mtElderGuardian:
+ case mtEndermite:
+ case mtEvoker:
+ case mtFox:
+ case mtHoglin:
+ case mtHusk:
+ case mtIllusioner:
+ case mtLlama:
+ case mtMule:
+ case mtPanda:
+ case mtParrot:
+ case mtPhantom:
+ case mtPiglin:
+ case mtPiglinBrute:
+ case mtPillager:
+ case mtPolarBear:
+ case mtPufferfish:
+ case mtRavager:
+ case mtSalmon:
+ case mtShulker:
+ case mtSkeletonHorse:
+ case mtStray:
+ case mtStrider:
+ case mtTraderLlama:
+ case mtTropicalFish:
+ case mtTurtle:
+ case mtVex:
+ case mtVindicator:
+ case mtWanderingTrader:
+ case mtZoglin:
+ case mtZombieHorse:
+ {
+ // All the entities not added
+ LOGD("Saving unimplemented entity type: %d", NamespaceSerializer::From(a_Monster->GetMobType()));
+ break;
+ }
+ case mtInvalidType:
+ {
+ ASSERT(!"NBTChunkSerializer::SerializerCollector::AddMonsterEntity: Recieved mob of invalid type");
+ break;
+ }
+ }
mWriter.EndCompound();
}
@@ -1020,9 +1019,9 @@ public:
void AddPickupEntity(cPickup * a_Pickup)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_Pickup, "Item");
- AddItem(a_Pickup->GetItem(), -1, "Item");
- mWriter.AddShort("Age", static_cast<Int16>(a_Pickup->GetAge()));
+ AddBasicEntity(a_Pickup, "Item");
+ AddItem(a_Pickup->GetItem(), -1, "Item");
+ mWriter.AddShort("Age", static_cast<Int16>(a_Pickup->GetAge()));
mWriter.EndCompound();
}
@@ -1033,55 +1032,55 @@ public:
void AddProjectileEntity(cProjectileEntity * a_Projectile)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_Projectile, a_Projectile->GetMCAClassName());
- mWriter.AddByte("inGround", a_Projectile->IsInGround() ? 1 : 0);
+ AddBasicEntity(a_Projectile, a_Projectile->GetMCAClassName());
+ mWriter.AddByte("inGround", a_Projectile->IsInGround() ? 1 : 0);
- switch (a_Projectile->GetProjectileKind())
+ switch (a_Projectile->GetProjectileKind())
+ {
+ case cProjectileEntity::pkArrow:
{
- case cProjectileEntity::pkArrow:
- {
- cArrowEntity * Arrow = static_cast<cArrowEntity *>(a_Projectile);
-
- mWriter.AddShort("xTile", static_cast<Int16>(Arrow->GetBlockHit().x));
- mWriter.AddShort("yTile", static_cast<Int16>(Arrow->GetBlockHit().y));
- mWriter.AddShort("zTile", static_cast<Int16>(Arrow->GetBlockHit().z));
- mWriter.AddByte("pickup", static_cast<unsigned char>(Arrow->GetPickupState()));
- mWriter.AddDouble("damage", Arrow->GetDamageCoeff());
- break;
- }
- case cProjectileEntity::pkSplashPotion:
- {
- cSplashPotionEntity * Potion = static_cast<cSplashPotionEntity *>(a_Projectile);
-
- mWriter.AddInt("EffectType", static_cast<Int16>(Potion->GetEntityEffectType()));
- mWriter.AddInt("EffectDuration", static_cast<Int16>(Potion->GetEntityEffect().GetDuration()));
- mWriter.AddShort("EffectIntensity", Potion->GetEntityEffect().GetIntensity());
- mWriter.AddDouble("EffectDistanceModifier", Potion->GetEntityEffect().GetDistanceModifier());
- mWriter.AddInt("PotionName", Potion->GetPotionColor());
- break;
- }
- case cProjectileEntity::pkGhastFireball:
- {
- mWriter.AddInt("ExplosionPower", 1);
- break;
- }
- case cProjectileEntity::pkFireCharge:
- case cProjectileEntity::pkWitherSkull:
- case cProjectileEntity::pkEnderPearl:
- case cProjectileEntity::pkSnowball:
- {
- break;
- }
- default:
- {
- ASSERT(!"Unsaved projectile entity!");
- }
- } // switch (ProjectileKind)
+ cArrowEntity * Arrow = static_cast<cArrowEntity *>(a_Projectile);
- if (!a_Projectile->GetCreatorName().empty())
+ mWriter.AddShort("xTile", static_cast<Int16>(Arrow->GetBlockHit().x));
+ mWriter.AddShort("yTile", static_cast<Int16>(Arrow->GetBlockHit().y));
+ mWriter.AddShort("zTile", static_cast<Int16>(Arrow->GetBlockHit().z));
+ mWriter.AddByte("pickup", static_cast<unsigned char>(Arrow->GetPickupState()));
+ mWriter.AddDouble("damage", Arrow->GetDamageCoeff());
+ break;
+ }
+ case cProjectileEntity::pkSplashPotion:
+ {
+ cSplashPotionEntity * Potion = static_cast<cSplashPotionEntity *>(a_Projectile);
+
+ mWriter.AddInt("EffectType", static_cast<Int16>(Potion->GetEntityEffectType()));
+ mWriter.AddInt("EffectDuration", static_cast<Int16>(Potion->GetEntityEffect().GetDuration()));
+ mWriter.AddShort("EffectIntensity", Potion->GetEntityEffect().GetIntensity());
+ mWriter.AddDouble("EffectDistanceModifier", Potion->GetEntityEffect().GetDistanceModifier());
+ mWriter.AddInt("PotionName", Potion->GetPotionColor());
+ break;
+ }
+ case cProjectileEntity::pkGhastFireball:
+ {
+ mWriter.AddInt("ExplosionPower", 1);
+ break;
+ }
+ case cProjectileEntity::pkFireCharge:
+ case cProjectileEntity::pkWitherSkull:
+ case cProjectileEntity::pkEnderPearl:
+ case cProjectileEntity::pkSnowball:
+ {
+ break;
+ }
+ default:
{
- mWriter.AddString("ownerName", a_Projectile->GetCreatorName());
+ ASSERT(!"Unsaved projectile entity!");
}
+ } // switch (ProjectileKind)
+
+ if (!a_Projectile->GetCreatorName().empty())
+ {
+ mWriter.AddString("ownerName", a_Projectile->GetCreatorName());
+ }
mWriter.EndCompound();
}
@@ -1104,8 +1103,8 @@ public:
void AddTNTEntity(cTNTEntity * a_TNT)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_TNT, "PrimedTnt");
- mWriter.AddByte("Fuse", static_cast<unsigned char>(a_TNT->GetFuseTicks()));
+ AddBasicEntity(a_TNT, "PrimedTnt");
+ mWriter.AddByte("Fuse", static_cast<unsigned char>(a_TNT->GetFuseTicks()));
mWriter.EndCompound();
}
@@ -1116,9 +1115,9 @@ public:
void AddExpOrbEntity(cExpOrb * a_ExpOrb)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_ExpOrb, "XPOrb");
- mWriter.AddShort("Age", static_cast<Int16>(a_ExpOrb->GetAge()));
- mWriter.AddShort("Value", static_cast<Int16>(a_ExpOrb->GetReward()));
+ AddBasicEntity(a_ExpOrb, "XPOrb");
+ mWriter.AddShort("Age", static_cast<Int16>(a_ExpOrb->GetAge()));
+ mWriter.AddShort("Value", static_cast<Int16>(a_ExpOrb->GetReward()));
mWriter.EndCompound();
}
@@ -1129,11 +1128,11 @@ public:
void AddItemFrameEntity(cItemFrame * a_ItemFrame)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_ItemFrame, "ItemFrame");
- AddHangingEntity(a_ItemFrame);
- AddItem(a_ItemFrame->GetItem(), -1, "Item");
- mWriter.AddByte("ItemRotation", static_cast<Byte>(a_ItemFrame->GetItemRotation()));
- mWriter.AddFloat("ItemDropChance", 1.0F);
+ AddBasicEntity(a_ItemFrame, "ItemFrame");
+ AddHangingEntity(a_ItemFrame);
+ AddItem(a_ItemFrame->GetItem(), -1, "Item");
+ mWriter.AddByte("ItemRotation", static_cast<Byte>(a_ItemFrame->GetItemRotation()));
+ mWriter.AddFloat("ItemDropChance", 1.0F);
mWriter.EndCompound();
}
@@ -1144,8 +1143,8 @@ public:
void AddLeashKnotEntity(cLeashKnot * a_LeashKnot)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_LeashKnot, "LeashKnot");
- AddHangingEntity(a_LeashKnot);
+ AddBasicEntity(a_LeashKnot, "LeashKnot");
+ AddHangingEntity(a_LeashKnot);
mWriter.EndCompound();
}
@@ -1156,9 +1155,9 @@ public:
void AddPaintingEntity(cPainting * a_Painting)
{
mWriter.BeginCompound("");
- AddBasicEntity(a_Painting, "Painting");
- AddHangingEntity(a_Painting);
- mWriter.AddString("Motive", a_Painting->GetName());
+ AddBasicEntity(a_Painting, "Painting");
+ AddHangingEntity(a_Painting);
+ mWriter.AddString("Motive", a_Painting->GetName());
mWriter.EndCompound();
}
@@ -1169,15 +1168,15 @@ public:
void AddMinecartChestContents(cMinecartWithChest * a_Minecart)
{
mWriter.BeginList("Items", TAG_Compound);
- for (int i = 0; i < cMinecartWithChest::ContentsHeight * cMinecartWithChest::ContentsWidth; i++)
+ for (int i = 0; i < cMinecartWithChest::ContentsHeight * cMinecartWithChest::ContentsWidth; i++)
+ {
+ const cItem & Item = a_Minecart->GetSlot(i);
+ if (Item.IsEmpty())
{
- const cItem & Item = a_Minecart->GetSlot(i);
- if (Item.IsEmpty())
- {
- continue;
- }
- AddItem(Item, i);
+ continue;
}
+ AddItem(Item, i);
+ }
mWriter.EndList();
}
}; // SerializerCollector
@@ -1195,7 +1194,8 @@ void NBTChunkSerializer::Serialize(const cWorld & aWorld, cChunkCoords aCoords,
aWriter.BeginCompound("Level");
aWriter.AddInt("xPos", aCoords.m_ChunkX);
aWriter.AddInt("zPos", aCoords.m_ChunkZ);
- [[maybe_unused]] const bool Result = aWorld.GetChunkData(aCoords, serializer); // Chunk must be present in order to save
+ [[maybe_unused]] const bool Result =
+ aWorld.GetChunkData(aCoords, serializer); // Chunk must be present in order to save
ASSERT(Result);
serializer.Finish(); // Close NBT tags
@@ -1207,8 +1207,7 @@ void NBTChunkSerializer::Serialize(const cWorld & aWorld, cChunkCoords aCoords,
// Save blockdata:
aWriter.BeginList("Sections", TAG_Compound);
- ChunkDef_ForEachSection(serializer.m_BlockData, serializer.m_LightData,
- {
+ ChunkDef_ForEachSection(serializer.m_BlockData, serializer.m_LightData, {
aWriter.BeginCompound("");
if (Blocks != nullptr)
@@ -1231,11 +1230,13 @@ void NBTChunkSerializer::Serialize(const cWorld & aWorld, cChunkCoords aCoords,
if (BlockLights != nullptr)
{
- aWriter.AddByteArray("BlockLight", reinterpret_cast<const char *>(BlockLights->data()), BlockLights->size());
+ aWriter
+ .AddByteArray("BlockLight", reinterpret_cast<const char *>(BlockLights->data()), BlockLights->size());
}
else
{
- aWriter.AddByteArray("BlockLight", ChunkLightData::SectionLightCount, ChunkLightData::DefaultBlockLightValue);
+ aWriter
+ .AddByteArray("BlockLight", ChunkLightData::SectionLightCount, ChunkLightData::DefaultBlockLightValue);
}
if (SkyLights != nullptr)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 10:39:04 +0100