From ae2245c4bdd5563c9a3d22f64aa33d37b445808d Mon Sep 17 00:00:00 2001
From: trafficlunar <hello@trafficlunar.net>
Date: Sat, 1 Mar 2025 22:17:07 +0000
Subject: [PATCH] feat: 1.21.1 backport

---
 common/build.gradle                                    |  6 +++---
 .../optionsprofiles/gui/OptionsToggleList.java         |  6 +++---
 .../trafficlunar/optionsprofiles/gui/ProfilesList.java |  6 +++---
 fabric/build.gradle                                    |  2 +-
 fabric/src/main/resources/fabric.mod.json              |  4 ++--
 gradle.properties                                      | 10 +++++-----
 .../src/main/resources/META-INF/neoforge.mods.toml     |  4 ++--
 settings.gradle                                        |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index af61a85..2b27b3b 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -26,8 +26,8 @@ dependencies {
     modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
 
     // Mod implementations
-    modImplementation "maven.modrinth:sodium:mc1.21.4-0.6.3-fabric"             // Sodium
-    modImplementation "maven.modrinth:sodium-extra:mc1.21.4-0.6.1+fabric"       // Sodium Extra
-    modImplementation "maven.modrinth:iris:1.8.5+1.21.4-fabric"                 // Iris
+    modImplementation "maven.modrinth:sodium:mc1.21.1-0.6.9-fabric"             // Sodium
+    modImplementation "maven.modrinth:sodium-extra:mc1.21.1-0.6.0+fabric"       // Sodium Extra
+    modImplementation "maven.modrinth:iris:1.8.8+1.21.1-fabric"                 // Iris
     modImplementation "maven.modrinth:distanthorizons:2.2.1-a-1.21.1"           // Distant Horizons
 }
diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
index bf2c02f..544e046 100644
--- a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
+++ b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
@@ -70,8 +70,8 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
         }
     }
 
-    protected int scrollBarX() {
-        return super.scrollBarX() + 15;
+    protected int getScrollbarPosition() {
+        return super.getScrollbarPosition() + 15;
     }
 
     public int getRowWidth() {
@@ -113,7 +113,7 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
         public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             Font fontRenderer = OptionsToggleList.this.minecraft.font;
 
-            int posX = OptionsToggleList.this.scrollBarX() - this.toggleButton.getWidth() - 10;
+            int posX = OptionsToggleList.this.getScrollbarPosition() - this.toggleButton.getWidth() - 10;
             int posY = y - 2;
             int textY = y + entryHeight / 2;
 
diff --git a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
index e8d7d3a..dfc6e14 100644
--- a/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
+++ b/common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
@@ -58,8 +58,8 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
         this.children().forEach(ProfileEntry::checkLoaded);
     }
 
-    protected int scrollBarX() {
-        return super.scrollBarX() + 15;
+    protected int getScrollbarPosition() {
+        return super.getScrollbarPosition() + 15;
     }
 
     public int getRowWidth() {
@@ -105,7 +105,7 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
         public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             Font fontRenderer = ProfilesList.this.minecraft.font;
 
-            int posX = ProfilesList.this.scrollBarX() - this.loadButton.getWidth() - 10;
+            int posX = ProfilesList.this.getScrollbarPosition() - this.loadButton.getWidth() - 10;
             int posY = y - 2;
             int textY = y + entryHeight / 2;
 
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 40b2a2b..54094ca 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
 
     // Mod Menu API
-    modImplementation("com.terraformersmc:modmenu:13.0.2")
+    modImplementation("com.terraformersmc:modmenu:11.0.3")
 
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 51d54e5..be40daf 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -26,9 +26,9 @@
   ],
   "depends": {
     "fabricloader": ">=0.15.11",
-    "minecraft": "~1.21",
+    "minecraft": "~1.21.1",
     "java": ">=21",
-    "architectury": ">=15.0.3",
+    "architectury": ">=13.0.8",
     "fabric-api": "*"
   }
 }
diff --git a/gradle.properties b/gradle.properties
index ea1d18d..180940c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,10 +11,10 @@ archives_name=optionsprofiles
 enabled_platforms=fabric,neoforge
 
 # Minecraft properties
-minecraft_version=1.21.4
+minecraft_version=1.21.1
 
 # Dependencies
-architectury_api_version = 15.0.3
-fabric_loader_version=0.16.9
-fabric_api_version=0.111.0+1.21.4
-neoforge_version=21.4.9-beta
\ No newline at end of file
+architectury_api_version=13.0.8
+fabric_loader_version=0.16.10
+fabric_api_version=0.115.1+1.21.1
+neoforge_version=21.1.128
\ No newline at end of file
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 64ca7c9..da88ca3 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -23,14 +23,14 @@ side = "BOTH"
 [[dependencies.optionsprofiles]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21,)"
+versionRange = "[1.21.1,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.optionsprofiles]]
 modId = "architectury"
 type = "required"
-versionRange = "[15.0.3,)"
+versionRange = "[13.0.8,)"
 ordering = "AFTER"
 side = "BOTH"
 
diff --git a/settings.gradle b/settings.gradle
index e6b3bcb..624a7cf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,4 +11,4 @@ include("common")
 include("fabric")
 include("neoforge")
 
-rootProject.name = "optionsprofiles-v1.4-1.21.4"
+rootProject.name = "optionsprofiles-v1.4-1.21.1"