Merge branch '1.21/dev' into 1.21/stable

FlashyReese · Dec 4, 2024 · 4cc2012 · 4cc2012
2 parents 6e95271 + fe0c166
commit 4cc2012
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,19 +3,19 @@ plugins {
     id("fabric-loom") version ("1.8.9") apply (false)
 }
 
-val MINECRAFT_VERSION by extra { "1.21.3" }
-val NEOFORGE_VERSION by extra { "21.3.31-beta" }
+val MINECRAFT_VERSION by extra { "1.21.4" }
+val NEOFORGE_VERSION by extra { "21.4.2-beta" }
 val FABRIC_LOADER_VERSION by extra { "0.16.9" }
-val FABRIC_API_VERSION by extra { "0.108.0+1.21.3" }
+val FABRIC_API_VERSION by extra { "0.110.5+1.21.4" }
 
 // This value can be set to null to disable Parchment.
 val PARCHMENT_VERSION by extra { null }
 
 // https://semver.org/
 val MAVEN_GROUP by extra { "me.flashyreese.mods" }
 val ARCHIVE_NAME by extra { "reeses-sodium-options" }
-val MOD_VERSION by extra { "1.8.0" }
-val SODIUM_VERSION by extra { "mc1.21.3-0.6.0" }
+val MOD_VERSION by extra { "1.8.1" }
+val SODIUM_VERSION by extra { "mc1.21.4-0.6.2" }
 
 allprojects {
     apply(plugin = "java")

diff --git a/...lashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/...lashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java
@@ -150,6 +150,11 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         return false;
     }
 
+    @Override
+    public boolean isMouseOver(double x, double y) {
+        return this.scrollBarArea.containsCursor(x, y);
+    }
+
     public enum ScrollDirection {
         HORIZONTAL,
         VERTICAL

diff --git a/...eese/mods/reeses_sodium_options/client/gui/frame/components/SearchTextFieldComponent.java b/...eese/mods/reeses_sodium_options/client/gui/frame/components/SearchTextFieldComponent.java
@@ -149,6 +149,11 @@ public void setFocused(boolean focused) {
         this.focused = focused;
     }
 
+    @Override
+    public boolean isMouseOver(double x, double y) {
+        return this.dim.containsCursor(x, y);
+    }
+
     private void drawSelectionHighlight(GuiGraphics guiGraphics, int startX, int startY, int endX, int endY) {
         int temp;
         if (startX < endX) {

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -39,8 +39,8 @@
     }
   },
   "depends": {
-    "minecraft": ">=1.21.1",
-    "sodium": ">=0.6.0"
+    "minecraft": ">=1.21.4",
+    "sodium": ">=0.6.2"
   },
   "breaks": {
     "iris": "<1.1.4",

diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -19,14 +19,14 @@ Replaces Sodium's Options Screen
 [[dependencies.reeses_sodium_options]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21,)"
+versionRange = "[1.21.4,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.reeses_sodium_options]]
 modId = "sodium"
 type = "required"
-versionRange = "[0.6.0,)"
+versionRange = "[0.6.2,)"
 ordering = "NONE"
 side = "CLIENT"