backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

flower pots now tileentity

Browse source
This commit is contained in:
KKNecmi 2026-05-27 16:10:56 +03:00
parent 311503ec46
commit 19e45003ba
15 changed files with 341 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Minecraft.Client/ClientConnection.cpp
View file

@ -3459,7 +3459,18 @@ void ClientConnection::handleTileEntityData(shared_ptr<TileEntityDataPacket> pac
{ {
dynamic_pointer_cast<SkullTileEntity>(te)->load(packet->tag); dynamic_pointer_cast<SkullTileEntity>(te)->load(packet->tag);
} }
else if (packet->type == TileEntityDataPacket::TYPE_FLOWER_POT && dynamic_pointer_cast<FlowerPotTileEntity>(te) != nullptr)
{
dynamic_pointer_cast<FlowerPotTileEntity>(te)->load(packet->tag);
}
} }
else if (packet->type == TileEntityDataPacket::TYPE_FLOWER_POT)
{
auto newTe = std::make_shared<FlowerPotTileEntity>();
newTe->load(packet->tag);
newTe->setLevel(minecraft->level);
minecraft->level->setTileEntity(packet->x, packet->y, packet->z, newTe);
}
} }
} }

26
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FlowerPotTile_SPU.h
View file

@ -1,23 +1,12 @@
#pragma once #pragma once
#include "Tile_SPU.h" #include "Tile_SPU.h"
#include "FlowerPotTileEntity.h"
class FlowerPotTile_SPU : public Tile_SPU class FlowerPotTile_SPU : public EntityTile_SPU
{ {
public: public:
static const int TYPE_FLOWER_RED = 1; FlowerPotTile_SPU(int id) : EntityTile_SPU(id) {}
static const int TYPE_FLOWER_YELLOW = 2;
static const int TYPE_SAPLING_DEFAULT = 3;
static const int TYPE_SAPLING_EVERGREEN = 4;
static const int TYPE_SAPLING_BIRCH = 5;
static const int TYPE_SAPLING_JUNGLE = 6;
static const int TYPE_MUSHROOM_RED = 7;
static const int TYPE_MUSHROOM_BROWN = 8;
static const int TYPE_CACTUS = 9;
static const int TYPE_DEAD_BUSH = 10;
static const int TYPE_FERN = 11;
FlowerPotTile_SPU(int id) : Tile_SPU(id) {}
void updateDefaultShape() void updateDefaultShape()
{ {
@ -25,8 +14,15 @@ public:
float half = size / 2; float half = size / 2;
setShape(0.5f - half, 0, 0.5f - half, 0.5f + half, size, 0.5f + half); setShape(0.5f - half, 0, 0.5f - half, 0.5f + half, size, 0.5f + half);
} }
bool isSolidRender(bool isServerLevel = false) { return false; } bool isSolidRender(bool isServerLevel = false) { return false; }
int getRenderShape() { return SHAPE_FLOWER_POT; } int getRenderShape() { return SHAPE_FLOWER_POT; }
bool isCubeShaped() { return false; } bool isCubeShaped() { return false; }
virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = nullptr) override
{
updateDefaultShape();
if (forceEntity && forceEntity->GetType() == eTYPE_FLOWERPOTTILEENTITY)
{
// later
}
}
}; };

236
Minecraft.Client/TileRenderer.cpp
View file

