backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(jui): use ResourceLocation for TN_GUI_GUI and TN_GUI_ICONS

Browse source
This commit is contained in:
Sally Knight 2026-03-24 06:48:07 +03:00
parent e779ab9554
commit e972d8095d
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Minecraft.Client/UI/Gui.cpp
View file

@ -31,6 +31,8 @@
ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR); ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR);
ResourceLocation Gui::GUI_GUI_LOCATION = ResourceLocation(TN_GUI_GUI);
ResourceLocation Gui::GUI_ICONS_LOCATION = ResourceLocation(TN_GUI_ICONS);
#ifdef ENABLE_JAVA_GUIS #ifdef ENABLE_JAVA_GUIS
#define RENDER_HUD 1 #define RENDER_HUD 1
@ -332,7 +334,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
if (bDisplayGui) { if (bDisplayGui) {
MemSect(31); MemSect(31);
minecraft->textures->bindTexture( minecraft->textures->bindTexture(
TN_GUI_GUI); // 4J was L"/gui/gui.png" &GUI_GUI_LOCATION); // 4J was L"/gui/gui.png"
MemSect(0); MemSect(0);
std::shared_ptr<Inventory> inventory = minecraft->player->inventory; std::shared_ptr<Inventory> inventory = minecraft->player->inventory;
@ -370,7 +372,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
MemSect(31); MemSect(31);
minecraft->textures->bindTexture( minecraft->textures->bindTexture(
TN_GUI_ICONS); // L"/gui/icons.png")); &GUI_ICONS_LOCATION); // L"/gui/icons.png"));
MemSect(0); MemSect(0);
glEnable(GL_BLEND); glEnable(GL_BLEND);
RenderManager.StateSetBlendFactor(0xffffff | RenderManager.StateSetBlendFactor(0xffffff |
@ -1221,7 +1223,8 @@ void Gui::renderTp(float br, int w, int h) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(1, 1, 1, br); glColor4f(1, 1, 1, br);
MemSect(31); MemSect(31);
minecraft->textures->bindTexture(&TextureAtlas::LOCATION_BLOCKS); // L"/terrain.png")); minecraft->textures->bindTexture(
&TextureAtlas::LOCATION_BLOCKS); // L"/terrain.png"));
MemSect(0); MemSect(0);
Icon* slot = Tile::portalTile->getTexture(Facing::UP); Icon* slot = Tile::portalTile->getTexture(Facing::UP);

2
Minecraft.Client/UI/Gui.h
View file

@ -9,6 +9,8 @@ class ItemRenderer;
class Gui : public GuiComponent { class Gui : public GuiComponent {
private: private:
static ResourceLocation PUMPKIN_BLUR_LOCATION; static ResourceLocation PUMPKIN_BLUR_LOCATION;
static ResourceLocation GUI_GUI_LOCATION;
static ResourceLocation GUI_ICONS_LOCATION;
// 4J-PB - this doesn't account for the safe zone, and the indent applied to // 4J-PB - this doesn't account for the safe zone, and the indent applied to
// messages // messages
// static const int MAX_MESSAGE_WIDTH = 320; // static const int MAX_MESSAGE_WIDTH = 320;