minecraft-pi-reborn/minecraft-pi-reborn
3
7
Fork 10
Code Issues 4 Pull Requests 1 Actions Releases 3 Activity

F3 Tweak
All checks were successful
CI / Build (AMD64) (push) Successful in 24m48s
Details
CI / Build (ARM64) (push) Successful in 25m41s
Details
CI / Build (ARMHF) (push) Successful in 12m51s
Details
CI / Test (AMD64, Server) (push) Successful in 2m20s
Details
CI / Build Example Mods (push) Successful in 1m47s
Details
CI / Test (ARM64, Client) (push) Successful in 5m26s
Details
CI / Test (AMD64, Client) (push) Successful in 6m13s
Details
CI / Test (ARM64, Server) (push) Successful in 2m14s
Details
CI / Test (ARMHF, Client) (push) Successful in 5m33s
Details
CI / Test (ARMHF, Server) (push) Successful in 2m27s
Details
CI / Release (push) Has been skipped
Details

Browse Source
This commit is contained in:
TheBrokenRail 2024-10-29 22:48:23 -04:00
parent e6deab9664
commit a0a566f594
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mods/src/f3/f3.cpp
View File

@ -83,6 +83,14 @@ static std::vector<std::string> get_debug_info_left(const Minecraft *minecraft)
// Return // Return
return info; return info;
} }
static std::string format_type(const int id, const std::string &name) {
std::string out = std::to_string(id);
if (!name.empty()) {
out = name + " (" + out + ')';
}
out = "Type: " + out;
return out;
}
static std::vector<std::string> get_debug_info_right(const Minecraft *minecraft) { static std::vector<std::string> get_debug_info_right(const Minecraft *minecraft) {
std::vector<std::string> info; std::vector<std::string> info;
// TPS // TPS
@ -104,20 +112,17 @@ static std::vector<std::string> get_debug_info_right(const Minecraft *minecraft)
type = "Tile"; type = "Tile";
if (minecraft->level) { if (minecraft->level) {
const int id = minecraft->level->getTile(x, y, z); const int id = minecraft->level->getTile(x, y, z);
std::string id_info = "ID: " + std::to_string(id); std::string name;
if (Tile *tile = Tile::tiles[id]) { if (Tile *tile = Tile::tiles[id]) {
const std::string description_id = tile->getDescriptionId(); const std::string description_id = tile->getDescriptionId();
std::string name = description_id + ".name"; name = description_id + ".name";
if (I18n::_strings.contains(name)) { if (I18n::_strings.contains(name)) {
name = I18n::_strings[name]; name = I18n::_strings[name];
} else { } else {
name = description_id; name = description_id;
} }
if (!name.empty()) {
id_info += " (" + name + ')';
}
} }
type_info.push_back(id_info); type_info.push_back(format_type(id, name));
type_info.push_back("Data: " + std::to_string(minecraft->level->getData(x, y, z))); type_info.push_back("Data: " + std::to_string(minecraft->level->getData(x, y, z)));
} }
xyz_precision = 0; xyz_precision = 0;
@ -128,7 +133,8 @@ static std::vector<std::string> get_debug_info_right(const Minecraft *minecraft)
y = entity->y - entity->height_offset; y = entity->y - entity->height_offset;
z = entity->z; z = entity->z;
type = "Entity"; type = "Entity";
type_info.push_back("Type ID: " + std::to_string(entity->getEntityTypeId())); // TODO: Specify name when RJ PR is merged const int type_id = entity->getEntityTypeId();
type_info.push_back(format_type(type_id, "")); // TODO: Specify name when RJ PR is merged
type_info.push_back("ID: " + std::to_string(entity->id)); type_info.push_back("ID: " + std::to_string(entity->id));
if (entity->isMob()) { if (entity->isMob()) {
Mob *mob = (Mob *) entity; Mob *mob = (Mob *) entity;
@ -142,7 +148,7 @@ static std::vector<std::string> get_debug_info_right(const Minecraft *minecraft)
info.push_back("Target Y: " + to_string_with_precision(y, xyz_precision)); info.push_back("Target Y: " + to_string_with_precision(y, xyz_precision));
info.push_back("Target Z: " + to_string_with_precision(z, xyz_precision)); info.push_back("Target Z: " + to_string_with_precision(z, xyz_precision));
info.push_back(""); info.push_back("");
info.push_back("Target Type: " + type); info.push_back("Target: " + type);
info.insert(info.end(), type_info.begin(), type_info.end()); info.insert(info.end(), type_info.begin(), type_info.end());
} }
// Return // Return