@ -12,6 +12,7 @@
#include "Tesselator.h" #include "Tesselator.h"
#include "EntityTileRenderer.h" #include "EntityTileRenderer.h"
#include "Options.h" #include "Options.h"
#include "../Minecraft.World/FlowerPotTileEntity.h"
bool TileRenderer::fancy = true; bool TileRenderer::fancy = true;
@ -862,136 +863,133 @@ bool TileRenderer::tesselateCauldronInWorld(CauldronTile *tt, int x, int y, int
bool TileRenderer::tesselateFlowerPotInWorld(FlowerPotTile *tt, int x, int y, int z) bool TileRenderer::tesselateFlowerPotInWorld(FlowerPotTile *tt, int x, int y, int z)
{ {
// bounding box first tesselateBlockInWorld(tt, x, y, z);
tesselateBlockInWorld(tt, x, y, z);
Tesselator *t = Tesselator::getInstance(); Tesselator *t = Tesselator::getInstance();
float br; float br;
if (SharedConstants::TEXTURE_LIGHTING) if (SharedConstants::TEXTURE_LIGHTING)
{ {
t->tex2(tt->getLightColor(level, x, y, z)); t->tex2(tt->getLightColor(level, x, y, z));
br = 1; br = 1;
} }
else else
{ {
br = tt->getBrightness(level, x, y, z); br = tt->getBrightness(level, x, y, z);
} }
int col = tt->getColor(level, x, y, z); int col = tt->getColor(level, x, y, z);
Icon *tex = getTexture(tt, 0); Icon *tex = getTexture(tt, 0);
float r = ((col >> 16) & 0xff) / 255.0f; float r = ((col >> 16) & 0xff) / 255.0f;
float g = ((col >> 8) & 0xff) / 255.0f; float g = ((col >> 8) & 0xff) / 255.0f;
float b = ((col) & 0xff) / 255.0f; float b = ((col) & 0xff) / 255.0f;
if (GameRenderer::anaglyph3d) if (GameRenderer::anaglyph3d)
{ {
float cr = (r * 30 + g * 59 + b * 11) / 100; float cr = (r * 30 + g * 59 + b * 11) / 100;
float cg = (r * 30 + g * 70) / (100); float cg = (r * 30 + g * 70) / (100);
float cb = (r * 30 + b * 70) / (100); float cb = (r * 30 + b * 70) / (100);
r = cr;
g = cg;
b = cb;
}
t->color(br * r, br * g, br * b);
r = cr; float halfWidth = (6.0f / 16.0f) / 2 - 0.001f;
g = cg; renderEast(tt, x - 0.5f + halfWidth, y, z, tex);
b = cb; renderWest(tt, x + 0.5f - halfWidth, y, z, tex);
} renderSouth(tt, x, y, z - 0.5f + halfWidth, tex);
t->color(br * r, br * g, br * b); renderNorth(tt, x, y, z + 0.5f - halfWidth, tex);
renderFaceUp(tt, x, y - 0.5f + halfWidth + 3.0f / 16.0f, z, getTexture(Tile::dirt));
// render inside bool hasPlant = false;
int plantItemId = 0;
int plantAux = 0;
float halfWidth = (6.0f / 16.0f) / 2 - 0.001f; shared_ptr<TileEntity> te = level->getTileEntity(x, y, z);
renderEast(tt, x - 0.5f + halfWidth, y, z, tex); if (te && te->GetType() == eTYPE_FLOWERPOTTILEENTITY)
renderWest(tt, x + 0.5f - halfWidth, y, z, tex); {
renderSouth(tt, x, y, z - 0.5f + halfWidth, tex); FlowerPotTileEntity *potTe = (FlowerPotTileEntity*)te.get();
renderNorth(tt, x, y, z + 0.5f - halfWidth, tex); if (potTe->hasFlower())
{
hasPlant = true;
plantItemId = potTe->getItemId();
plantAux = potTe->getAux();
}
}
renderFaceUp(tt, x, y - 0.5f + halfWidth + 3.0f / 16.0f, z, getTexture(Tile::dirt)); if (!hasPlant)
{
int data = level->getData(x, y, z);
if (data != 0)
{
hasPlant = true;
switch (data)
{
case 1: plantItemId = Tile::rose_Id; plantAux = 0; break;
case 2: plantItemId = Tile::flower_Id; plantAux = 0; break;
case 3: plantItemId = Tile::sapling_Id; plantAux = Sapling::TYPE_DEFAULT; break;
case 4: plantItemId = Tile::sapling_Id; plantAux = Sapling::TYPE_EVERGREEN; break;
case 5: plantItemId = Tile::sapling_Id; plantAux = Sapling::TYPE_BIRCH; break;
case 6: plantItemId = Tile::sapling_Id; plantAux = Sapling::TYPE_JUNGLE; break;
case 7: plantItemId = Tile::mushroom_red_Id; plantAux = 0; break;
case 8: plantItemId = Tile::mushroom_brown_Id; plantAux = 0; break;
case 9: plantItemId = Tile::cactus_Id; plantAux = 0; break;
case 10: plantItemId = Tile::deadBush_Id; plantAux = 0; break;
case 11: plantItemId = Tile::tallgrass_Id; plantAux = TallGrass::FERN; break;
}
}
}
int type = level->getData(x, y, z); if (hasPlant)
{
float xOff = 0;
float yOff = 4;
float zOff = 0;
t->addOffset(xOff / 16.0f, yOff / 16.0f, zOff / 16.0f);
if (type != 0) if (plantItemId == Tile::rose_Id || plantItemId == Tile::flower_Id)
{ {
float xOff = 0; tesselateCrossTexture(Tile::tiles[plantItemId], plantAux, x, y, z, 0.75f);
float yOff = 4; }
float zOff = 0; else if (plantItemId == Tile::sapling_Id)
Tile *plant = nullptr; {
tesselateCrossTexture(Tile::sapling, plantAux, x, y, z, 0.75f);
}
else if (plantItemId == Tile::mushroom_red_Id || plantItemId == Tile::mushroom_brown_Id)
{
tesselateCrossTexture(Tile::tiles[plantItemId], 0, x, y, z, 0.75f);
}
else if (plantItemId == Tile::tallgrass_Id && plantAux == TallGrass::FERN)
{
col = Tile::tallgrass->getColor(level, x, y, z);
r = ((col >> 16) & 0xff) / 255.0f;
g = ((col >> 8) & 0xff) / 255.0f;
b = ((col) & 0xff) / 255.0f;
t->color(br * r, br * g, br * b);
tesselateCrossTexture(Tile::tallgrass, TallGrass::FERN, x, y, z, 0.75f);
}
else if (plantItemId == Tile::deadBush_Id)
{
tesselateCrossTexture(Tile::deadBush, 0, x, y, z, 0.75f);
}
else if (plantItemId == Tile::cactus_Id)
{
noCulling = true;
float halfSize = 0.25f / 2;
setShape(0.5f - halfSize, 0.0f, 0.5f - halfSize, 0.5f + halfSize, 0.25f, 0.5f + halfSize);
tesselateBlockInWorld(Tile::cactus, x, y, z);
setShape(0.5f - halfSize, 0.25f, 0.5f - halfSize, 0.5f + halfSize, 0.5f, 0.5f + halfSize);
tesselateBlockInWorld(Tile::cactus, x, y, z);
setShape(0.5f - halfSize, 0.5f, 0.5f - halfSize, 0.5f + halfSize, 0.75f, 0.5f + halfSize);
tesselateBlockInWorld(Tile::cactus, x, y, z);
noCulling = false;
setShape(0, 0, 0, 1, 1, 1);
}
switch (type) t->addOffset(-xOff / 16.0f, -yOff / 16.0f, -zOff / 16.0f);
{ }
case FlowerPotTile::TYPE_FLOWER_RED:
plant = Tile::rose;
break;
case FlowerPotTile::TYPE_FLOWER_YELLOW:
plant = Tile::flower;
break;
case FlowerPotTile::TYPE_MUSHROOM_BROWN:
plant = Tile::mushroom_brown;
break;
case FlowerPotTile::TYPE_MUSHROOM_RED:
plant = Tile::mushroom_red;
break;
}
t->addOffset(xOff / 16.0f, yOff / 16.0f, zOff / 16.0f); return true;
if (plant != nullptr)
{
tesselateInWorld(plant, x, y, z);
}
else
{
if (type == FlowerPotTile::TYPE_CACTUS)
{
// Force drawing of all faces else the cactus misses faces
// when a block is adjacent
noCulling = true;
float halfSize = 0.25f / 2;
setShape(0.5f - halfSize, 0.0f, 0.5f - halfSize, 0.5f + halfSize, 0.25f, 0.5f + halfSize);
tesselateBlockInWorld(Tile::cactus, x, y, z);
setShape(0.5f - halfSize, 0.25f, 0.5f - halfSize, 0.5f + halfSize, 0.5f, 0.5f + halfSize);
tesselateBlockInWorld(Tile::cactus, x, y, z);
setShape(0.5f - halfSize, 0.5f, 0.5f - halfSize, 0.5f + halfSize, 0.75f, 0.5f + halfSize);
tesselateBlockInWorld(Tile::cactus, x, y, z);
noCulling = false;
setShape(0, 0, 0, 1, 1, 1);
}
else if (type == FlowerPotTile::TYPE_SAPLING_DEFAULT)
{
tesselateCrossTexture(Tile::sapling, Sapling::TYPE_DEFAULT, x, y, z, 0.75f);
}
else if (type == FlowerPotTile::TYPE_SAPLING_BIRCH)
{
tesselateCrossTexture(Tile::sapling, Sapling::TYPE_BIRCH, x, y, z, 0.75f);
}
else if (type == FlowerPotTile::TYPE_SAPLING_EVERGREEN)
{
tesselateCrossTexture(Tile::sapling, Sapling::TYPE_EVERGREEN, x, y, z, 0.75f);
}
else if (type == FlowerPotTile::TYPE_SAPLING_JUNGLE)
{
tesselateCrossTexture(Tile::sapling, Sapling::TYPE_JUNGLE, x, y, z, 0.75f);
}
else if (type == FlowerPotTile::TYPE_FERN)
{
col = Tile::tallgrass->getColor(level, x, y, z);
r = ((col >> 16) & 0xff) / 255.0f;
g = ((col >> 8) & 0xff) / 255.0f;
b = ((col) & 0xff) / 255.0f;
t->color(br * r, br * g, br * b);
tesselateCrossTexture(Tile::tallgrass, TallGrass::FERN, x, y, z, 0.75f);
}
else if (type == FlowerPotTile::TYPE_DEAD_BUSH)
{
tesselateCrossTexture(Tile::deadBush, TallGrass::FERN, x, y, z, 0.75f);
}
}
t->addOffset(-xOff / 16.0f, -yOff / 16.0f, -zOff / 16.0f);
}
return true;
} }
bool TileRenderer::tesselateAnvilInWorld(AnvilTile *tt, int x, int y, int z) bool TileRenderer::tesselateAnvilInWorld(AnvilTile *tt, int x, int y, int z)

1
Minecraft.World/Class.h
View file

@ -318,6 +318,7 @@ enum eINSTANCEOF
eTYPE_COMPARATORTILEENTITY = eTYPE_TILEENTITY | 0x0F, eTYPE_COMPARATORTILEENTITY = eTYPE_TILEENTITY | 0x0F,
eTYPE_DAYLIGHTDETECTORTILEENTITY = eTYPE_TILEENTITY | 0x10, eTYPE_DAYLIGHTDETECTORTILEENTITY = eTYPE_TILEENTITY | 0x10,
eTYPE_HOPPERTILEENTITY = eTYPE_TILEENTITY | 0x11, eTYPE_HOPPERTILEENTITY = eTYPE_TILEENTITY | 0x11,
eTYPE_FLOWERPOTTILEENTITY = eTYPE_TILEENTITY | 0x12,
eTYPE_DISPENSERTILEENTITY = eTYPE_TILEENTITY | BIT_DISPENSERTILEENTITY, eTYPE_DISPENSERTILEENTITY = eTYPE_TILEENTITY | BIT_DISPENSERTILEENTITY,
eTYPE_DROPPERTILEENTITY = eTYPE_DISPENSERTILEENTITY | 0x1, eTYPE_DROPPERTILEENTITY = eTYPE_DISPENSERTILEENTITY | 0x1,

196
Minecraft.World/FlowerPotTile.cpp
View file

@ -4,11 +4,12 @@
#include "net.minecraft.world.level.h" #include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h" #include "net.minecraft.world.level.tile.h"
#include "FlowerPotTile.h" #include "FlowerPotTile.h"
#include "FlowerPotTileEntity.h"
FlowerPotTile::FlowerPotTile(int id) : Tile(id, Material::decoration, isSolidRender() ) FlowerPotTile::FlowerPotTile(int id) : BaseEntityTile(id, Material::decoration, isSolidRender())
{ {
updateDefaultShape(); updateDefaultShape();
sendTileData(); sendTileData();
} }
void FlowerPotTile::updateDefaultShape() void FlowerPotTile::updateDefaultShape()
@ -33,57 +34,74 @@ bool FlowerPotTile::isCubeShaped()
return false; return false;
} }
bool FlowerPotTile::use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly) bool FlowerPotTile::isValidPlant(int itemId, int aux)
{ {
shared_ptr<ItemInstance> item = player->inventory->getSelected(); if (itemId == Tile::rose_Id || itemId == Tile::flower_Id)
if (item == nullptr) return false; return true;
if (level->getData(x, y, z) != 0) return false; if (itemId == Tile::sapling_Id && aux >= 0 && aux <= 6) return true;
int type = getTypeFromItem(item); if (itemId == Tile::mushroom_brown_Id || itemId == Tile::mushroom_red_Id) return true;
if (itemId == Tile::cactus_Id || itemId == Tile::deadBush_Id ||
if (type > 0) (itemId == Tile::tallgrass_Id && aux == TallGrass::FERN))
{ return true;
level->setData(x, y, z, type, Tile::UPDATE_CLIENTS); return false;
if (!player->abilities.instabuild)
{
if (--item->count <= 0)
{
player->inventory->setItem(player->inventory->selected, nullptr);
}
}
return true;
}
return false;
} }
int FlowerPotTile::cloneTileId(Level *level, int x, int y, int z) bool FlowerPotTile::use(Level* level, int x, int y, int z, shared_ptr<Player> player,
int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly)
{ {
shared_ptr<ItemInstance> item = getItemFromType(level->getData(x, y, z)); auto held = player->inventory->getSelected();
if (!held) return false;
if (level->getData(x, y, z) != 0) return false;
int itemId = held->getItem()->id;
int aux = held->getAuxValue();
if (!isValidPlant(itemId, aux)) return false;
if (item == nullptr) auto te = level->getTileEntity(x, y, z);
{ if (!te)
return Item::flowerPot_Id; {
} return false;
else }
{ auto potTe = std::dynamic_pointer_cast<FlowerPotTileEntity>(te);
return item->id; if (!potTe) return false;
} potTe->setFlower(itemId, aux);
level->setData(x, y, z, 1, Tile::UPDATE_CLIENTS);
if (!player->abilities.instabuild)
{
if (--held->count <= 0)
player->inventory->setItem(player->inventory->selected, nullptr);
}
return true;
} }
int FlowerPotTile::cloneTileData(Level *level, int x, int y, int z) int FlowerPotTile::cloneTileId(Level* level, int x, int y, int z)
{ {
shared_ptr<ItemInstance> item = getItemFromType(level->getData(x, y, z)); auto te = level->getTileEntity(x, y, z);
if (te)
{
auto potTe = std::dynamic_pointer_cast<FlowerPotTileEntity>(te);
if (potTe && potTe->hasFlower())
{
auto item = potTe->getFlowerItem();
if (item) return item->id;
}
}
return Item::flowerPot_Id;
}
if (item == nullptr) int FlowerPotTile::cloneTileData(Level* level, int x, int y, int z)
{ {
return Item::flowerPot_Id; auto te = level->getTileEntity(x, y, z);
} if (te)
else {
{ auto potTe = std::dynamic_pointer_cast<FlowerPotTileEntity>(te);
return item->getAuxValue(); if (potTe && potTe->hasFlower())
} {
auto item = potTe->getFlowerItem();
if (item) return item->getAuxValue();
}
}
return 0;
} }
bool FlowerPotTile::useOwnCloneData() bool FlowerPotTile::useOwnCloneData()
@ -106,15 +124,19 @@ void FlowerPotTile::neighborChanged(Level *level, int x, int y, int z, int type)
} }
} }
void FlowerPotTile::spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonusLevel) void FlowerPotTile::spawnResources(Level* level, int x, int y, int z, int data, float odds, int playerBonusLevel)
{ {
Tile::spawnResources(level, x, y, z, data, odds, playerBonusLevel); Tile::spawnResources(level, x, y, z, data, odds, playerBonusLevel);
auto te = level->getTileEntity(x, y, z);
if (data > 0) if (te)
{ {
shared_ptr<ItemInstance> item = getItemFromType(data); auto potTe = std::dynamic_pointer_cast<FlowerPotTileEntity>(te);
if (item != nullptr) popResource(level, x, y, z, item); if (potTe && potTe->hasFlower())
} {
auto flowerItem = potTe->getFlowerItem();
if (flowerItem) popResource(level, x, y, z, flowerItem);
}
}
} }
int FlowerPotTile::getResource(int data, Random *random, int playerBonusLevel) int FlowerPotTile::getResource(int data, Random *random, int playerBonusLevel)
@ -122,71 +144,7 @@ int FlowerPotTile::getResource(int data, Random *random, int playerBonusLevel)
return Item::flowerPot_Id; return Item::flowerPot_Id;
} }
shared_ptr<ItemInstance> FlowerPotTile::getItemFromType(int type) shared_ptr<TileEntity> FlowerPotTile::newTileEntity(Level *level)
{ {
switch (type) return std::make_shared<FlowerPotTileEntity>();
{
case TYPE_FLOWER_RED:
return std::make_shared<ItemInstance>(Tile::rose);
case TYPE_FLOWER_YELLOW:
return std::make_shared<ItemInstance>(Tile::flower);
case TYPE_CACTUS:
return std::make_shared<ItemInstance>(Tile::cactus);
case TYPE_MUSHROOM_BROWN:
return std::make_shared<ItemInstance>(Tile::mushroom_brown);
case TYPE_MUSHROOM_RED:
return std::make_shared<ItemInstance>(Tile::mushroom_red);
case TYPE_DEAD_BUSH:
return std::make_shared<ItemInstance>(Tile::deadBush);
case TYPE_SAPLING_DEFAULT:
return std::make_shared<ItemInstance>(Tile::sapling, 1, Sapling::TYPE_DEFAULT);
case TYPE_SAPLING_BIRCH:
return std::make_shared<ItemInstance>(Tile::sapling, 1, Sapling::TYPE_BIRCH);
case TYPE_SAPLING_EVERGREEN:
return std::make_shared<ItemInstance>(Tile::sapling, 1, Sapling::TYPE_EVERGREEN);
case TYPE_SAPLING_JUNGLE:
return std::make_shared<ItemInstance>(Tile::sapling, 1, Sapling::TYPE_JUNGLE);
case TYPE_FERN:
return std::make_shared<ItemInstance>(Tile::tallgrass, 1, TallGrass::FERN);
}
return nullptr;
}
int FlowerPotTile::getTypeFromItem(shared_ptr<ItemInstance> item)
{
int id = item->getItem()->id;
if (id == Tile::rose_Id) return TYPE_FLOWER_RED;
if (id == Tile::flower_Id) return TYPE_FLOWER_YELLOW;
if (id == Tile::cactus_Id) return TYPE_CACTUS;
if (id == Tile::mushroom_brown_Id) return TYPE_MUSHROOM_BROWN;
if (id == Tile::mushroom_red_Id) return TYPE_MUSHROOM_RED;
if (id == Tile::deadBush_Id) return TYPE_DEAD_BUSH;
if (id == Tile::sapling_Id)
{
switch (item->getAuxValue())
{
case Sapling::TYPE_DEFAULT:
return TYPE_SAPLING_DEFAULT;
case Sapling::TYPE_BIRCH:
return TYPE_SAPLING_BIRCH;
case Sapling::TYPE_EVERGREEN:
return TYPE_SAPLING_EVERGREEN;
case Sapling::TYPE_JUNGLE:
return TYPE_SAPLING_JUNGLE;
}
}
if (id == Tile::tallgrass_Id)
{
switch (item->getAuxValue())
{
case TallGrass::FERN:
return TYPE_FERN;
}
}
return 0;
} }

