From be5bcf24c4faa1bfe2b788cdbdbf55658e7e6a82 Mon Sep 17 00:00:00 2001 From: Bigjango13 Date: Tue, 16 Jan 2024 03:43:40 -0500 Subject: [PATCH] More symbols, mostly item rendering related --- symbols/src/entity/HumanoidMobRenderer.def | 2 ++ symbols/src/entity/HumanoidModel.def | 6 ++++++ symbols/src/entity/Mob.def | 1 + symbols/src/entity/ModelPart.def | 7 +++++++ symbols/src/game/Minecraft.def | 1 + symbols/src/gui/components/Gui.def | 13 +++++++++++-- symbols/src/gui/components/GuiComponent.def | 1 + symbols/src/item/Item.def | 2 ++ symbols/src/item/ItemInHandRenderer.def | 7 +++++++ symbols/src/item/ItemRenderer.def | 1 + symbols/src/level/container/FillingContainer.def | 2 ++ 11 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 symbols/src/item/ItemInHandRenderer.def diff --git a/symbols/src/entity/HumanoidMobRenderer.def b/symbols/src/entity/HumanoidMobRenderer.def index 7ddaa74..151f146 100644 --- a/symbols/src/entity/HumanoidMobRenderer.def +++ b/symbols/src/entity/HumanoidMobRenderer.def @@ -3,3 +3,5 @@ extends MobRenderer; vtable 0x107908; property HumanoidModel *model = 0x14; + +virtual-method void additionalRendering(Mob *mob) = 0x38; diff --git a/symbols/src/entity/HumanoidModel.def b/symbols/src/entity/HumanoidModel.def index 4233c05..a1d6cb2 100644 --- a/symbols/src/entity/HumanoidModel.def +++ b/symbols/src/entity/HumanoidModel.def @@ -1 +1,7 @@ +property ModelPart head = 0x24; +property ModelPart torso = 0x7c; +property ModelPart rightArm = 0xd4; +property ModelPart leftArm = 0x12c; +property bool angleLeftArm = 0x234; +property bool angleRightArm = 0x235; property bool is_sneaking = 0x236; diff --git a/symbols/src/entity/Mob.def b/symbols/src/entity/Mob.def index 675af93..2555e94 100644 --- a/symbols/src/entity/Mob.def +++ b/symbols/src/entity/Mob.def @@ -4,6 +4,7 @@ vtable 0x10ad60; virtual-method void actuallyHurt(int damage) = 0x16c; virtual-method void die(Entity *cause) = 0x130; +virtual-method ItemInstance *getCarriedItem() = 0x1ac; virtual-method float getWalkingSpeedModifier() = 0x1e8; property int health = 0xec; diff --git a/symbols/src/entity/ModelPart.def b/symbols/src/entity/ModelPart.def index 33660ed..ef5e5ee 100644 --- a/symbols/src/entity/ModelPart.def +++ b/symbols/src/entity/ModelPart.def @@ -1 +1,8 @@ method void render(float scale) = 0x416dc; + +property float x = 0x0; +property float y = 0x4; +property float z = 0x8; +property float xRot = 0xc; +property float yRot = 0x10; +property float zRot = 0x14; diff --git a/symbols/src/game/Minecraft.def b/symbols/src/game/Minecraft.def index c9b11ed..18303f7 100644 --- a/symbols/src/game/Minecraft.def +++ b/symbols/src/game/Minecraft.def @@ -18,6 +18,7 @@ virtual-method int handleBack(bool do_nothing) = 0x34; method uchar *getCreator() = 0x17538; method LevelStorageSource *getLevelSource() = 0x16e84; method void handleMouseDown(int param_1, bool can_destroy) = 0x1584c; +method void handleBuildAction(uint *build_action_intention) = 0x15920; virtual-method void selectLevel(std::string *level_dir, std::string *level_name, LevelSettings *settings) = 0x40; method void joinMultiplayer(PingedCompatibleServer *server) = 0x165f4; diff --git a/symbols/src/gui/components/Gui.def b/symbols/src/gui/components/Gui.def index 315c037..4162907 100644 --- a/symbols/src/gui/components/Gui.def +++ b/symbols/src/gui/components/Gui.def @@ -5,13 +5,22 @@ extends GuiComponent; method void tick() = 0x27778; method void handleClick(int param_2, int param_3, int param_4) = 0x2599c; method void renderOnSelectItemNameText(int param_1, Font *font, int param_2) = 0x26aec; -method void renderToolBar(float param_1, int param_2, int param_3) = 0x26c30; +method void renderToolBar(float alpha, int slot_y, int screen_w) = 0x26c30; method void renderChatMessages(int y_offset, uint max_messages, bool disable_fading, Font *font) = 0x273d8; method void onConfigChanged(Config *config) = 0x255bc; method void addMessage(std::string *text) = 0x27820; +method void getSlotPos(int slot, int *x, int *y) = 0x25548; +method void renderSlot(int slot, int x, int y, float alpha) = 0x25cc0; +method void renderSlotText(ItemInstance *item, float x, float y, bool finite, bool shadow) = 0x25df8; property Minecraft *minecraft = 0x9f4; property float selected_item_text_timer = 0x9fc; +property int flashing_slot = 0xa2c; +property float flash_start_time = 0xa30; +property int num_slots = 0xa38; +property float slot_held_time = 0xa6c; +property int held_slot = 0xa70; // Globals -static-property float InvGuiScale = 0x135d98; \ No newline at end of file +static-property float GuiScale = 0x136d58; +static-property float InvGuiScale = 0x135d98; diff --git a/symbols/src/gui/components/GuiComponent.def b/symbols/src/gui/components/GuiComponent.def index 04fa203..d245806 100644 --- a/symbols/src/gui/components/GuiComponent.def +++ b/symbols/src/gui/components/GuiComponent.def @@ -1,2 +1,3 @@ method void blit(int x_dest, int y_dest, int x_src, int y_src, int width_dest, int height_dest, int width_src, int height_src) = 0x282a4; method void drawCenteredString(Font *font, std::string *text, int x, int y, int color) = 0x2821c; +method void fill(int x1, int y1, int x2, int y2, uint color) = 0x285f0; \ No newline at end of file diff --git a/symbols/src/item/Item.def b/symbols/src/item/Item.def index f694085..aff1010 100644 --- a/symbols/src/item/Item.def +++ b/symbols/src/item/Item.def @@ -9,6 +9,7 @@ constructor (int id) = 0x99488; virtual-method void setIcon(int texture_x, int texture_y) = 0x18; virtual-method int getIcon(int auxiliary) = 0x14; virtual-method int useOn(ItemInstance *item_instance, Player *player, Level *level, int x, int y, int z, int hit_side, float hit_x, float hit_y, float hit_z) = 0x20; +virtual-method ItemInstance *use(ItemInstance *item_instance, Level *level, Player *player) = 0x30; virtual-method void setDescriptionId(std::string *name) = 0x6c; virtual-method std::string getDescriptionId(ItemInstance *item_instance) = 0x7c; @@ -28,3 +29,4 @@ static-property Item *shears = 0x17bbf0; static-property Item *egg = 0x17bbd0; static-property Item *dye_powder = 0x17bbe0; static-property Item *camera = 0x17bc14; +static-property Item *bow = 0x17ba78; diff --git a/symbols/src/item/ItemInHandRenderer.def b/symbols/src/item/ItemInHandRenderer.def new file mode 100644 index 0000000..56fd212 --- /dev/null +++ b/symbols/src/item/ItemInHandRenderer.def @@ -0,0 +1,7 @@ +property int lastIcon = 0x0; +property int lastId = 0x4; +property ItemInstance item = 0xc; +property Minecraft *mc = 0x18; + +method void renderItem(Mob *mob, ItemInstance *item) = 0x4b824; +method void render(float param_1) = 0x4bfcc; \ No newline at end of file diff --git a/symbols/src/item/ItemRenderer.def b/symbols/src/item/ItemRenderer.def index d907dfe..a2830ce 100644 --- a/symbols/src/item/ItemRenderer.def +++ b/symbols/src/item/ItemRenderer.def @@ -1,3 +1,4 @@ static-method void renderGuiItem_one(Font *font, Textures *textures, ItemInstance *item_instance, float param_1, float param_2, bool param_3) = 0x63e58; static-method void renderGuiItem_two(Font *font, Textures *textures, ItemInstance *item_instance, float param_1, float param_2, float param_3, float param_4, bool param_5) = 0x63be0; static-method void renderGuiItemCorrect(Font *font, Textures *textures, ItemInstance *item_instance, int param_1, int param_2) = 0x639a0; +static-method void renderGuiItemDecorations(ItemInstance *item, float x, float y) = 0x63748; \ No newline at end of file diff --git a/symbols/src/level/container/FillingContainer.def b/symbols/src/level/container/FillingContainer.def index 377fc4e..ed6e0f5 100644 --- a/symbols/src/level/container/FillingContainer.def +++ b/symbols/src/level/container/FillingContainer.def @@ -5,6 +5,8 @@ virtual-method bool add(ItemInstance *item_instance) = 0x30; method void clearSlot(int slot) = 0x922f8; method void release(int slot) = 0x92058; method void compressLinkedSlotList(int slot) = 0x92280; +method ItemInstance *getLinked(int slot) = 0x92230; +virtual-method ItemInstance *getItem(int pos) = 0x8; property int *linked_slots = 0xc; property int linked_slots_length = 0x14;