Overhaul the mods list screen

patches/net/minecraft/client/gui/screens/PauseScreen.java.patch

@@ -4,7 +4,7 @@
          } else {
              helper.addChild(this.openScreenButton(PLAYER_REPORTING, () -> new SocialInteractionsScreen(this)));
          }
-+        helper.addChild(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.setScreen(new net.neoforged.neoforge.client.gui.ModListScreen(this))).width(BUTTON_WIDTH_FULL).build(), 2);
++        helper.addChild(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.setScreen(net.neoforged.neoforge.client.gui.modlist.ModListScreen.create())).width(BUTTON_WIDTH_FULL).build(), 2);
 
          this.disconnectButton = helper.addChild(
              Button.builder(

patches/net/minecraft/client/gui/screens/TitleScreen.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/screens/TitleScreen.java
 +++ b/net/minecraft/client/gui/screens/TitleScreen.java
-@@ -104,11 +_,17 @@
+@@ -104,7 +_,7 @@
          int copyrightWidth = this.font.width(COPYRIGHT_TEXT);
          int copyrightX = this.width - copyrightWidth - 2;
          int spacing = 24;
@@ -9,16 +9,20 @@
          if (this.minecraft.isDemo()) {
              topPos = this.createDemoMenuOptions(topPos, 24);
          } else {
-             topPos = this.createNormalMenuOptions(topPos, 24);
-+            int modsOffset = SharedConstants.IS_RUNNING_IN_IDE ? 2 : -100;
-+            int modsWidth = SharedConstants.IS_RUNNING_IN_IDE ? 98 : 200;
-+            this.addRenderableWidget(new net.neoforged.neoforge.client.gui.widget.ModsButton(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.setScreen(new net.neoforged.neoforge.client.gui.ModListScreen(this)))
-+                    .pos(this.width / 2 + modsOffset, topPos + 24).size(modsWidth, 20)));
-+            if (!SharedConstants.IS_RUNNING_IN_IDE)
-+                topPos += 24; // Move down Options, Quit, Language, and Accessibility buttons to make room for mods button (in-dev the test world button "handles" this)
+@@ -112,6 +_,13 @@
          }
 
          topPos = this.createTestWorldButton(topPos, 24);
++        // Neo: Add mods button to title screen
++        if (!SharedConstants.IS_RUNNING_IN_IDE)
++            topPos += 24; // Move down other buttons to make room for mods button (in-dev the test world button "handles" this)
++        int modsOffset = SharedConstants.IS_RUNNING_IN_IDE ? 2 : -100;
++        int modsWidth = SharedConstants.IS_RUNNING_IN_IDE ? 98 : 200;
++        this.addRenderableWidget(new net.neoforged.neoforge.client.gui.widget.ModsButton(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.setScreen(net.neoforged.neoforge.client.gui.modlist.ModListScreen.create()))
++                .pos(this.width / 2 + modsOffset, topPos).size(modsWidth, 20)));
+         SpriteIconButton language = this.addRenderableWidget(
+             CommonButtons.language(
+                 20, button -> this.minecraft.setScreen(new LanguageSelectScreen(this, this.minecraft.options, this.minecraft.getLanguageManager())), true
 @@ -158,7 +_,7 @@
                  Button.builder(
                          Component.literal("Create Test World"), button -> CreateWorldScreen.testWorld(this.minecraft, () -> this.minecraft.setScreen(this))