21
Minecraft.World/FlowerPotTile.h
View file

@ -1,28 +1,17 @@
#pragma once #pragma once
#include "Tile.h" #include "BaseEntityTile.h"
class FlowerPotTile : public Tile class FlowerPotTile : public BaseEntityTile
{ {
public: public:
static const int TYPE_FLOWER_RED = 1;
static const int TYPE_FLOWER_YELLOW = 2;
static const int TYPE_SAPLING_DEFAULT = 3;
static const int TYPE_SAPLING_EVERGREEN = 4;
static const int TYPE_SAPLING_BIRCH = 5;
static const int TYPE_SAPLING_JUNGLE = 6;
static const int TYPE_MUSHROOM_RED = 7;
static const int TYPE_MUSHROOM_BROWN = 8;
static const int TYPE_CACTUS = 9;
static const int TYPE_DEAD_BUSH = 10;
static const int TYPE_FERN = 11;
FlowerPotTile(int id); FlowerPotTile(int id);
void updateDefaultShape(); void updateDefaultShape();
bool isSolidRender(bool isServerLevel = false); bool isSolidRender(bool isServerLevel = false);
int getRenderShape(); int getRenderShape();
bool isCubeShaped(); bool isCubeShaped();
bool isValidPlant(int itemId, int aux);
bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false);
int cloneTileId(Level *level, int x, int y, int z); int cloneTileId(Level *level, int x, int y, int z);
int cloneTileData(Level *level, int x, int y, int z); int cloneTileData(Level *level, int x, int y, int z);
@ -32,6 +21,6 @@ public:
using Tile::spawnResources; using Tile::spawnResources;
void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonusLevel); void spawnResources(Level *level, int x, int y, int z, int data, float odds, int playerBonusLevel);
int getResource(int data, Random *random, int playerBonusLevel); int getResource(int data, Random *random, int playerBonusLevel);
static shared_ptr<ItemInstance> getItemFromType(int type);
static int getTypeFromItem(shared_ptr<ItemInstance> item); virtual shared_ptr<TileEntity> newTileEntity(Level *level) override;
}; };

