Merge 1.16 into 1.18

Author: embeddedt

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

@@ -13,6 +13,8 @@ public class ModernFixConfigScreen extends Screen {
 
     public boolean madeChanges = false;
     private Button doneButton, wikiButton;
+    private double lastScrollAmount = 0;
+
     public ModernFixConfigScreen(Screen lastScreen) {
         super(new TranslatableComponent("modernfix.config"));
         this.lastScreen = lastScreen;
@@ -21,6 +23,7 @@ public ModernFixConfigScreen(Screen lastScreen) {
     @Override
     protected void init() {
         this.optionList = new OptionList(this, this.minecraft);
+        this.optionList.setScrollAmount(lastScrollAmount);
         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");
@@ -50,4 +53,8 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic
     public void renderComponentHoverEffect(PoseStack matrixStack, @Nullable Style style, int mouseX, int mouseY) {
         super.renderComponentHoverEffect(matrixStack, style, mouseX, mouseY);
     }
+
+    public void setLastScrollAmount(double d) {
+        this.lastScrollAmount = d;
+    }
 }

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

@@ -164,6 +164,7 @@ public OptionEntry(String optionName, Option option) {
             });
             updateStatus();
             this.helpButton = new Button(75, 0, 20, 20, new TextComponent("?"), (arg) -> {
+                mainScreen.setLastScrollAmount(getScrollAmount());
                 Minecraft.getInstance().setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
             });
             if(!I18n.exists("modernfix.option." + optionName)) {