LegacyConsole/GabsPuNs-MinecraftConsoles
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-07-13 17:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Better Water option to Mipmaps Blend

Browse Source
This commit is contained in:
GabsPuNs
2026-03-29 15:44:34 -04:00
parent a0f9d0f4d7
commit 340d1fa0f9
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.Client/Common/Consoles_App.cpp
View File

@@ -1653,21 +1653,21 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
if (graphicsLevel == 0)
{
pMinecraft->options->set(Options::Option::GRAPHICS, false);
pMinecraft->options->set(Options::Option::BETTER_WATER, false);
pMinecraft->options->set(Options::Option::MIPMAPS_BLEND, false);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, false);
pMinecraft->options->set(Options::Option::PARTICLES, 2);
}
else if (graphicsLevel == 1)
{
pMinecraft->options->set(Options::Option::GRAPHICS, false);
pMinecraft->options->set(Options::Option::BETTER_WATER, false);
pMinecraft->options->set(Options::Option::MIPMAPS_BLEND, false);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, true);
pMinecraft->options->set(Options::Option::PARTICLES, 1);
}
else if (graphicsLevel == 2)
{
pMinecraft->options->set(Options::Option::GRAPHICS, true);
pMinecraft->options->set(Options::Option::BETTER_WATER, false);
pMinecraft->options->set(Options::Option::MIPMAPS_BLEND, false);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, true);
pMinecraft->options->set(Options::Option::PARTICLES, 0);
pMinecraft->textures->reloadAll();
@@ -1675,7 +1675,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
else
{
pMinecraft->options->set(Options::Option::GRAPHICS, true);
pMinecraft->options->set(Options::Option::BETTER_WATER, true);
pMinecraft->options->set(Options::Option::MIPMAPS_BLEND, true);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, true);
pMinecraft->options->set(Options::Option::PARTICLES, 0);
pMinecraft->textures->reloadAll();

16
Minecraft.Client/Options.cpp
View File

@@ -29,7 +29,7 @@ const Options::Option Options::Option::options[18] =
Options::Option(L"options.difficulty", false, false),
Options::Option(L"options.graphics", false, false),
Options::Option(L"options.ao", false, true),
Options::Option(L"options.betterWater", false, false),
Options::Option(L"options.MipmapsBlend", false, false),
Options::Option(L"options.guiScale", false, false),
Options::Option(L"options.fov", true, false),
Options::Option(L"options.gamma", true, false),
@@ -49,7 +49,7 @@ const Options::Option *Options::Option::FRAMERATE_LIMIT = &Options::Option::opti
const Options::Option *Options::Option::DIFFICULTY = &Options::Option::options[9];
const Options::Option *Options::Option::GRAPHICS = &Options::Option::options[10];
const Options::Option *Options::Option::AMBIENT_OCCLUSION = &Options::Option::options[11];
const Options::Option *Options::Option::BETTER_WATER = &Options::Option::options[12];
const Options::Option *Options::Option::MIPMAPS_BLEND = &Options::Option::options[12];
const Options::Option *Options::Option::GUI_SCALE = &Options::Option::options[13];
const Options::Option *Options::Option::FOV = &Options::Option::options[14];
const Options::Option *Options::Option::GAMMA = &Options::Option::options[15];
@@ -121,7 +121,7 @@ void Options::init()
advancedOpengl = false;
framerateLimit = 0;
fancyGraphics = true;
betterWater = false;
MipmapsBlend = false;
ambientOcclusion = true;
renderClouds = true;
skin = L"Default";
@@ -251,9 +251,9 @@ void Options::set(const Options::Option *item, float fVal)
{
fancyGraphics = fVal;
}
if (item == Option::BETTER_WATER)
if (item == Option::MIPMAPS_BLEND)
{
betterWater = fVal;
MipmapsBlend = fVal;
}
if (item == Option::AMBIENT_OCCLUSION)
{
@@ -300,9 +300,9 @@ void Options::toggle(const Options::Option *option, int dir)
ambientOcclusion = !ambientOcclusion;
minecraft->levelRenderer->allChanged();
}
if (option == Option::BETTER_WATER)
if (option == Option::MIPMAPS_BLEND)
{
betterWater = !betterWater;
MipmapsBlend = !MipmapsBlend;
minecraft->textures->reloadAll();
}
@@ -320,7 +320,7 @@ float Options::getProgressValue(const Options::Option *item)
if (item == Option::RENDER_DISTANCE) return viewDistance;
if (item == Option::GRAPHICS) return fancyGraphics;
if (item == Option::AMBIENT_OCCLUSION) return ambientOcclusion;
if (item == Option::BETTER_WATER) return betterWater;
if (item == Option::MIPMAPS_BLEND) return MipmapsBlend;
return 0;
}

4
Minecraft.Client/Options.h
View File

@@ -28,7 +28,7 @@ public:
static const Option *DIFFICULTY;
static const Option *GRAPHICS;
static const Option *AMBIENT_OCCLUSION;
static const Option *BETTER_WATER;
static const Option *MIPMAPS_BLEND;
static const Option *GUI_SCALE;
static const Option *FOV;
static const Option *GAMMA;
@@ -69,7 +69,7 @@ public:
int framerateLimit;
bool fancyGraphics;
bool ambientOcclusion;
bool betterWater;
bool MipmapsBlend;
bool renderClouds;
wstring skin;

2
Minecraft.Client/Texture.cpp
View File

@@ -718,7 +718,7 @@ int Texture::crispBlend(int c0, int c1)
int a1 = static_cast<int>(((c1 & 0xff000000) >> 24)) & 0xff;
// continue with crisp blend if it's likely to be an opaque/cutout tile in the atlas
if (a0 >= 0xfa || a1 >= 0xfa || !Minecraft::GetInstance()->options->betterWater)
if (a0 >= 0xfa || a1 >= 0xfa || !Minecraft::GetInstance()->options->MipmapsBlend)
{
int a = 255;