70
Minecraft.World/FlowerPotTileEntity.cpp Normal file
View file

@ -0,0 +1,70 @@
#include "stdafx.h"
#include "FlowerPotTileEntity.h"
#include "com.mojang.nbt.h"
#include "TileEntityDataPacket.h"
FlowerPotTileEntity::FlowerPotTileEntity()
{
m_itemId = 0;
m_aux = 0;
}
void FlowerPotTileEntity::setFlower(int itemId, int aux)
{
m_itemId = itemId;
m_aux = aux;
setChanged();
}
bool FlowerPotTileEntity::hasFlower() const
{
return m_itemId != 0;
}
shared_ptr<ItemInstance> FlowerPotTileEntity::getFlowerItem() const
{
if (!hasFlower()) return nullptr;
return std::make_shared<ItemInstance>(m_itemId, 1, m_aux);
}
void FlowerPotTileEntity::clearFlower()
{
m_itemId = 0;
m_aux = 0;
setChanged();
}
void FlowerPotTileEntity::load(CompoundTag* tag)
{
TileEntity::load(tag);
m_itemId = tag->getInt(L"ItemId");
m_aux = tag->getInt(L"Aux");
}
void FlowerPotTileEntity::save(CompoundTag* tag)
{
TileEntity::save(tag);
tag->putInt(L"ItemId", m_itemId);
tag->putInt(L"Aux", m_aux);
}
shared_ptr<TileEntity> FlowerPotTileEntity::clone()
{
auto result = std::make_shared<FlowerPotTileEntity>();
TileEntity::clone(result);
result->m_itemId = m_itemId;
result->m_aux = m_aux;
return result;
}
shared_ptr<Packet> FlowerPotTileEntity::getUpdatePacket()
{
CompoundTag* tag = new CompoundTag();
save(tag);
return std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_FLOWER_POT, tag);
}
void FlowerPotTileEntity::handleUpdateTag(CompoundTag* tag)
{
load(tag);
}

