LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-13 09:18:08 +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

314
Minecraft.World/Blocks/TileEntities/PistonPieceTileEntity.cpp
View File

@@ -6,210 +6,166 @@
#include "../../Util/Facing.h"
#include "../Tile.h"
PistonPieceEntity::PistonPieceEntity() {
// for the tile entity loader
PistonPieceEntity::PistonPieceEntity()
{
// for the tile entity loader
// 4J - added initialisers
this->id = 0;
this->data = 0;
this->facing = 0;
this->extending = 0;
this->_isSourcePiston = 0;
progress = 0.0f;
progressO = 0.0f;
// 4J - added initialisers
this->id = 0;
this->data = 0;
this->facing = 0;
this->extending = 0;
this->_isSourcePiston = 0;
progress = 0.0f;
progressO = 0.0f;
}
PistonPieceEntity::PistonPieceEntity(int id, int data, int facing, bool extending, bool isSourcePiston) : TileEntity()
{
// 4J - added initialisers
progress = 0.0f;
progressO = 0.0f;
PistonPieceEntity::PistonPieceEntity(int id, int data, int facing,
bool extending, bool isSourcePiston)
: TileEntity() {
// 4J - added initialisers
progress = 0.0f;
progressO = 0.0f;
this->id = id;
this->data = data;
this->facing = facing;
this->extending = extending;
this->_isSourcePiston = isSourcePiston;
this->id = id;
this->data = data;
this->facing = facing;
this->extending = extending;
this->_isSourcePiston = isSourcePiston;
}
int PistonPieceEntity::getId()
{
return id;
int PistonPieceEntity::getId() { return id; }
int PistonPieceEntity::getData() { return data; }
bool PistonPieceEntity::isExtending() { return extending; }
int PistonPieceEntity::getFacing() { return facing; }
bool PistonPieceEntity::isSourcePiston() { return _isSourcePiston; }
float PistonPieceEntity::getProgress(float a) {
if (a > 1) {
a = 1;
}
return progressO + (progress - progressO) * a;
}
int PistonPieceEntity::getData()
{
return data;
float PistonPieceEntity::getXOff(float a) {
if (extending) {
return (getProgress(a) - 1.0f) * Facing::STEP_X[facing];
} else {
return (1.0f - getProgress(a)) * Facing::STEP_X[facing];
}
}
bool PistonPieceEntity::isExtending()
{
return extending;
float PistonPieceEntity::getYOff(float a) {
if (extending) {
return (getProgress(a) - 1.0f) * Facing::STEP_Y[facing];
} else {
return (1.0f - getProgress(a)) * Facing::STEP_Y[facing];
}
}
int PistonPieceEntity::getFacing()
{
return facing;
float PistonPieceEntity::getZOff(float a) {
if (extending) {
return (getProgress(a) - 1.0f) * Facing::STEP_Z[facing];
} else {
return (1.0f - getProgress(a)) * Facing::STEP_Z[facing];
}
}
bool PistonPieceEntity::isSourcePiston()
{
return _isSourcePiston;
void PistonPieceEntity::moveCollidedEntities(float progress, float amount) {
if (extending) {
progress = 1.0f - progress;
} else {
progress = progress - 1.0f;
}
AABB* aabb =
Tile::pistonMovingPiece->getAABB(level, x, y, z, id, progress, facing);
if (aabb != NULL) {
std::vector<std::shared_ptr<Entity> >* entities =
level->getEntities(nullptr, aabb);
if (!entities->empty()) {
std::vector<std::shared_ptr<Entity> > collisionHolder;
for (AUTO_VAR(it, entities->begin()); it != entities->end(); it++) {
collisionHolder.push_back(*it);
}
for (AUTO_VAR(it, collisionHolder.begin());
it != collisionHolder.end(); it++) {
(*it)->move(amount * Facing::STEP_X[facing],
amount * Facing::STEP_Y[facing],
amount * Facing::STEP_Z[facing]);
}
}
}
}
float PistonPieceEntity::getProgress(float a)
{
if (a > 1)
{
a = 1;
}
return progressO + (progress - progressO) * a;
void PistonPieceEntity::finalTick() {
if (progressO < 1 && level != NULL) {
progressO = progress = 1;
level->removeTileEntity(x, y, z);
setRemoved();
if (level->getTile(x, y, z) == Tile::pistonMovingPiece_Id)
level->setTileAndData(x, y, z, id, data);
}
}
float PistonPieceEntity::getXOff(float a)
{
if (extending)
{
return (getProgress(a) - 1.0f) * Facing::STEP_X[facing];
}
else
{
return (1.0f - getProgress(a)) * Facing::STEP_X[facing];
}
void PistonPieceEntity::tick() {
progressO = progress;
if (progressO >= 1) {
moveCollidedEntities(1, 4 / 16.f);
level->removeTileEntity(x, y, z);
setRemoved();
if (level->getTile(x, y, z) == Tile::pistonMovingPiece_Id)
level->setTileAndData(x, y, z, id, data);
return;
}
progress += .5f;
if (progress >= 1) {
progress = 1;
}
if (extending) {
moveCollidedEntities(progress, (progress - progressO) + 1.0f / 16.0f);
}
}
float PistonPieceEntity::getYOff(float a)
{
if (extending)
{
return (getProgress(a) - 1.0f) * Facing::STEP_Y[facing];
}
else
{
return (1.0f - getProgress(a)) * Facing::STEP_Y[facing];
}
void PistonPieceEntity::load(CompoundTag* tag) {
TileEntity::load(tag);
id = tag->getInt(L"blockId");
data = tag->getInt(L"blockData");
facing = tag->getInt(L"facing");
progressO = progress = tag->getFloat(L"progress");
extending = tag->getBoolean(L"extending");
}
float PistonPieceEntity::getZOff(float a)
{
if (extending)
{
return (getProgress(a) - 1.0f) * Facing::STEP_Z[facing];
}
else
{
return (1.0f - getProgress(a)) * Facing::STEP_Z[facing];
}
}
void PistonPieceEntity::save(CompoundTag* tag) {
TileEntity::save(tag);
void PistonPieceEntity::moveCollidedEntities(float progress, float amount)
{
if (extending)
{
progress = 1.0f - progress;
}
else
{
progress = progress - 1.0f;
}
AABB *aabb = Tile::pistonMovingPiece->getAABB(level, x, y, z, id, progress, facing);
if (aabb != NULL)
{
std::vector<std::shared_ptr<Entity> > *entities = level->getEntities(nullptr, aabb);
if (!entities->empty())
{
std::vector< std::shared_ptr<Entity> > collisionHolder;
for( AUTO_VAR(it, entities->begin()); it != entities->end(); it++ )
{
collisionHolder.push_back(*it);
}
for( AUTO_VAR(it, collisionHolder.begin()); it != collisionHolder.end(); it++ )
{
(*it)->move(amount * Facing::STEP_X[facing],
amount * Facing::STEP_Y[facing],
amount * Facing::STEP_Z[facing]);
}
}
}
}
void PistonPieceEntity::finalTick()
{
if (progressO < 1 && level != NULL)
{
progressO = progress = 1;
level->removeTileEntity(x, y, z);
setRemoved();
if (level->getTile(x, y, z) == Tile::pistonMovingPiece_Id)
level->setTileAndData(x, y, z, id, data);
}
}
void PistonPieceEntity::tick()
{
progressO = progress;
if (progressO >= 1)
{
moveCollidedEntities(1, 4 / 16.f);
level->removeTileEntity(x, y, z);
setRemoved();
if (level->getTile(x, y, z) == Tile::pistonMovingPiece_Id)
level->setTileAndData(x, y, z, id, data);
return;
}
progress += .5f;
if (progress >= 1)
{
progress = 1;
}
if (extending)
{
moveCollidedEntities(progress, (progress - progressO) + 1.0f / 16.0f);
}
}
void PistonPieceEntity::load(CompoundTag *tag)
{
TileEntity::load(tag);
id = tag->getInt(L"blockId");
data = tag->getInt(L"blockData");
facing = tag->getInt(L"facing");
progressO = progress = tag->getFloat(L"progress");
extending = tag->getBoolean(L"extending");
}
void PistonPieceEntity::save(CompoundTag *tag)
{
TileEntity::save(tag);
tag->putInt(L"blockId", id);
tag->putInt(L"blockData", data);
tag->putInt(L"facing", facing);
tag->putFloat(L"progress", progressO);
tag->putBoolean(L"extending", extending);
tag->putInt(L"blockId", id);
tag->putInt(L"blockData", data);
tag->putInt(L"facing", facing);
tag->putFloat(L"progress", progressO);
tag->putBoolean(L"extending", extending);
}
// 4J Added
std::shared_ptr<TileEntity> PistonPieceEntity::clone()
{
std::shared_ptr<PistonPieceEntity> result = std::shared_ptr<PistonPieceEntity>( new PistonPieceEntity() );
TileEntity::clone(result);
std::shared_ptr<TileEntity> PistonPieceEntity::clone() {
std::shared_ptr<PistonPieceEntity> result =
std::shared_ptr<PistonPieceEntity>(new PistonPieceEntity());
TileEntity::clone(result);
result->id = id;
result->data = data;
result->facing = facing;
result->extending = extending;
result->_isSourcePiston = _isSourcePiston;
result->progress = progress;
result->progressO = progressO;
return result;
result->id = id;
result->data = data;
result->facing = facing;
result->extending = extending;
result->_isSourcePiston = _isSourcePiston;
result->progress = progress;
result->progressO = progressO;
return result;
}