LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-10-01 17:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feat/restore-java-gui

Browse Source
This commit is contained in:
Sally Knight
2026-03-16 16:04:30 +03:00
parent 0835dcb768 9748827f72
commit 97172039dd
2244 changed files with 191481 additions and 186843 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/UI/Screens/VideoSettingsScreen.cpp
+34 -41
View File
@@ -6,72 +6,65 @@
#include "ControlsScreen.h"
#include "../../../Minecraft.World/Headers/net.minecraft.locale.h"
VideoSettingsScreen::VideoSettingsScreen(Screen *lastScreen, Options *options)
{
this->title = L"Video Settings"; // 4J - added
VideoSettingsScreen::VideoSettingsScreen(Screen* lastScreen, Options* options) {
this->title = L"Video Settings"; // 4J - added
this->lastScreen = lastScreen;
this->options = options;
}
void VideoSettingsScreen::init()
{
Language *language = Language::getInstance();
void VideoSettingsScreen::init() {
Language* language = Language::getInstance();
this->title = language->getElement(L"options.videoTitle");
const Options::Option *items[10] = {
Options::Option::GRAPHICS,
Options::Option::RENDER_DISTANCE,
Options::Option::AMBIENT_OCCLUSION,
Options::Option::FRAMERATE_LIMIT,
Options::Option::ANAGLYPH,
Options::Option::VIEW_BOBBING,
Options::Option::GUI_SCALE,
Options::Option::ADVANCED_OPENGL,
Options::Option::GAMMA,
Options::Option::FOV
};
const Options::Option* items[10] = {Options::Option::GRAPHICS,
Options::Option::RENDER_DISTANCE,
Options::Option::AMBIENT_OCCLUSION,
Options::Option::FRAMERATE_LIMIT,
Options::Option::ANAGLYPH,
Options::Option::VIEW_BOBBING,
Options::Option::GUI_SCALE,
Options::Option::ADVANCED_OPENGL,
Options::Option::GAMMA,
Options::Option::FOV};
for (int i = 0; i < 10; i++)
{
const Options::Option *item = items[i];
for (int i = 0; i < 10; i++) {
const Options::Option* item = items[i];
int xPos = width / 2 - 155 + (i % 2 * 160);
int yPos = height / 6 + 24 * (i / 2);
if (!item->isProgress())
{
buttons.push_back(new SmallButton(item->getId(), xPos, yPos, item, options->getMessage(item)));
}
else
{
buttons.push_back(new SlideButton(item->getId(), xPos, yPos, item, options->getMessage(item), options->getProgressValue(item)));
if (!item->isProgress()) {
buttons.push_back(new SmallButton(item->getId(), xPos, yPos, item,
options->getMessage(item)));
} else {
buttons.push_back(new SlideButton(item->getId(), xPos, yPos, item,
options->getMessage(item),
options->getProgressValue(item)));
}
}
// buttons.add(new Button(VIDEO_BUTTON_ID, width / 2 - 100, height / 6 + 24 * 4 + 12, language.getElement("options.video")));
// buttons.add(new Button(CONTROLS_BUTTON_ID, width / 2 - 100, height / 6 + 24 * 5 + 12, language.getElement("options.controls")));
buttons.push_back(new Button(200, width / 2 - 100, height / 6 + 24 * 6, language->getElement(L"gui.done")));
// buttons.add(new Button(VIDEO_BUTTON_ID, width / 2 - 100, height /
// 6 + 24 * 4 + 12, language.getElement("options.video")));
// buttons.add(new Button(CONTROLS_BUTTON_ID, width / 2 - 100, height
// / 6 + 24 * 5 + 12, language.getElement("options.controls")));
buttons.push_back(new Button(200, width / 2 - 100, height / 6 + 24 * 6,
language->getElement(L"gui.done")));
}
void VideoSettingsScreen::buttonClicked(Button *button)
{
void VideoSettingsScreen::buttonClicked(Button* button) {
if (!button->active) return;
if (button->id < 100 && (dynamic_cast<SmallButton *>(button) != NULL))
{
options->toggle(((SmallButton *) button)->getOption(), 1);
if (button->id < 100 && (dynamic_cast<SmallButton*>(button) != NULL)) {
options->toggle(((SmallButton*)button)->getOption(), 1);
button->msg = options->getMessage(Options::Option::getItem(button->id));
return;
}
if (button->id == 200)
{
if (button->id == 200) {
minecraft->options->save();
minecraft->setScreen(lastScreen);
return;
}
}
void VideoSettingsScreen::render(int xm, int ym, float a)
{
void VideoSettingsScreen::render(int xm, int ym, float a) {
renderBackground();
drawCenteredString(font, title, width / 2, 20, 0xffffff);