25
Minecraft.World/FlowerPotTileEntity.h Normal file
View file

@ -0,0 +1,25 @@
#pragma once
#include "TileEntity.h"
class FlowerPotTileEntity : public TileEntity
{
public:
eINSTANCEOF GetType() { return eTYPE_FLOWERPOTTILEENTITY; }
static TileEntity* create() { return new FlowerPotTileEntity(); }
FlowerPotTileEntity();
void setFlower(int itemId, int aux);
bool hasFlower() const;
shared_ptr<ItemInstance> getFlowerItem() const;
int getItemId() const { return m_itemId; }
int getAux() const { return m_aux; }
void clearFlower();
virtual void load(CompoundTag* tag) override;
virtual void save(CompoundTag* tag) override;
virtual shared_ptr<TileEntity> clone() override;
virtual shared_ptr<Packet> getUpdatePacket();
virtual void handleUpdateTag(CompoundTag* tag);
private:
int m_itemId;
int m_aux;
};

3
Minecraft.World/ScatteredFeaturePieces.cpp
View file

@ -8,6 +8,7 @@
#include "net.minecraft.world.level.levelgen.structure.h" #include "net.minecraft.world.level.levelgen.structure.h"
#include "WeighedTreasure.h" #include "WeighedTreasure.h"
#include "ScatteredFeaturePieces.h" #include "ScatteredFeaturePieces.h"
#include "FlowerPotTileEntity.h"
void ScatteredFeaturePieces::loadStatic() void ScatteredFeaturePieces::loadStatic()
{ {
@ -695,7 +696,7 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level *level, Random *ran
placeBlock(level, 0, 0, 1, 3, 4, chunkBB); placeBlock(level, 0, 0, 1, 3, 4, chunkBB);
placeBlock(level, 0, 0, 5, 3, 4, chunkBB); placeBlock(level, 0, 0, 5, 3, 4, chunkBB);
placeBlock(level, 0, 0, 5, 3, 5, chunkBB); placeBlock(level, 0, 0, 5, 3, 5, chunkBB);
placeBlock(level, Tile::flowerPot_Id, FlowerPotTile::TYPE_MUSHROOM_RED, 1, 3, 5, chunkBB); placeFlowerPot(level, chunkBB, 1, 3, 5, Tile::mushroom_red_Id, 0);
// decoration // decoration
placeBlock(level, Tile::workBench_Id, 0, 3, 2, 6, chunkBB); placeBlock(level, Tile::workBench_Id, 0, 3, 2, 6, chunkBB);

16
Minecraft.World/StructurePiece.cpp
View file

@ -12,6 +12,7 @@
#include "JavaMath.h" #include "JavaMath.h"
#include "Facing.h" #include "Facing.h"
#include "DoorItem.h" #include "DoorItem.h"
#include "FlowerPotTileEntity.h"
/** /**
* *
@ -553,6 +554,21 @@ void StructurePiece::placeBlock( Level* level, int block, int data, int x, int y
level->setTileAndData( worldX, worldY, worldZ, block, data, Tile::UPDATE_CLIENTS); level->setTileAndData( worldX, worldY, worldZ, block, data, Tile::UPDATE_CLIENTS);
} }
void StructurePiece::placeFlowerPot(Level *level, BoundingBox *chunkBB, int x, int y, int z, int flowerItemId, int aux)
{
int worldX = getWorldX(x, z);
int worldY = getWorldY(y);
int worldZ = getWorldZ(x, z);
if (!chunkBB->isInside(worldX, worldY, worldZ)) return;
placeBlock(level, Tile::flowerPot_Id, 0, worldX, worldY, worldZ, chunkBB);
auto te = std::make_shared<FlowerPotTileEntity>();
te->setLevel(level);
te->x = worldX; te->y = worldY; te->z = worldZ;
te->setFlower(flowerItemId, aux);
level->setTileEntity(worldX, worldY, worldZ, te);
level->setData(worldX, worldY, worldZ, 1, Tile::UPDATE_CLIENTS);
}
/** /**
* The purpose of this method is to wrap the getTile call on Level, in order * The purpose of this method is to wrap the getTile call on Level, in order

1
Minecraft.World/StructurePiece.h
View file

@ -105,6 +105,7 @@ public:
int getWorldZ(int x, int z); int getWorldZ(int x, int z);
int getOrientationData(int tile, int data); int getOrientationData(int tile, int data);
virtual void placeBlock(Level *level, int block, int data, int x, int y, int z, BoundingBox *chunkBB); virtual void placeBlock(Level *level, int block, int data, int x, int y, int z, BoundingBox *chunkBB);
void placeFlowerPot(Level *level, BoundingBox *chunkBB, int x, int y, int z, int flowerItemId, int aux);
/** /**
* The purpose of this method is to wrap the getTile call on Level, in order * The purpose of this method is to wrap the getTile call on Level, in order

1
Minecraft.World/TileEntity.cpp
View file

@ -32,6 +32,7 @@ void TileEntity::staticCtor()
TileEntity::setId(DaylightDetectorTileEntity::create, eTYPE_DAYLIGHTDETECTORTILEENTITY, L"DLDetector"); TileEntity::setId(DaylightDetectorTileEntity::create, eTYPE_DAYLIGHTDETECTORTILEENTITY, L"DLDetector");
TileEntity::setId(HopperTileEntity::create, eTYPE_HOPPERTILEENTITY, L"Hopper"); TileEntity::setId(HopperTileEntity::create, eTYPE_HOPPERTILEENTITY, L"Hopper");
TileEntity::setId(ComparatorTileEntity::create, eTYPE_COMPARATORTILEENTITY, L"Comparator"); TileEntity::setId(ComparatorTileEntity::create, eTYPE_COMPARATORTILEENTITY, L"Comparator");
TileEntity::setId(FlowerPotTileEntity::create, eTYPE_FLOWERPOTTILEENTITY, L"FlowerPot");
} }
void TileEntity::setId(tileEntityCreateFn createFn, eINSTANCEOF clas, wstring id) void TileEntity::setId(tileEntityCreateFn createFn, eINSTANCEOF clas, wstring id)

1
Minecraft.World/TileEntityDataPacket.h
View file

@ -12,6 +12,7 @@ public:
static const int TYPE_ADV_COMMAND = 2; static const int TYPE_ADV_COMMAND = 2;
static const int TYPE_BEACON = 3; static const int TYPE_BEACON = 3;
static const int TYPE_SKULL = 4; static const int TYPE_SKULL = 4;
static const int TYPE_FLOWER_POT = 5;
int x, y, z; int x, y, z;
int type; int type;

2
Minecraft.World/cmake/sources/Common.cmake
View file

@ -2092,6 +2092,8 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_TILE_ENTITY
"${CMAKE_CURRENT_SOURCE_DIR}/TileEntity.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/TileEntity.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/TileEntity.h" "${CMAKE_CURRENT_SOURCE_DIR}/TileEntity.h"
"${CMAKE_CURRENT_SOURCE_DIR}/net.minecraft.world.level.tile.entity.h" "${CMAKE_CURRENT_SOURCE_DIR}/net.minecraft.world.level.tile.entity.h"
"${CMAKE_CURRENT_SOURCE_DIR}/FlowerPotTileEntity.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/FlowerPotTileEntity.h"
) )
source_group("net/minecraft/world/level/tile/entity" FILES ${_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_TILE_ENTITY}) source_group("net/minecraft/world/level/tile/entity" FILES ${_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_TILE_ENTITY})

1
Minecraft.World/net.minecraft.world.level.tile.entity.h
View file

@ -21,3 +21,4 @@
#include "SkullTileEntity.h" #include "SkullTileEntity.h"
#include "EnderChestTileEntity.h" #include "EnderChestTileEntity.h"
#include "ItemFrame.h" #include "ItemFrame.h"
#include "FlowerPotTileEntity.h"