backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-08 11:27:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(textures): remove ENABLE_JAVA_GUIS conditionals

Browse source 
Fixes entities not using the correct textures when java GUI is enabled
This commit is contained in:
Sally Knight 2026-03-16 17:24:11 +03:00
parent d6ee57f3e6
commit 6d0d4b2ed1
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/Textures/Textures.cpp
View file

@ -30,19 +30,14 @@ C4JRender::eTextureFormat Textures::TEXTURE_FORMAT =
int Textures::preLoadedIdx[TN_COUNT];
const wchar_t* Textures::preLoaded[TN_COUNT] = {
L"%blur%misc/pumpkinblur",
#ifdef ENABLE_JAVA_GUIS
L"%blur%/misc/vignette", // Not currently used
#endif
L"%clamp%misc/shadow",
#ifdef ENABLE_JAVA_GUIS
L"/achievement/bg", // Not currently used
#endif
L"art/kz",
L"environment/clouds",
L"environment/rain",
L"environment/snow",
L"gui/gui",
#ifdef ENABLE_JAVA_GUIS
L"gui/background",
L"gui/inventory",
L"gui/container",
@ -53,7 +48,6 @@ const wchar_t* Textures::preLoaded[TN_COUNT] = {
L"gui/creative_inventory/tab_inventory",
L"gui/creative_inventory/tab_item_search",
L"title/mclogo",
#endif
L"gui/icons",
L"item/arrows",
L"item/boat",

6
Minecraft.Client/Textures/Textures.h
View file

@ -15,19 +15,14 @@ class PreStitchedTextureMap;
typedef enum _TEXTURE_NAME {
TN__BLUR__MISC_PUMPKINBLUR,
#ifdef ENABLE_JAVA_GUIS
TN__BLUR__MISC_VIGNETTE, // Not currently used
#endif
TN__CLAMP__MISC_SHADOW,
#ifdef ENABLE_JAVA_GUIS
TN_ACHIEVEMENT_BG, // Not currently used
#endif
TN_ART_KZ,
TN_ENVIRONMENT_CLOUDS,
TN_ENVIRONMENT_RAIN,
TN_ENVIRONMENT_SNOW,
TN_GUI_GUI,
#ifdef ENABLE_JAVA_GUIS
TN_GUI_BACKGROUND,
TN_GUI_INVENTORY,
TN_GUI_CONTAINER,
@ -38,7 +33,6 @@ typedef enum _TEXTURE_NAME {
TN_GUI_CREATIVE_TAB_INVENTORY,
TN_GUI_CREATIVE_TAB_ITEM_SEARCH,
TN_TITLE_MCLOGO,
#endif
TN_GUI_ICONS,
TN_ITEM_ARROWS,
TN_ITEM_BOAT,