LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-13 13:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
Minecraft.World/Entities/TamableAnimal.cpp
View File

@@ -6,154 +6,121 @@
#include "../Util/ParticleTypes.h"
#include "TamableAnimal.h"
TamableAnimal::TamableAnimal(Level *level) : Animal(level)
{
sitGoal = new SitGoal(this);
TamableAnimal::TamableAnimal(Level* level) : Animal(level) {
sitGoal = new SitGoal(this);
}
TamableAnimal::~TamableAnimal()
{
if(sitGoal != NULL) delete sitGoal;
TamableAnimal::~TamableAnimal() {
if (sitGoal != NULL) delete sitGoal;
}
void TamableAnimal::defineSynchedData()
{
Animal::defineSynchedData();
entityData->define(DATA_FLAGS_ID, (uint8_t) 0);
entityData->define(DATA_OWNERUUID_ID, L"");
void TamableAnimal::defineSynchedData() {
Animal::defineSynchedData();
entityData->define(DATA_FLAGS_ID, (uint8_t)0);
entityData->define(DATA_OWNERUUID_ID, L"");
}
void TamableAnimal::addAdditonalSaveData(CompoundTag *tag)
{
Animal::addAdditonalSaveData(tag);
void TamableAnimal::addAdditonalSaveData(CompoundTag* tag) {
Animal::addAdditonalSaveData(tag);
#ifdef _XBOX_ONE
// 4J Stu Added from later Java version to remove owners from save transfer saves. We will probably want this on other platforms in the future
if (getOwnerUUID().empty())
{
tag->putString(L"OwnerUUID", L"");
}
else
{
tag->putString(L"OwnerUUID", getOwnerUUID());
}
// 4J Stu Added from later Java version to remove owners from save transfer
// saves. We will probably want this on other platforms in the future
if (getOwnerUUID().empty()) {
tag->putString(L"OwnerUUID", L"");
} else {
tag->putString(L"OwnerUUID", getOwnerUUID());
}
#else
if (getOwnerUUID().empty())
{
tag->putString(L"Owner", L"");
}
else
{
tag->putString(L"Owner", getOwnerUUID());
}
if (getOwnerUUID().empty()) {
tag->putString(L"Owner", L"");
} else {
tag->putString(L"Owner", getOwnerUUID());
}
#endif
tag->putBoolean(L"Sitting", isSitting());
tag->putBoolean(L"Sitting", isSitting());
}
void TamableAnimal::readAdditionalSaveData(CompoundTag *tag)
{
Animal::readAdditionalSaveData(tag);
void TamableAnimal::readAdditionalSaveData(CompoundTag* tag) {
Animal::readAdditionalSaveData(tag);
#ifdef _XBOX_ONE
// 4J Stu Added from later Java version to remove owners from save transfer saves. We will probably want this on other platforms in the future
std::wstring owner = L"";
if(tag->contains(L"OwnerUUID") )
{
owner = tag->getString(L"OwnerUUID");
}
// 4J Stu Added from later Java version to remove owners from save transfer
// saves. We will probably want this on other platforms in the future
std::wstring owner = L"";
if (tag->contains(L"OwnerUUID")) {
owner = tag->getString(L"OwnerUUID");
}
#else
std::wstring owner = tag->getString(L"Owner");
std::wstring owner = tag->getString(L"Owner");
#endif
if (owner.length() > 0)
{
setOwnerUUID(owner);
setTame(true);
}
sitGoal->wantToSit(tag->getBoolean(L"Sitting"));
if (owner.length() > 0) {
setOwnerUUID(owner);
setTame(true);
}
sitGoal->wantToSit(tag->getBoolean(L"Sitting"));
}
void TamableAnimal::spawnTamingParticles(bool success)
{
ePARTICLE_TYPE particle = eParticleType_heart;
if (!success)
{
particle = eParticleType_smoke;
}
for (int i = 0; i < 7; i++)
{
double xa = random->nextGaussian() * 0.02;
double ya = random->nextGaussian() * 0.02;
double za = random->nextGaussian() * 0.02;
level->addParticle(particle, x + random->nextFloat() * bbWidth * 2 - bbWidth, y + .5f + random->nextFloat() * bbHeight, z + random->nextFloat() * bbWidth * 2 - bbWidth, xa, ya, za);
}
void TamableAnimal::spawnTamingParticles(bool success) {
ePARTICLE_TYPE particle = eParticleType_heart;
if (!success) {
particle = eParticleType_smoke;
}
for (int i = 0; i < 7; i++) {
double xa = random->nextGaussian() * 0.02;
double ya = random->nextGaussian() * 0.02;
double za = random->nextGaussian() * 0.02;
level->addParticle(
particle, x + random->nextFloat() * bbWidth * 2 - bbWidth,
y + .5f + random->nextFloat() * bbHeight,
z + random->nextFloat() * bbWidth * 2 - bbWidth, xa, ya, za);
}
}
void TamableAnimal::handleEntityEvent(uint8_t id)
{
if (id == EntityEvent::TAMING_SUCCEEDED)
{
spawnTamingParticles(true);
}
else if (id == EntityEvent::TAMING_FAILED)
{
spawnTamingParticles(false);
}
else
{
Animal::handleEntityEvent(id);
}
void TamableAnimal::handleEntityEvent(uint8_t id) {
if (id == EntityEvent::TAMING_SUCCEEDED) {
spawnTamingParticles(true);
} else if (id == EntityEvent::TAMING_FAILED) {
spawnTamingParticles(false);
} else {
Animal::handleEntityEvent(id);
}
}
bool TamableAnimal::isTame()
{
return (entityData->getByte(DATA_FLAGS_ID) & 0x04) != 0;
bool TamableAnimal::isTame() {
return (entityData->getByte(DATA_FLAGS_ID) & 0x04) != 0;
}
void TamableAnimal::setTame(bool value)
{
uint8_t current = entityData->getByte(DATA_FLAGS_ID);
if (value)
{
entityData->set(DATA_FLAGS_ID, (uint8_t) (current | 0x04));
}
else
{
entityData->set(DATA_FLAGS_ID, (uint8_t) (current & ~0x04));
}
void TamableAnimal::setTame(bool value) {
uint8_t current = entityData->getByte(DATA_FLAGS_ID);
if (value) {
entityData->set(DATA_FLAGS_ID, (uint8_t)(current | 0x04));
} else {
entityData->set(DATA_FLAGS_ID, (uint8_t)(current & ~0x04));
}
}
bool TamableAnimal::isSitting()
{
return (entityData->getByte(DATA_FLAGS_ID) & 0x01) != 0;
bool TamableAnimal::isSitting() {
return (entityData->getByte(DATA_FLAGS_ID) & 0x01) != 0;
}
void TamableAnimal::setSitting(bool value)
{
uint8_t current = entityData->getByte(DATA_FLAGS_ID);
if (value)
{
entityData->set(DATA_FLAGS_ID, (uint8_t) (current | 0x01));
}
else
{
entityData->set(DATA_FLAGS_ID, (uint8_t) (current & ~0x01));
}
void TamableAnimal::setSitting(bool value) {
uint8_t current = entityData->getByte(DATA_FLAGS_ID);
if (value) {
entityData->set(DATA_FLAGS_ID, (uint8_t)(current | 0x01));
} else {
entityData->set(DATA_FLAGS_ID, (uint8_t)(current & ~0x01));
}
}
std::wstring TamableAnimal::getOwnerUUID()
{
return entityData->getString(DATA_OWNERUUID_ID);
std::wstring TamableAnimal::getOwnerUUID() {
return entityData->getString(DATA_OWNERUUID_ID);
}
void TamableAnimal::setOwnerUUID(const std::wstring &name)
{
entityData->set(DATA_OWNERUUID_ID, name);
void TamableAnimal::setOwnerUUID(const std::wstring& name) {
entityData->set(DATA_OWNERUUID_ID, name);
}
std::shared_ptr<Mob> TamableAnimal::getOwner()
{
return level->getPlayerByUUID(getOwnerUUID());
std::shared_ptr<Mob> TamableAnimal::getOwner() {
return level->getPlayerByUUID(getOwnerUUID());
}
SitGoal *TamableAnimal::getSitGoal()
{
return sitGoal;
}
SitGoal* TamableAnimal::getSitGoal() { return sitGoal; }