Skip to content

Commit 9f5ccf2

Browse files
committed
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2 parents e946cc8 + 6536c49 commit 9f5ccf2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import net.minecraft.client.gui.screens.Screen;
66
import net.minecraft.network.chat.CommonComponents;
77
import net.minecraft.network.chat.Component;
8+
import net.minecraft.Util;
89

910
public class ModernFixConfigScreen extends Screen {
1011
private OptionList optionList;
1112
private Screen lastScreen;
1213

1314
public boolean madeChanges = false;
14-
private Button doneButton;
15+
private Button doneButton, wikiButton;
1516
public ModernFixConfigScreen(Screen lastScreen) {
1617
super(Component.translatable("modernfix.config"));
1718
this.lastScreen = lastScreen;
@@ -21,9 +22,13 @@ public ModernFixConfigScreen(Screen lastScreen) {
2122
protected void init() {
2223
this.optionList = new OptionList(this, this.minecraft);
2324
this.addWidget(this.optionList);
25+
this.wikiButton = new Button.Builder(Component.translatable("modernfix.config.wiki"), (arg) -> {
26+
Util.getPlatform().openUri("https://github.com/embeddedt/ModernFix/wiki/Summary-of-Patches");
27+
}).pos(this.width / 2 - 155, this.height - 29).size(150, 20).build();
2428
this.doneButton = new Button.Builder(CommonComponents.GUI_DONE, (arg) -> {
2529
this.onClose();
26-
}).pos(this.width / 2 - 100, this.height - 29).size(200, 20).build();
30+
}).pos(this.width / 2 - 155 + 160, this.height - 29).size(150, 20).build();
31+
this.addRenderableWidget(this.wikiButton);
2732
this.addRenderableWidget(this.doneButton);
2833
}
2934

common/src/main/resources/assets/modernfix/lang/en_us.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"modernfix.perf_mod_warning": "It is recommended to install the mods, but the warning(s) can be disabled in the ModernFix config.",
99
"modernfix.config": "ModernFix mixin config",
1010
"modernfix.config.done_restart": "Done (restart required)",
11+
"modernfix.config.wiki": "Open wiki",
1112
"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.",
1213
"modernfix.option.on": "on",
1314
"modernfix.option.off": "off",

0 commit comments

Comments
 (0)