From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001 From: daoge <3523206925@qq.com> Date: Tue, 3 Mar 2026 03:04:10 +0800 Subject: feat: TU19 (Dec 2014) Features & Content (#155) * try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki --- Minecraft.Client/Gui.h | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'Minecraft.Client/Gui.h') diff --git a/Minecraft.Client/Gui.h b/Minecraft.Client/Gui.h index 41762016..9352308f 100644 --- a/Minecraft.Client/Gui.h +++ b/Minecraft.Client/Gui.h @@ -1,6 +1,9 @@ #pragma once +#include "ResourceLocation.h" #include "GuiComponent.h" #include "GuiMessage.h" +#include "ResourceLocation.h" + class Random; class Minecraft; class ItemRenderer; @@ -8,21 +11,22 @@ class ItemRenderer; class Gui : public GuiComponent { private: + static ResourceLocation PUMPKIN_BLUR_LOCATION; // 4J-PB - this doesn't account for the safe zone, and the indent applied to messages //static const int MAX_MESSAGE_WIDTH = 320; static const int m_iMaxMessageWidth = 280; - static ItemRenderer *itemRenderer; - vector guiMessages[XUSER_MAX_COUNT]; - Random *random; + static ItemRenderer *itemRenderer; + vector guiMessages[XUSER_MAX_COUNT]; + Random *random; - Minecraft *minecraft; + Minecraft *minecraft; public: wstring selectedName; private: int tickCount; - wstring overlayMessageString; - int overlayMessageTime; - bool animateOverlayMessageColor; + wstring overlayMessageString; + int overlayMessageTime; + bool animateOverlayMessageColor; // 4J Added float lastTickA; @@ -33,26 +37,26 @@ public: float progress; -// private DecimalFormat df = new DecimalFormat("##.00"); + // private DecimalFormat df = new DecimalFormat("##.00"); public: Gui(Minecraft *minecraft); - void render(float a, bool mouseFree, int xMouse, int yMouse); - float tbr; + void render(float a, bool mouseFree, int xMouse, int yMouse); + float tbr; private: //void renderBossHealth(void); void renderPumpkin(int w, int h); - void renderVignette(float br, int w, int h); - void renderTp(float br, int w, int h); - void renderSlot(int slot, int x, int y, float a); + void renderVignette(float br, int w, int h); + void renderTp(float br, int w, int h); + void renderSlot(int slot, int x, int y, float a); public: void tick(); - void clearMessages(int iPad=-1); - void addMessage(const wstring& string, int iPad,bool bIsDeathMessage=false); - void setNowPlaying(const wstring& string); - void displayClientMessage(int messageId, int iPad); + void clearMessages(int iPad=-1); + void addMessage(const wstring& string, int iPad,bool bIsDeathMessage=false); + void setNowPlaying(const wstring& string); + void displayClientMessage(int messageId, int iPad); // 4J Added DWORD getMessagesCount(int iPad) { return (int)guiMessages[iPad].size(); } -- cgit v1.2.3