Merge branch '1.20.x/dev' into 1.20.x/stable

gradle.properties

@@ -2,9 +2,9 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-    minecraft_version=1.20.1
-    yarn_mappings=1.20.1+build.10
-    loader_version=0.14.21
+    minecraft_version=1.20.2
+    yarn_mappings=1.20.2+build.1
+    loader_version=0.14.22
 # Mod Properties
     version_type=release
     revision=1
@@ -13,8 +13,8 @@ org.gradle.jvmargs=-Xmx1G
     archives_base_name=reeses_sodium_options
 
 # Dependency
-    sodium_version=mc1.20.1-0.5.2
+    sodium_version=mc1.20.2-0.5.3
     iris_version=1.5.2+1.19.4
 
 #Fabric api
-    fabric_version=0.86.1+1.20.1
+    fabric_version=0.89.0+1.20.2

src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java

@@ -168,7 +168,7 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim
 
     @Override
     public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-        super.renderBackground(drawContext);
+        super.renderBackground(drawContext, mouseX, mouseY, delta);
         this.updateControls();
         this.frame.render(drawContext, mouseX, mouseY, delta);
     }

src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java

@@ -174,10 +174,8 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
         return super.mouseReleased(mouseX, mouseY, button) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) || (this.canScrollVertical && this.verticalScrollBar.mouseReleased(mouseX, mouseY, button));
     }
-
-    @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return super.mouseScrolled(mouseX, mouseY, amount) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) || (this.canScrollVertical && this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount));
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)) || (this.canScrollVertical && this.verticalScrollBar.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount));
     }
 
     public static class Builder {

src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java

@@ -109,10 +109,10 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
         if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) {
             if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) {
-                int value = (int) (this.offset - amount * SCROLL_OFFSET);
+                int value = (int) (this.offset - verticalAmount * SCROLL_OFFSET); // todo: horizontal separation
                 this.setOffset(value);
                 return true;
             }

src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java

@@ -155,8 +155,8 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return super.mouseScrolled(mouseX, mouseY, amount) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount));
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount));
     }
 
     public static class Builder {

src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java

@@ -118,9 +118,9 @@ private void setValueFromMouseScroll(double amount) {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
         if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) {
-            this.setValueFromMouseScroll(amount);
+            this.setValueFromMouseScroll(verticalAmount); // todo: horizontal separation
 
             return true;
         }

src/main/resources/assets/reeses-sodium-options/lang/es_mx.json

@@ -0,0 +1,5 @@
+{
+  "rso.search_bar_empty": "Opciones de búsqueda...",
+  "modmenu.summaryTranslation.reeses-sodium-options": "Reemplaza la pantalla de opciones de Sodium",
+  "modmenu.descriptionTranslation.reeses-sodium-options": "Reemplaza la pantalla de opciones de Sodium con la intención de mejorar la experiencia del usuario"
+}

src/main/resources/assets/reeses-sodium-options/lang/it_it.json

@@ -0,0 +1,5 @@
+{
+  "rso.search_bar_empty": "Cerca impostazioni...",
+  "modmenu.summaryTranslation.reeses-sodium-options": "Rimpiazza la schermata delle impostazioni di Sodium",
+  "modmenu.descriptionTranslation.reeses-sodium-options": "Rimpiazza la schermata delle impostazioni di Sodium con l'intensione di migliorarne la UX"
+}

src/main/resources/assets/reeses-sodium-options/lang/pl_pl.json

@@ -0,0 +1,5 @@
+{
+    "rso.search_bar_empty": "Wyszukaj opcje...",
+    "modmenu.summaryTranslation.reeses-sodium-options": "Zastępuje ekran opcji Sodium.",
+    "modmenu.descriptionTranslation.reeses-sodium-options": "Zastępuje ekran opcji Sodium z zamiarem ulepszenia UX."
+}

src/main/resources/assets/reeses-sodium-options/lang/vi_vn.json

@@ -0,0 +1,5 @@
+{
+  "rso.search_bar_empty": "Tìm kiếm tùy chọn...",
+  "modmenu.summaryTranslation.reeses-sodium-options": "Thay thế màn hình tùy chọn của Sodium",
+  "modmenu.descriptionTranslation.reeses-sodium-options": "Thay thế Màn hình Tùy chọn của Sodium với ý định cải thiện trải nghiệm người dùng"
+}