chore: format Minecraft.World

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

View File

@@ -6,45 +6,30 @@
#include "ButtonTile.h"
#include "../Util/SoundTypes.h"
ButtonTile::ButtonTile(int id, bool sensitive) : Tile(id, Material::decoration, false)
{
this->setTicking(true);
this->sensitive = sensitive;
ButtonTile::ButtonTile(int id, bool sensitive)
: Tile(id, Material::decoration, false) {
this->setTicking(true);
this->sensitive = sensitive;
}
Icon *ButtonTile::getTexture(int face, int data)
{
if(id == Tile::button_wood_Id) return Tile::wood->getTexture(Facing::UP);
else return Tile::rock->getTexture(Facing::UP);
Icon* ButtonTile::getTexture(int face, int data) {
if (id == Tile::button_wood_Id)
return Tile::wood->getTexture(Facing::UP);
else
return Tile::rock->getTexture(Facing::UP);
}
AABB *ButtonTile::getAABB(Level *level, int x, int y, int z)
{
return NULL;
}
AABB* ButtonTile::getAABB(Level* level, int x, int y, int z) { return NULL; }
int ButtonTile::getTickDelay()
{
return sensitive ? 30 : 20;
}
int ButtonTile::getTickDelay() { return sensitive ? 30 : 20; }
bool ButtonTile::blocksLight()
{
return false;
}
bool ButtonTile::blocksLight() { return false; }
bool ButtonTile::isSolidRender(bool isServerLevel)
{
return false;
}
bool ButtonTile::isSolidRender(bool isServerLevel) { return false; }
bool ButtonTile::isCubeShaped()
{
return false;
}
bool ButtonTile::isCubeShaped() { return false; }
bool ButtonTile::mayPlace(Level *level, int x, int y, int z, int face)
{
bool ButtonTile::mayPlace(Level* level, int x, int y, int z, int face) {
if (face == 2 && level->isSolidBlockingTile(x, y, z + 1)) return true;
if (face == 3 && level->isSolidBlockingTile(x, y, z - 1)) return true;
if (face == 4 && level->isSolidBlockingTile(x + 1, y, z)) return true;
@@ -52,88 +37,77 @@ bool ButtonTile::mayPlace(Level *level, int x, int y, int z, int face)
return false;
}
bool ButtonTile::mayPlace(Level *level, int x, int y, int z)
{
if (level->isSolidBlockingTile(x - 1, y, z))
{
bool ButtonTile::mayPlace(Level* level, int x, int y, int z) {
if (level->isSolidBlockingTile(x - 1, y, z)) {
return true;
}
else if (level->isSolidBlockingTile(x + 1, y, z))
{
} else if (level->isSolidBlockingTile(x + 1, y, z)) {
return true;
}
else if (level->isSolidBlockingTile(x, y, z - 1))
{
} else if (level->isSolidBlockingTile(x, y, z - 1)) {
return true;
}
else if (level->isSolidBlockingTile(x, y, z + 1))
{
} else if (level->isSolidBlockingTile(x, y, z + 1)) {
return true;
}
return false;
}
int ButtonTile::getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, int itemValue)
{
int ButtonTile::getPlacedOnFaceDataValue(Level* level, int x, int y, int z,
int face, float clickX, float clickY,
float clickZ, int itemValue) {
int dir = level->getData(x, y, z);
int oldFlip = dir & 8;
dir &= 7;
if (face == 2 && level->isSolidBlockingTile(x, y, z + 1)) dir = 4;
else if (face == 3 && level->isSolidBlockingTile(x, y, z - 1)) dir = 3;
else if (face == 4 && level->isSolidBlockingTile(x + 1, y, z)) dir = 2;
else if (face == 5 && level->isSolidBlockingTile(x - 1, y, z)) dir = 1;
else dir = findFace(level, x, y, z);
if (face == 2 && level->isSolidBlockingTile(x, y, z + 1))
dir = 4;
else if (face == 3 && level->isSolidBlockingTile(x, y, z - 1))
dir = 3;
else if (face == 4 && level->isSolidBlockingTile(x + 1, y, z))
dir = 2;
else if (face == 5 && level->isSolidBlockingTile(x - 1, y, z))
dir = 1;
else
dir = findFace(level, x, y, z);
return dir + oldFlip;
}
int ButtonTile::findFace(Level *level, int x, int y, int z)
{
if (level->isSolidBlockingTile(x - 1, y, z))
{
int ButtonTile::findFace(Level* level, int x, int y, int z) {
if (level->isSolidBlockingTile(x - 1, y, z)) {
return 1;
}
else if (level->isSolidBlockingTile(x + 1, y, z))
{
} else if (level->isSolidBlockingTile(x + 1, y, z)) {
return 2;
}
else if (level->isSolidBlockingTile(x, y, z - 1))
{
} else if (level->isSolidBlockingTile(x, y, z - 1)) {
return 3;
}
else if (level->isSolidBlockingTile(x, y, z + 1))
{
} else if (level->isSolidBlockingTile(x, y, z + 1)) {
return 4;
}
return 1;
}
void ButtonTile::neighborChanged(Level *level, int x, int y, int z, int type)
{
if (checkCanSurvive(level, x, y, z))
{
void ButtonTile::neighborChanged(Level* level, int x, int y, int z, int type) {
if (checkCanSurvive(level, x, y, z)) {
int dir = level->getData(x, y, z) & 7;
bool replace = false;
if (!level->isSolidBlockingTile(x - 1, y, z) && dir == 1) replace = true;
if (!level->isSolidBlockingTile(x + 1, y, z) && dir == 2) replace = true;
if (!level->isSolidBlockingTile(x, y, z - 1) && dir == 3) replace = true;
if (!level->isSolidBlockingTile(x, y, z + 1) && dir == 4) replace = true;
if (!level->isSolidBlockingTile(x - 1, y, z) && dir == 1)
replace = true;
if (!level->isSolidBlockingTile(x + 1, y, z) && dir == 2)
replace = true;
if (!level->isSolidBlockingTile(x, y, z - 1) && dir == 3)
replace = true;
if (!level->isSolidBlockingTile(x, y, z + 1) && dir == 4)
replace = true;
if (replace)
{
if (replace) {
this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
level->setTile(x, y, z, 0);
}
}
}
bool ButtonTile::checkCanSurvive(Level *level, int x, int y, int z)
{
if (!mayPlace(level, x, y, z))
{
bool ButtonTile::checkCanSurvive(Level* level, int x, int y, int z) {
if (!mayPlace(level, x, y, z)) {
this->spawnResources(level, x, y, z, level->getData(x, y, z), 0);
level->setTile(x, y, z, 0);
return false;
@@ -141,14 +115,16 @@ bool ButtonTile::checkCanSurvive(Level *level, int x, int y, int z)
return true;
}
void ButtonTile::updateShape(LevelSource *level, int x, int y, int z, int forceData, std::shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
void ButtonTile::updateShape(
LevelSource* level, int x, int y, int z, int forceData,
std::shared_ptr<TileEntity>
forceEntity) // 4J added forceData, forceEntity param
{
int data = level->getData(x, y, z);
updateShape(data);
int data = level->getData(x, y, z);
updateShape(data);
}
void ButtonTile::updateShape(int data)
{
void ButtonTile::updateShape(int data) {
int dir = data & 7;
bool pressed = (data & 8) > 0;
@@ -158,43 +134,36 @@ void ButtonTile::updateShape(int data)
float d = 2 / 16.0f;
if (pressed) d = 1 / 16.0f;
if (dir == 1)
{
if (dir == 1) {
setShape(0, h0, 0.5f - r, d, h1, 0.5f + r);
}
else if (dir == 2)
{
} else if (dir == 2) {
setShape(1 - d, h0, 0.5f - r, 1, h1, 0.5f + r);
}
else if (dir == 3)
{
} else if (dir == 3) {
setShape(0.5f - r, h0, 0, 0.5f + r, h1, d);
}
else if (dir == 4)
{
} else if (dir == 4) {
setShape(0.5f - r, h0, 1 - d, 0.5f + r, h1, 1);
}
}
void ButtonTile::attack(Level *level, int x, int y, int z, std::shared_ptr<Player> player)
{
//use(level, x, y, z, player, 0, 0, 0, 0);
void ButtonTile::attack(Level* level, int x, int y, int z,
std::shared_ptr<Player> player) {
// use(level, x, y, z, player, 0, 0, 0, 0);
}
// 4J-PB - Adding a TestUse for tooltip display
bool ButtonTile::TestUse()
{
return true;
}
bool ButtonTile::TestUse() { return true; }
bool ButtonTile::use(Level *level, int x, int y, int z, std::shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param
bool ButtonTile::use(Level* level, int x, int y, int z,
std::shared_ptr<Player> player, int clickedFace,
float clickX, float clickY, float clickZ,
bool soundOnly /*=false*/) // 4J added soundOnly param
{
if( soundOnly)
{
// 4J - added - just do enough to play the sound
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, 0.3f, 0.6f);
return false;
}
if (soundOnly) {
// 4J - added - just do enough to play the sound
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK,
0.3f, 0.6f);
return false;
}
int data = level->getData(x, y, z);
int dir = data & 7;
int open = 8 - (data & 8);
@@ -203,7 +172,8 @@ bool ButtonTile::use(Level *level, int x, int y, int z, std::shared_ptr<Player>
level->setData(x, y, z, dir + open);
level->setTilesDirty(x, y, z, x, y, z);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, 0.3f, 0.6f);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, 0.3f,
0.6f);
updateNeighbours(level, x, y, z, dir);
@@ -212,23 +182,19 @@ bool ButtonTile::use(Level *level, int x, int y, int z, std::shared_ptr<Player>
return true;
}
void ButtonTile::onRemove(Level *level, int x, int y, int z, int id, int data)
{
if ((data & 8) > 0)
{
void ButtonTile::onRemove(Level* level, int x, int y, int z, int id, int data) {
if ((data & 8) > 0) {
int dir = data & 7;
updateNeighbours(level, x, y, z, dir);
}
Tile::onRemove(level, x, y, z, id, data);
}
bool ButtonTile::getSignal(LevelSource *level, int x, int y, int z, int dir)
{
return (level->getData(x, y, z) & 8) > 0;
bool ButtonTile::getSignal(LevelSource* level, int x, int y, int z, int dir) {
return (level->getData(x, y, z) & 8) > 0;
}
bool ButtonTile::getDirectSignal(Level *level, int x, int y, int z, int dir)
{
bool ButtonTile::getDirectSignal(Level* level, int x, int y, int z, int dir) {
int data = level->getData(x, y, z);
if ((data & 8) == 0) return false;
int myDir = data & 7;
@@ -242,125 +208,105 @@ bool ButtonTile::getDirectSignal(Level *level, int x, int y, int z, int dir)
return false;
}
bool ButtonTile::isSignalSource()
{
return true;
bool ButtonTile::isSignalSource() { return true; }
void ButtonTile::tick(Level* level, int x, int y, int z, Random* random) {
if (level->isClientSide) return;
int data = level->getData(x, y, z);
if ((data & 8) == 0) {
return;
}
if (sensitive) {
checkPressed(level, x, y, z);
} else {
level->setData(x, y, z, data & 7);
int dir = data & 7;
updateNeighbours(level, x, y, z, dir);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK,
0.3f, 0.5f);
level->setTilesDirty(x, y, z, x, y, z);
}
}
void ButtonTile::tick(Level *level, int x, int y, int z, Random *random)
{
if (level->isClientSide) return;
int data = level->getData(x, y, z);
if ((data & 8) == 0)
{
return;
}
if(sensitive)
{
checkPressed(level, x, y, z);
}
else
{
level->setData(x, y, z, data & 7);
int dir = data & 7;
updateNeighbours(level, x, y, z, dir);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, 0.3f, 0.5f);
level->setTilesDirty(x, y, z, x, y, z);
}
}
void ButtonTile::updateDefaultShape()
{
void ButtonTile::updateDefaultShape() {
float x = 3 / 16.0f;
float y = 2 / 16.0f;
float z = 2 / 16.0f;
setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
}
void ButtonTile::entityInside(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity)
{
if (level->isClientSide) return;
if (!sensitive) return;
void ButtonTile::entityInside(Level* level, int x, int y, int z,
std::shared_ptr<Entity> entity) {
if (level->isClientSide) return;
if (!sensitive) return;
if ((level->getData(x, y, z) & 8) != 0)
{
return;
}
if ((level->getData(x, y, z) & 8) != 0) {
return;
}
checkPressed(level, x, y, z);
checkPressed(level, x, y, z);
}
void ButtonTile::checkPressed(Level *level, int x, int y, int z)
{
int data = level->getData(x, y, z);
int dir = data & 7;
bool wasPressed = (data & 8) != 0;
bool shouldBePressed;
void ButtonTile::checkPressed(Level* level, int x, int y, int z) {
int data = level->getData(x, y, z);
int dir = data & 7;
bool wasPressed = (data & 8) != 0;
bool shouldBePressed;
updateShape(data);
Tile::ThreadStorage *tls = (Tile::ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
std::vector<std::shared_ptr<Entity> > *entities = level->getEntitiesOfClass(typeid(Arrow), AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
shouldBePressed = !entities->empty();
delete entities;
updateShape(data);
Tile::ThreadStorage* tls =
(Tile::ThreadStorage*)TlsGetValue(Tile::tlsIdxShape);
std::vector<std::shared_ptr<Entity> >* entities = level->getEntitiesOfClass(
typeid(Arrow), AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0,
x + tls->xx1, y + tls->yy1, z + tls->zz1));
shouldBePressed = !entities->empty();
delete entities;
if (shouldBePressed && !wasPressed)
{
level->setData(x, y, z, dir | 8);
updateNeighbours(level, x, y, z, dir);
level->setTilesDirty(x, y, z, x, y, z);
if (shouldBePressed && !wasPressed) {
level->setData(x, y, z, dir | 8);
updateNeighbours(level, x, y, z, dir);
level->setTilesDirty(x, y, z, x, y, z);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, 0.3f, 0.6f);
}
if (!shouldBePressed && wasPressed)
{
level->setData(x, y, z, dir);
updateNeighbours(level, x, y, z, dir);
level->setTilesDirty(x, y, z, x, y, z);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK,
0.3f, 0.6f);
}
if (!shouldBePressed && wasPressed) {
level->setData(x, y, z, dir);
updateNeighbours(level, x, y, z, dir);
level->setTilesDirty(x, y, z, x, y, z);
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK, 0.3f, 0.5f);
}
level->playSound(x + 0.5, y + 0.5, z + 0.5, eSoundType_RANDOM_CLICK,
0.3f, 0.5f);
}
if (shouldBePressed)
{
level->addToTickNextTick(x, y, z, id, getTickDelay());
}
if (shouldBePressed) {
level->addToTickNextTick(x, y, z, id, getTickDelay());
}
}
void ButtonTile::updateNeighbours(Level *level, int x, int y, int z, int dir)
{
level->updateNeighborsAt(x, y, z, id);
void ButtonTile::updateNeighbours(Level* level, int x, int y, int z, int dir) {
level->updateNeighborsAt(x, y, z, id);
if (dir == 1)
{
level->updateNeighborsAt(x - 1, y, z, id);
}
else if (dir == 2)
{
level->updateNeighborsAt(x + 1, y, z, id);
}
else if (dir == 3)
{
level->updateNeighborsAt(x, y, z - 1, id);
}
else if (dir == 4)
{
level->updateNeighborsAt(x, y, z + 1, id);
}
else
{
level->updateNeighborsAt(x, y - 1, z, id);
}
if (dir == 1) {
level->updateNeighborsAt(x - 1, y, z, id);
} else if (dir == 2) {
level->updateNeighborsAt(x + 1, y, z, id);
} else if (dir == 3) {
level->updateNeighborsAt(x, y, z - 1, id);
} else if (dir == 4) {
level->updateNeighborsAt(x, y, z + 1, id);
} else {
level->updateNeighborsAt(x, y - 1, z, id);
}
}
bool ButtonTile::shouldTileTick(Level *level, int x,int y,int z)
{
int currentData = level->getData(x, y, z);
bool ButtonTile::shouldTileTick(Level* level, int x, int y, int z) {
int currentData = level->getData(x, y, z);
return (currentData & 8) != 0;
}
void ButtonTile::registerIcons(IconRegister *iconRegister)
{
// None
void ButtonTile::registerIcons(IconRegister* iconRegister) {
// None
}