mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-14 01:58:13 +00:00
chore: format Minecraft.World
This commit is contained in:
Tropical
@@ -18,239 +18,214 @@
|
||||
#include "../Network/Packets/ChatPacket.h"
|
||||
#include "../Util/SoundTypes.h"
|
||||
|
||||
BucketItem::BucketItem(int id, int content) : Item( id )
|
||||
{
|
||||
maxStackSize = 1;
|
||||
this->content = content;
|
||||
BucketItem::BucketItem(int id, int content) : Item(id) {
|
||||
maxStackSize = 1;
|
||||
this->content = content;
|
||||
}
|
||||
|
||||
bool BucketItem::TestUse(Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
// double x = player->xo + (player->x - player->xo);
|
||||
// double y = player->yo + (player->y - player->yo) + 1.62 - player->heightOffset;
|
||||
// double z = player->zo + (player->z - player->zo);
|
||||
bool BucketItem::TestUse(Level* level, std::shared_ptr<Player> player) {
|
||||
// double x = player->xo + (player->x - player->xo);
|
||||
// double y = player->yo + (player->y - player->yo) + 1.62 -
|
||||
// player->heightOffset; double z = player->zo + (player->z - player->zo);
|
||||
|
||||
bool pickLiquid = content == 0;
|
||||
HitResult *hr = getPlayerPOVHitResult(level, player, pickLiquid);
|
||||
if (hr == NULL) return false;
|
||||
bool pickLiquid = content == 0;
|
||||
HitResult* hr = getPlayerPOVHitResult(level, player, pickLiquid);
|
||||
if (hr == NULL) return false;
|
||||
|
||||
if (hr->type == HitResult::TILE)
|
||||
{
|
||||
int xt = hr->x;
|
||||
int yt = hr->y;
|
||||
int zt = hr->z;
|
||||
if (hr->type == HitResult::TILE) {
|
||||
int xt = hr->x;
|
||||
int yt = hr->y;
|
||||
int zt = hr->z;
|
||||
|
||||
if (!level->mayInteract(player, xt, yt, zt, content))
|
||||
{
|
||||
delete hr;
|
||||
return false;
|
||||
}
|
||||
if (!level->mayInteract(player, xt, yt, zt, content)) {
|
||||
delete hr;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (content == 0)
|
||||
{
|
||||
if (!player->mayBuild(xt, yt, zt)) return false;
|
||||
if (level->getMaterial(xt, yt, zt) == Material::water && level->getData(xt, yt, zt) == 0)
|
||||
{
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
if (level->getMaterial(xt, yt, zt) == Material::lava && level->getData(xt, yt, zt) == 0)
|
||||
{
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else if (content < 0)
|
||||
{
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (hr->f == 0) yt--;
|
||||
if (hr->f == 1) yt++;
|
||||
if (hr->f == 2) zt--;
|
||||
if (hr->f == 3) zt++;
|
||||
if (hr->f == 4) xt--;
|
||||
if (hr->f == 5) xt++;
|
||||
|
||||
if (!player->mayBuild(xt, yt, zt)) return false;
|
||||
if (content == 0) {
|
||||
if (!player->mayBuild(xt, yt, zt)) return false;
|
||||
if (level->getMaterial(xt, yt, zt) == Material::water &&
|
||||
level->getData(xt, yt, zt) == 0) {
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
if (level->getMaterial(xt, yt, zt) == Material::lava &&
|
||||
level->getData(xt, yt, zt) == 0) {
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
} else if (content < 0) {
|
||||
delete hr;
|
||||
return true;
|
||||
} else {
|
||||
if (hr->f == 0) yt--;
|
||||
if (hr->f == 1) yt++;
|
||||
if (hr->f == 2) zt--;
|
||||
if (hr->f == 3) zt++;
|
||||
if (hr->f == 4) xt--;
|
||||
if (hr->f == 5) xt++;
|
||||
|
||||
if (level->isEmptyTile(xt, yt, zt) || !level->getMaterial(xt, yt, zt)->isSolid())
|
||||
{
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (content == 0)
|
||||
{
|
||||
if (hr->entity->GetType() == eTYPE_COW)
|
||||
{
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
delete hr;
|
||||
if (!player->mayBuild(xt, yt, zt)) return false;
|
||||
|
||||
return false;
|
||||
if (level->isEmptyTile(xt, yt, zt) ||
|
||||
!level->getMaterial(xt, yt, zt)->isSolid()) {
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (content == 0) {
|
||||
if (hr->entity->GetType() == eTYPE_COW) {
|
||||
delete hr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
delete hr;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> BucketItem::use(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
float a = 1;
|
||||
std::shared_ptr<ItemInstance> BucketItem::use(
|
||||
std::shared_ptr<ItemInstance> itemInstance, Level* level,
|
||||
std::shared_ptr<Player> player) {
|
||||
float a = 1;
|
||||
|
||||
double x = player->xo + (player->x - player->xo) * a;
|
||||
double y = player->yo + (player->y - player->yo) * a + 1.62 - player->heightOffset;
|
||||
double z = player->zo + (player->z - player->zo) * a;
|
||||
double x = player->xo + (player->x - player->xo) * a;
|
||||
double y =
|
||||
player->yo + (player->y - player->yo) * a + 1.62 - player->heightOffset;
|
||||
double z = player->zo + (player->z - player->zo) * a;
|
||||
|
||||
bool pickLiquid = content == 0;
|
||||
HitResult *hr = getPlayerPOVHitResult(level, player, pickLiquid);
|
||||
if (hr == NULL) return itemInstance;
|
||||
bool pickLiquid = content == 0;
|
||||
HitResult* hr = getPlayerPOVHitResult(level, player, pickLiquid);
|
||||
if (hr == NULL) return itemInstance;
|
||||
|
||||
if (hr->type == HitResult::TILE)
|
||||
{
|
||||
int xt = hr->x;
|
||||
int yt = hr->y;
|
||||
int zt = hr->z;
|
||||
if (hr->type == HitResult::TILE) {
|
||||
int xt = hr->x;
|
||||
int yt = hr->y;
|
||||
int zt = hr->z;
|
||||
|
||||
if (!level->mayInteract(player, xt, yt, zt,content))
|
||||
{
|
||||
app.DebugPrintf("!!!!!!!!!!! Can't place that here\n");
|
||||
std::shared_ptr<ServerPlayer> servPlayer = std::dynamic_pointer_cast<ServerPlayer>(player);
|
||||
if( servPlayer != NULL )
|
||||
{
|
||||
app.DebugPrintf("Sending ChatPacket::e_ChatCannotPlaceLava to player\n");
|
||||
servPlayer->connection->send( std::shared_ptr<ChatPacket>( new ChatPacket(L"", ChatPacket::e_ChatCannotPlaceLava ) ) );
|
||||
}
|
||||
|
||||
delete hr;
|
||||
return itemInstance;
|
||||
}
|
||||
if (!level->mayInteract(player, xt, yt, zt, content)) {
|
||||
app.DebugPrintf("!!!!!!!!!!! Can't place that here\n");
|
||||
std::shared_ptr<ServerPlayer> servPlayer =
|
||||
std::dynamic_pointer_cast<ServerPlayer>(player);
|
||||
if (servPlayer != NULL) {
|
||||
app.DebugPrintf(
|
||||
"Sending ChatPacket::e_ChatCannotPlaceLava to player\n");
|
||||
servPlayer->connection->send(std::shared_ptr<ChatPacket>(
|
||||
new ChatPacket(L"", ChatPacket::e_ChatCannotPlaceLava)));
|
||||
}
|
||||
|
||||
if (content == 0)
|
||||
{
|
||||
if (!player->mayBuild(xt, yt, zt)) return itemInstance;
|
||||
if (level->getMaterial(xt, yt, zt) == Material::water && level->getData(xt, yt, zt) == 0)
|
||||
{
|
||||
level->setTile(xt, yt, zt, 0);
|
||||
delete hr;
|
||||
if (player->abilities.instabuild)
|
||||
{
|
||||
return itemInstance;
|
||||
}
|
||||
delete hr;
|
||||
return itemInstance;
|
||||
}
|
||||
|
||||
if (--itemInstance->count <= 0)
|
||||
{
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_water) );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!player->inventory->add(std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_water))))
|
||||
{
|
||||
player->drop(std::shared_ptr<ItemInstance>(new ItemInstance(Item::bucket_water_Id, 1, 0)));
|
||||
}
|
||||
return itemInstance;
|
||||
}
|
||||
}
|
||||
if (level->getMaterial(xt, yt, zt) == Material::lava && level->getData(xt, yt, zt) == 0)
|
||||
{
|
||||
if( level->dimension->id == -1 )
|
||||
player->awardStat(
|
||||
GenericStats::netherLavaCollected(),
|
||||
GenericStats::param_noArgs()
|
||||
);
|
||||
if (content == 0) {
|
||||
if (!player->mayBuild(xt, yt, zt)) return itemInstance;
|
||||
if (level->getMaterial(xt, yt, zt) == Material::water &&
|
||||
level->getData(xt, yt, zt) == 0) {
|
||||
level->setTile(xt, yt, zt, 0);
|
||||
delete hr;
|
||||
if (player->abilities.instabuild) {
|
||||
return itemInstance;
|
||||
}
|
||||
|
||||
level->setTile(xt, yt, zt, 0);
|
||||
delete hr;
|
||||
if (player->abilities.instabuild)
|
||||
{
|
||||
return itemInstance;
|
||||
}
|
||||
if (--itemInstance->count <= 0)
|
||||
{
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_lava) );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!player->inventory->add(std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_lava))))
|
||||
{
|
||||
player->drop(std::shared_ptr<ItemInstance>(new ItemInstance(Item::bucket_lava_Id, 1, 0)));
|
||||
}
|
||||
return itemInstance;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (content < 0)
|
||||
{
|
||||
delete hr;
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_empty) );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (hr->f == 0) yt--;
|
||||
if (hr->f == 1) yt++;
|
||||
if (hr->f == 2) zt--;
|
||||
if (hr->f == 3) zt++;
|
||||
if (hr->f == 4) xt--;
|
||||
if (hr->f == 5) xt++;
|
||||
|
||||
if (!player->mayBuild(xt, yt, zt)) return itemInstance;
|
||||
if (--itemInstance->count <= 0) {
|
||||
return std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_water));
|
||||
} else {
|
||||
if (!player->inventory->add(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_water)))) {
|
||||
player->drop(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_water_Id, 1, 0)));
|
||||
}
|
||||
return itemInstance;
|
||||
}
|
||||
}
|
||||
if (level->getMaterial(xt, yt, zt) == Material::lava &&
|
||||
level->getData(xt, yt, zt) == 0) {
|
||||
if (level->dimension->id == -1)
|
||||
player->awardStat(GenericStats::netherLavaCollected(),
|
||||
GenericStats::param_noArgs());
|
||||
|
||||
level->setTile(xt, yt, zt, 0);
|
||||
delete hr;
|
||||
if (player->abilities.instabuild) {
|
||||
return itemInstance;
|
||||
}
|
||||
if (--itemInstance->count <= 0) {
|
||||
return std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_lava));
|
||||
} else {
|
||||
if (!player->inventory->add(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_lava)))) {
|
||||
player->drop(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_lava_Id, 1, 0)));
|
||||
}
|
||||
return itemInstance;
|
||||
}
|
||||
}
|
||||
} else if (content < 0) {
|
||||
delete hr;
|
||||
return std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_empty));
|
||||
} else {
|
||||
if (hr->f == 0) yt--;
|
||||
if (hr->f == 1) yt++;
|
||||
if (hr->f == 2) zt--;
|
||||
if (hr->f == 3) zt++;
|
||||
if (hr->f == 4) xt--;
|
||||
if (hr->f == 5) xt++;
|
||||
|
||||
if (emptyBucket(level, x, y, z, xt, yt, zt) && !player->abilities.instabuild)
|
||||
{
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_empty) );
|
||||
}
|
||||
if (!player->mayBuild(xt, yt, zt)) return itemInstance;
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (content == 0)
|
||||
{
|
||||
if (hr->entity->GetType() == eTYPE_COW)
|
||||
{
|
||||
delete hr;
|
||||
if (--itemInstance->count <= 0)
|
||||
{
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::milk) );
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!player->inventory->add(std::shared_ptr<ItemInstance>( new ItemInstance(Item::milk))))
|
||||
{
|
||||
player->drop(std::shared_ptr<ItemInstance>(new ItemInstance(Item::milk_Id, 1, 0)));
|
||||
}
|
||||
return itemInstance;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
delete hr;
|
||||
return itemInstance;
|
||||
if (emptyBucket(level, x, y, z, xt, yt, zt) &&
|
||||
!player->abilities.instabuild) {
|
||||
return std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::bucket_empty));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (content == 0) {
|
||||
if (hr->entity->GetType() == eTYPE_COW) {
|
||||
delete hr;
|
||||
if (--itemInstance->count <= 0) {
|
||||
return std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::milk));
|
||||
} else {
|
||||
if (!player->inventory->add(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::milk)))) {
|
||||
player->drop(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::milk_Id, 1, 0)));
|
||||
}
|
||||
return itemInstance;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
delete hr;
|
||||
return itemInstance;
|
||||
}
|
||||
|
||||
bool BucketItem::emptyBucket(Level *level, double x, double y, double z, int xt, int yt, int zt)
|
||||
{
|
||||
bool BucketItem::emptyBucket(Level* level, double x, double y, double z, int xt,
|
||||
int yt, int zt) {
|
||||
if (content <= 0) return false;
|
||||
|
||||
if (level->isEmptyTile(xt, yt, zt) || !level->getMaterial(xt, yt, zt)->isSolid())
|
||||
{
|
||||
if (level->dimension->ultraWarm && content == Tile::water_Id)
|
||||
{
|
||||
level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, eSoundType_RANDOM_FIZZ, 0.5f, 2.6f + (level->random->nextFloat() - level->random->nextFloat()) * 0.8f);
|
||||
if (level->isEmptyTile(xt, yt, zt) ||
|
||||
!level->getMaterial(xt, yt, zt)->isSolid()) {
|
||||
if (level->dimension->ultraWarm && content == Tile::water_Id) {
|
||||
level->playSound(
|
||||
x + 0.5f, y + 0.5f, z + 0.5f, eSoundType_RANDOM_FIZZ, 0.5f,
|
||||
2.6f +
|
||||
(level->random->nextFloat() - level->random->nextFloat()) *
|
||||
0.8f);
|
||||
|
||||
for (int i = 0; i < 8; i++)
|
||||
{
|
||||
level->addParticle(eParticleType_largesmoke, xt + Math::random(), yt + Math::random(), zt + Math::random(), 0, 0, 0);
|
||||
for (int i = 0; i < 8; i++) {
|
||||
level->addParticle(eParticleType_largesmoke,
|
||||
xt + Math::random(), yt + Math::random(),
|
||||
zt + Math::random(), 0, 0, 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
level->setTileAndData(xt, yt, zt, content, 0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user