R3944Realms/ModernFix-fix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.16' into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-08-18 15:33:18 -04:00
commit 4dcb94e6a5
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java
View File

@ -1,11 +1,10 @@
package org.embeddedt.modernfix.screen;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.Util;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Style;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.network.chat.*;
import org.jetbrains.annotations.Nullable;
public class ModernFixConfigScreen extends Screen {
@ -13,7 +12,7 @@ public class ModernFixConfigScreen extends Screen {
private Screen lastScreen;
public boolean madeChanges = false;
private Button doneButton;
private Button doneButton, wikiButton;
public ModernFixConfigScreen(Screen lastScreen) {
super(new TranslatableComponent("modernfix.config"));
this.lastScreen = lastScreen;
@ -22,10 +21,17 @@ public class ModernFixConfigScreen extends Screen {
@Override
protected void init() {
this.optionList = new OptionList(this, this.minecraft);
this.addWidget(this.optionList);
this.doneButton = new Button(this.width / 2 - 100, this.height - 29, 200, 20, CommonComponents.GUI_DONE, (arg) -> {
this.onClose();
});
this.addWidget(this.optionList);
this.wikiButton = new Button(this.width / 2 - 155, this.height - 29, 150, 20, new TranslatableComponent("modernfix.config.wiki"), (arg) -> {
Util.getPlatform().openUri("https://github.com/embeddedt/ModernFix/wiki/Summary-of-Patches");
});
this.doneButton = new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, CommonComponents.GUI_DONE, (arg) -> {
this.onClose();
});
this.addRenderableWidget(this.wikiButton);
this.addRenderableWidget(this.doneButton);
}

1
common/src/main/resources/assets/modernfix/lang/en_us.json
View File

@ -8,6 +8,7 @@
"modernfix.perf_mod_warning": "It is recommended to install the mods, but the warning(s) can be disabled in the ModernFix config.",
"modernfix.config": "ModernFix mixin config",
"modernfix.config.done_restart": "Done (restart required)",
"modernfix.config.wiki": "Open wiki",
"modernfix.message.reload_config": "A mod config file change was detected. To prevent loading files that aren't done saving, reloading must be triggered by running /mfrc.",
"modernfix.option.on": "on",
"modernfix.option.off": "off",