backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-07-07 14:37:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: merge conflicts (again)

Browse source
This commit is contained in:
Fireblade 2026-05-24 23:53:05 -04:00
parent d4b98cf70b
commit f005b4e485
7 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.Client/GameRenderer.cpp
View file

@ -147,7 +147,6 @@ GameRenderer::GameRenderer(Minecraft *mc)
this->mc = mc;
itemInHandRenderer = nullptr;
#ifndef MINECRAFT_SERVER_BUILD
// 4J-PB - set up the local players iteminhand renderers here - needs to be done with lighting enabled so that the render geometry gets compiled correctly
#ifndef MINECRAFT_SERVER_BUILD
glEnable(GL_LIGHTING);

2
Minecraft.World/Creeper.cpp
View file

@ -207,7 +207,7 @@ bool Creeper::mobInteract(shared_ptr<Player> player)
{
shared_ptr<ItemInstance> item = player->inventory->getSelected();
if (item == nullptr || item->id != Item::flintAndSteel_Id)
if (item == nullptr || item->id != Item::flint_and_steel_Id)
return Mob::mobInteract(player);
playSound(eSoundType_FIRE_NEWIGNITE, 1, random->nextFloat() * 0.4f + 0.8f);

5
Minecraft.World/SlimeTile.cpp
View file

@ -27,11 +27,6 @@ bool SlimeTile::shouldRenderFace(LevelSource *level, int x, int y, int z, int fa
return true;
}
int SlimeTile::getResourceCount(Random *random)
{
return 0;
}
bool SlimeTile::isSolidRender()
{
return false;

1
Minecraft.World/SlimeTile.h
View file

@ -11,7 +11,6 @@ public:
virtual bool shouldRenderFace(LevelSource *level, int x, int y, int z, int face);
virtual int getRenderShape();
virtual bool isSolidRender();
virtual int getResourceCount(Random *random);
virtual int getPistonPushReaction();
// slime block logic

4
Minecraft.World/StructureRecipies.cpp
View file

@ -82,14 +82,14 @@ void StructureRecipies::addRecipes(Recipes *r)
L"#Q", //
L"Q#", //
L'#', Tile::cobblestone, L'Q', Item::netherQuartz,
L'#', Tile::cobblestone, L'Q', Item::nether_quartz,
L'S');
r->addShapedRecipy(new ItemInstance(Tile::stone_Id, 1, StoneTile::GRANITE), //
L"sczcig",
L"#Q", //
L'#', new ItemInstance(Tile::stone_Id, 1, StoneTile::DIORITE), L'Q', Item::netherQuartz,
L'#', new ItemInstance(Tile::stone_Id, 1, StoneTile::DIORITE), L'Q', Item::nether_quartz,
L'S');
r->addShapedRecipy(new ItemInstance(Tile::stone_Id, 2, StoneTile::ANDESITE), //

32
Minecraft.World/TallGrass2.cpp
View file

@ -233,13 +233,17 @@ void TallGrass2::neighborChanged(Level* level, int x, int y, int z, int type)
{
int data = level->getData(x, y, z);
bool isUpper = (data & UPPER_BIT) != 0;
int variant = data & ~UPPER_BIT;
if (!isUpper)
{
int upperTileId = level->getTile(x, y + 1, z);
if (!canSurvive(level, x, y, z) || (upperTileId != id))
{
spawnResources(level, x, y, z, data, 0);
if (variant != SUNFLOWER)
{
spawnResources(level, x, y, z, data, 0);
}
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
if (upperTileId == id)
level->removeTile(x, y + 1, z);
@ -273,6 +277,14 @@ void TallGrass2::tick(Level* level, int x, int y, int z, Random* random)
int TallGrass2::getResource(int data, Random* random, int playerBonusLevel)
{
(void)random;
(void)playerBonusLevel;
if ((data & ~UPPER_BIT) == SUNFLOWER)
{
return Tile::double_plant_Id;
}
return -1;
}
@ -281,6 +293,11 @@ int TallGrass2::getResourceCountForLootBonus(int bonusLevel, Random* random)
return 1;
}
int TallGrass2::getSpawnResourcesAuxValue(int data)
{
return data & ~UPPER_BIT;
}
bool TallGrass2::isSilkTouchable()
{
return true;
@ -295,6 +312,19 @@ shared_ptr<ItemInstance> TallGrass2::getSilkTouchItemInstance(int data)
void TallGrass2::playerDestroy(Level* level, shared_ptr<Player> player, int x, int y, int z, int data)
{
if ((data & ~UPPER_BIT) == SUNFLOWER)
{
if (!level->isClientSide && !player->abilities.instabuild)
{
player->awardStat(
GenericStats::blocksMined(id),
GenericStats::param_blocksMined(id, data, 1));
popResource(level, x, y, z, std::make_shared<ItemInstance>(this, 1, SUNFLOWER));
}
return;
}
if (!level->isClientSide
&& player->getSelectedItem() != nullptr
&& player->getSelectedItem()->id == Item::shears->id)

1
Minecraft.World/TallGrass2.h
View file

@ -55,6 +55,7 @@ public:
virtual int getResource(int data, Random* random, int playerBonusLevel) override;
virtual int getResourceCountForLootBonus(int bonusLevel, Random* random) override;
virtual int getSpawnResourcesAuxValue(int data) override;
virtual void playerDestroy(Level* level, shared_ptr<Player> player, int x, int y, int z, int data) override;
virtual void playerWillDestroy(Level* level, int x, int y, int z, int data, shared_ptr<Player> player) override;