diff --git a/Minecraft.Client/Textures/Textures.cpp b/Minecraft.Client/Textures/Textures.cpp index 69408c942..36799baaf 100644 --- a/Minecraft.Client/Textures/Textures.cpp +++ b/Minecraft.Client/Textures/Textures.cpp @@ -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", diff --git a/Minecraft.Client/Textures/Textures.h b/Minecraft.Client/Textures/Textures.h index e91f4d581..2ee3247ca 100644 --- a/Minecraft.Client/Textures/Textures.h +++ b/Minecraft.Client/Textures/Textures.h @@ -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,