chore: format Minecraft.Client

This commit is contained in:
Tropical
2026-03-13 17:10:10 -05:00
parent 33d0737d1d
commit e8424f2000
531 changed files with 67709 additions and 62690 deletions

View File

@@ -11,60 +11,55 @@
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
GameMode::GameMode(Minecraft *minecraft)
{
instaBuild = false; // 4J - added
this->minecraft = minecraft;
GameMode::GameMode(Minecraft* minecraft) {
instaBuild = false; // 4J - added
this->minecraft = minecraft;
}
void GameMode::initLevel(Level *level)
{
}
void GameMode::initLevel(Level* level) {}
bool GameMode::destroyBlock(int x, int y, int z, int face)
{
Level *level = minecraft->level;
Tile *oldTile = Tile::tiles[level->getTile(x, y, z)];
if (oldTile == NULL) return false;
bool GameMode::destroyBlock(int x, int y, int z, int face) {
Level* level = minecraft->level;
Tile* oldTile = Tile::tiles[level->getTile(x, y, z)];
if (oldTile == NULL) return false;
// 4J - Let the rendering side of thing know we are about to destroy the tile, so we can synchronise collision with async render data upates.
minecraft->levelRenderer->destroyedTileManager->destroyingTileAt(level, x, y, z);
level->levelEvent(LevelEvent::PARTICLES_DESTROY_BLOCK, x, y, z, oldTile->id + (level->getData(x, y, z) << Tile::TILE_NUM_SHIFT));
// 4J - Let the rendering side of thing know we are about to destroy the
// tile, so we can synchronise collision with async render data upates.
minecraft->levelRenderer->destroyedTileManager->destroyingTileAt(level, x,
y, z);
level->levelEvent(
LevelEvent::PARTICLES_DESTROY_BLOCK, x, y, z,
oldTile->id + (level->getData(x, y, z) << Tile::TILE_NUM_SHIFT));
int data = level->getData(x, y, z);
// 4J - before we remove the tile, recalc the heightmap - setTile depends on this being valid to be able to do
// a quick update of skylighting when the block is removed, and there are cases with falling tiles where this can get out of sync
level->getChunkAt(x,z)->recalcHeightmapOnly();
// 4J - before we remove the tile, recalc the heightmap - setTile depends on
// this being valid to be able to do a quick update of skylighting when the
// block is removed, and there are cases with falling tiles where this can
// get out of sync
level->getChunkAt(x, z)->recalcHeightmapOnly();
bool changed = level->setTile(x, y, z, 0);
if (oldTile != NULL && changed)
{
if (oldTile != NULL && changed) {
oldTile->destroy(level, x, y, z, data);
}
return changed;
}
void GameMode::render(float a)
{
void GameMode::render(float a) {}
bool GameMode::useItem(std::shared_ptr<Player> player, Level* level,
std::shared_ptr<ItemInstance> item, bool bTestUseOnly) {
return false;
}
bool GameMode::useItem(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, bool bTestUseOnly)
{
return false;
}
void GameMode::initPlayer(std::shared_ptr<Player> player) {}
void GameMode::initPlayer(std::shared_ptr<Player> player)
{
}
void GameMode::tick() {}
void GameMode::tick()
{
}
void GameMode::adjustPlayer(std::shared_ptr<Player> player) {}
void GameMode::adjustPlayer(std::shared_ptr<Player> player)
{
}
//bool GameMode::useItemOn(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, int face, bool bTestUseOnOnly)
// bool GameMode::useItemOn(std::shared_ptr<Player> player, Level *level,
// std::shared_ptr<ItemInstance> item, int x, int y, int z, int face, bool
// bTestUseOnOnly)
//{
// // 4J-PB - Adding a test only version to allow tooltips to be displayed
// int t = level->getTile(x, y, z);
@@ -74,9 +69,10 @@ void GameMode::adjustPlayer(std::shared_ptr<Player> player)
// {
// switch(t)
// {
// case Tile::recordPlayer_Id:
// case Tile::recordPlayer_Id:
// case Tile::bed_Id: // special case for a bed
// if (Tile::tiles[t]->TestUse(level, x, y, z, player ))
// if (Tile::tiles[t]->TestUse(level, x, y, z,
//player ))
// {
// return true;
// }
@@ -91,94 +87,73 @@ void GameMode::adjustPlayer(std::shared_ptr<Player> player)
// break;
// }
// }
// else
// else
// {
// if (Tile::tiles[t]->use(level, x, y, z, player )) return true;
// if (Tile::tiles[t]->use(level, x, y, z, player )) return
//true;
// }
// }
//
// if (item == NULL) return false;
// return item->useOn(player, level, x, y, z, face, bTestUseOnOnly);
//}
//
// if (item == NULL) return false;
// return item->useOn(player, level, x, y, z, face, bTestUseOnOnly);
// }
std::shared_ptr<Player> GameMode::createPlayer(Level *level)
{
return std::shared_ptr<Player>( new LocalPlayer(minecraft, level, minecraft->user, level->dimension->id) );
std::shared_ptr<Player> GameMode::createPlayer(Level* level) {
return std::shared_ptr<Player>(new LocalPlayer(
minecraft, level, minecraft->user, level->dimension->id));
}
bool GameMode::interact(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity)
{
return player->interact(entity);
bool GameMode::interact(std::shared_ptr<Player> player,
std::shared_ptr<Entity> entity) {
return player->interact(entity);
}
void GameMode::attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity)
{
player->attack(entity);
void GameMode::attack(std::shared_ptr<Player> player,
std::shared_ptr<Entity> entity) {
player->attack(entity);
}
std::shared_ptr<ItemInstance> GameMode::handleInventoryMouseClick(int containerId, int slotNum, int buttonNum, bool quickKeyHeld, std::shared_ptr<Player> player)
{
return nullptr;
std::shared_ptr<ItemInstance> GameMode::handleInventoryMouseClick(
int containerId, int slotNum, int buttonNum, bool quickKeyHeld,
std::shared_ptr<Player> player) {
return nullptr;
}
void GameMode::handleCloseInventory(int containerId, std::shared_ptr<Player> player)
{
void GameMode::handleCloseInventory(int containerId,
std::shared_ptr<Player> player) {
player->containerMenu->removed(player);
delete player->containerMenu;
delete player->containerMenu;
player->containerMenu = player->inventoryMenu;
}
void GameMode::handleInventoryButtonClick(int containerId, int buttonId)
{
void GameMode::handleInventoryButtonClick(int containerId, int buttonId) {}
bool GameMode::isCutScene() { return false; }
void GameMode::releaseUsingItem(std::shared_ptr<Player> player) {
player->releaseUsingItem();
}
bool GameMode::isCutScene()
{
return false;
}
bool GameMode::hasExperience() { return false; }
void GameMode::releaseUsingItem(std::shared_ptr<Player> player)
{
player->releaseUsingItem();
}
bool GameMode::hasMissTime() { return true; }
bool GameMode::hasExperience()
{
return false;
}
bool GameMode::hasInfiniteItems() { return false; }
bool GameMode::hasMissTime()
{
return true;
}
bool GameMode::hasFarPickRange() { return false; }
bool GameMode::hasInfiniteItems()
{
return false;
}
void GameMode::handleCreativeModeItemAdd(std::shared_ptr<ItemInstance> clicked,
int i) {}
bool GameMode::hasFarPickRange()
{
return false;
}
void GameMode::handleCreativeModeItemDrop(
std::shared_ptr<ItemInstance> clicked) {}
void GameMode::handleCreativeModeItemAdd(std::shared_ptr<ItemInstance> clicked, int i)
{
}
void GameMode::handleCreativeModeItemDrop(std::shared_ptr<ItemInstance> clicked)
{
}
bool GameMode::handleCraftItem(int recipe, std::shared_ptr<Player> player)
{
return true;
bool GameMode::handleCraftItem(int recipe, std::shared_ptr<Player> player) {
return true;
}
// 4J-PB
void GameMode::handleDebugOptions(unsigned int uiVal, std::shared_ptr<Player> player)
{
player->SetDebugOptions(uiVal);
void GameMode::handleDebugOptions(unsigned int uiVal,
std::shared_ptr<Player> player) {
player->SetDebugOptions(uiVal);
}