Anjo1920/minecraft-pi-reborn_fix-tinting
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Pull Requests Activity

Fix Torch Placement

Browse Source
This commit is contained in:
TheBrokenRail 2025-02-28 18:21:39 -05:00
parent fd141cc8bb
commit e04b12e94e
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CHANGELOG.md
View File

@ -64,6 +64,7 @@
* `Implement RaspberryJuice API` (Enabled By Default) * `Implement RaspberryJuice API` (Enabled By Default)
* `Fix HUD When Spectating Other Players` (Enabled By Default) * `Fix HUD When Spectating Other Players` (Enabled By Default)
* `Fix Crash When Spectated Entity Is Removed` (Enabled By Default) * `Fix Crash When Spectated Entity Is Removed` (Enabled By Default)
* `Fix Torch Placement` (Enabled)
* Existing Functionality (All Enabled By Default) * Existing Functionality (All Enabled By Default)
* `Fix Screen Rendering When Hiding HUD` * `Fix Screen Rendering When Hiding HUD`
* `Sanitize Usernames` * `Sanitize Usernames`

1
libreborn/src/util/env/flags/available-feature-flags vendored
View File

@ -131,6 +131,7 @@ CATEGORY Bug Fixes
TRUE Fix Fire Immunity TRUE Fix Fire Immunity
TRUE Fix Sunlight Not Properly Setting Mobs On Fire TRUE Fix Sunlight Not Properly Setting Mobs On Fire
TRUE Fix Transferring Durability When Using Items TRUE Fix Transferring Durability When Using Items
TRUE Fix Torch Placement
CATEGORY Crashes CATEGORY Crashes
TRUE Fix Crash When Generating Certain Seeds TRUE Fix Crash When Generating Certain Seeds
TRUE Close Editor When Sign Is Destroyed TRUE Close Editor When Sign Is Destroyed

14
mods/src/misc/misc.cpp
View File

@ -497,6 +497,15 @@ static int Level_getTopTile_injection(Level_getTopTile_t original, Level *self,
} }
} }
// Fix Torch Placement
static bool TileItem_useOn_Level_setTileAndData_injection(Level *self, const int x, const int y, const int z, const int tile, const int data) {
const bool ret = self->setTileAndData(x, y, z, tile, data);
if (tile == Tile::torch->id) {
self->setData(x, y, z, data);
}
return ret;
}
// Init // Init
void init_misc() { void init_misc() {
// Sanitize Username // Sanitize Username
@ -673,6 +682,11 @@ void init_misc() {
overwrite_calls(Level_getTopTile, Level_getTopTile_injection); overwrite_calls(Level_getTopTile, Level_getTopTile_injection);
} }
// Fix Torch Placement
if (feature_has("Fix Torch Placement", server_enabled)) {
overwrite_call((void *) 0xcb784, Level_setTileAndData, TileItem_useOn_Level_setTileAndData_injection);
}
// Disable overwrite_calls() After Minecraft::init // Disable overwrite_calls() After Minecraft::init
misc_run_on_init([](__attribute__((unused)) Minecraft *minecraft) { misc_run_on_init([](__attribute__((unused)) Minecraft *minecraft) {
thunk_enabler = [](__attribute__((unused)) void *a, __attribute__((unused)) void *b) -> void * { thunk_enabler = [](__attribute__((unused)) void *a, __attribute__((unused)) void *b) -> void * {

10
symbols/src/level/Level.def
View File

@ -3,12 +3,12 @@ extends LevelSource;
vtable 0x10fcf0; vtable 0x10fcf0;
method void saveLevelData() = 0xa2e94; method void saveLevelData() = 0xa2e94;
method void setTile(int x, int y, int z, int id) = 0xa3904; method bool setTile(int x, int y, int z, int id) = 0xa3904;
method void setTileNoUpdate(int x, int y, int z, int id) = 0xa342c; method bool setTileNoUpdate(int x, int y, int z, int id) = 0xa342c;
method void setData(int x, int y, int z, int data) = 0xa394c; method void setData(int x, int y, int z, int data) = 0xa394c;
method void setDataNoUpdate(int x, int y, int z, int data) = 0xa3480; method bool setDataNoUpdate(int x, int y, int z, int data) = 0xa3480;
method void setTileAndData(int x, int y, int z, int id, int data) = 0xa38b4; method bool setTileAndData(int x, int y, int z, int id, int data) = 0xa38b4;
method void setTileAndDataNoUpdate(int x, int y, int z, int id, int data) = 0xa33d0; method bool setTileAndDataNoUpdate(int x, int y, int z, int id, int data) = 0xa33d0;
// Calls setTileDirty and updateNearbyTiles // Calls setTileDirty and updateNearbyTiles
method void tileUpdated(int x, int y, int z, int id) = 0xa387c; method void tileUpdated(int x, int y, int z, int id) = 0xa387c;
method void setTileDirty(int x, int y, int z) = 0xa3508; method void setTileDirty(int x, int y, int z) = 0xa3508;

1
symbols/src/tile/Tile.def
View File

@ -98,6 +98,7 @@ static-property Tile *tallgrass = 0x181d0c;
static-property Tile *stoneSlab = 0x181b44; static-property Tile *stoneSlab = 0x181b44;
static-property Tile *fire = 0x181de0; static-property Tile *fire = 0x181de0;
static-property Tile *sand = 0x181b20; static-property Tile *sand = 0x181b20;
static-property Tile *torch = 0x181d58;
// "Carried" Tiles // "Carried" Tiles
static-property Tile *leaves_carried = 0x181dd8; static-property Tile *leaves_carried = 0x181dd8;