minecraft-pi-reborn
/
minecraft-pi-reborn
7
11
Fork 13
Code Issues 5 Pull Requests 2 Actions Releases 3 Activity

Add Food Overlay #86

Merged
TheBrokenRail merged 2 commits from bigjango13/minecraft-pi-reborn:apple-skin into master 2024-02-07 00:02:32 +00:00
Conversation 0 Commits 2 Files Changed 6 +78 -2
bigjango13 commented 2024-02-06 22:54:18 +00:00
Contributor
Copy Link

This adds a food overlay, like that of the AppleSkin mod. It works with both classic and non-classic GUI. an example of the mod in action, along a few other mods

This adds a food overlay, like that of the [AppleSkin](<https://www.curseforge.com/minecraft/mc-mods/appleskin>) mod. It works with both classic and non-classic GUI. ![an example of the mod in action, along a few other mods](https://cdn.discordapp.com/attachments/890737926013591572/1204526118712115210/2024-02-06_15.33.08.png)
bigjango13 added 1 commit 2024-02-06 22:54:18 +00:00
TheBrokenRail reviewed 2024-02-06 23:04:14 +00:00
TheBrokenRail left a comment
Owner
Copy Link

Overall, looks good!

Overall, looks good!
mods/src/misc/misc.c Outdated
@ -22,0 +42,4 @@
Gui_renderHearts(gui);
}
Gui_blit_t Gui_blit_renderHearts_injection = NULL;
TheBrokenRail commented 2024-02-06 23:01:30 +00:00
Owner
Copy Link

Maybe call this Gui_blit_renderHearts_original? _injection is a bit unclear IMO. Also, does it not let you do = Gui_blit in this line?

Maybe call this `Gui_blit_renderHearts_original`? `_injection` is a bit unclear IMO. Also, does it not let you do ` = Gui_blit` in this line?
bigjango13 commented 2024-02-06 23:16:56 +00:00
Author
Contributor
Copy Link

Great minds think alike it seems 😉
I tried to do Gui_blit_t Gui_blit_renderHearts_injection = Gui_blit;, however C does not allow this, it requires global initializers to be constant, and the symbol split makes it no longer constant. As for the rename, it's been done.

Great minds think alike it seems 😉 I tried to do `Gui_blit_t Gui_blit_renderHearts_injection = Gui_blit;`, however C does not allow this, it requires global initializers to be constant, and the symbol split makes it no longer constant. As for the rename, it's been done.
bigjango13 marked this conversation as resolved
mods/src/misc/misc.c
@ -22,0 +53,4 @@
heal_amount_drawing = 0;
} else if (heal_amount_drawing > 0) {
// Full heart
Gui_blit_renderHearts_injection(gui, x1, y1, 70, 0, w1, h1, w2, h2);
TheBrokenRail commented 2024-02-06 23:00:38 +00:00
Owner
Copy Link

Should these constants (79, 70) be put in a macro so they're not repeated?

Should these constants (79, 70) be put in a macro so they're not repeated?
bigjango13 marked this conversation as resolved
mods/src/misc/misc.c Outdated
@ -576,3 +638,3 @@
overwrite_call((void *) 0x267c8, (void *) Gui_renderHearts_GuiComponent_blit_hearts_injection);
overwrite_call((void *) 0x2656c, (void *) Gui_renderHearts_GuiComponent_blit_armor_injection);
overwrite_call((void *) 0x268c4, (void *) Gui_renderBubbles_GuiComponent_blit_injection);
if (!food_overlay) {
TheBrokenRail commented 2024-02-06 23:03:54 +00:00
Owner
Copy Link

I'd suggest re-ordering this so that Classic HUD is setup first, then Food Overlay. That way, Food Overlay's overwrites can just replace Classic HUD's rather than Classic HUD's having to explicitly check.

I'd suggest re-ordering this so that `Classic HUD` is setup first, then `Food Overlay`. That way, `Food Overlay`'s overwrites can just replace `Classic HUD`'s rather than `Classic HUD`'s having to explicitly check.
bigjango13 marked this conversation as resolved
bigjango13 added 1 commit 2024-02-06 23:16:43 +00:00
CI / Build (AMD64, Server) (push) Successful in 10m14s Details
CI / Build (AMD64, Client) (push) Successful in 10m26s Details
CI / Build (ARM64, Server) (push) Successful in 10m28s Details
CI / Build (ARM64, Client) (push) Successful in 10m38s Details
CI / Build (ARMHF, Server) (push) Successful in 7m6s Details
CI / Build (ARMHF, Client) (push) Successful in 9m47s Details
CI / Test (Client) (push) Successful in 13m41s Details
CI / Test (Server) (push) Successful in 11m12s Details
CI / Release (push) Has been skipped Details
CI / Build Example Mods (push) Successful in 6m15s Details
2d9d4a638a Move food overlay to after classic HUD
TheBrokenRail merged commit 2d9d4a638a into master 2024-02-07 00:02:32 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: minecraft-pi-reborn/minecraft-pi-reborn#86
No description provided.
Delete Branch "bigjango13/minecraft-pi-reborn:apple-skin"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?