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

build.gradle

@@ -58,7 +58,7 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}"
+    modImplementation "maven.modrinth:sodium:${project.sodium_version}"
     modImplementation("me.flashyreese.mods:reeses-sodium-options:${project.reeses_sodium_options}") {
         exclude group: "net.coderbot.iris_mc1_19", module: "iris"
     }

gradle.properties

@@ -2,17 +2,17 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
     # check these on https://modmuss50.me/fabric.html
-    minecraft_version=1.19.3
-    yarn_mappings=1.19.3+build.5
-    loader_version=0.14.14
+    minecraft_version=1.19.4
+    yarn_mappings=1.19.4+build.1
+    loader_version=0.14.17
 
 # Mod Properties
     mod_version=0.4.18
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 
 # Dependencies
-    reeses_sodium_options=1.4.7+mc1.19.2-build.59
-    sodium_version=0.4.9+build.208
-    fabric_version=0.73.2+1.19.3
+    reeses_sodium_options=1.5.0+mc1.19.4-build.72
+    sodium_version=mc1.19.4-0.4.10
+    fabric_version=0.75.3+1.19.4
     crowdin_translate=1.4+1.19.3

src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SuggestRSOScreen.java

@@ -47,7 +47,7 @@ protected void init() {
 
     @Override
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        this.renderBackgroundTexture(0);
+        this.renderBackground(matrices);
         drawTextWithShadow(matrices, this.textRenderer, HEADER, 25, 30, 0xFFFFFF);
         this.lines.drawWithShadow(matrices, 25, 70, this.textRenderer.fontHeight * 2, 0xFFFFFF);
         super.render(matrices, mouseX, mouseY, delta);

src/main/resources/fabric.mod.json

@@ -41,7 +41,7 @@
   "depends": {
     "fabricloader": ">=0.14",
     "fabric-api": "*",
-    "sodium": ">=0.4.4"
+    "sodium": ">=0.4.10"
   },
   "breaks": {
     "reeses-sodium-options": "<1.4.2"

src/main/resources/sodium-extra.mixins.json

@@ -24,7 +24,6 @@
     "render.block.entity.MixinBeaconBlockEntityRenderer",
     "render.block.entity.MixinEnchantingTableBlockEntityRenderer",
     "render.block.entity.MixinPistonBlockEntityRenderer",
-    "render.entity.MixinGuardianEntityRenderer",
     "render.entity.MixinItemFrameEntityRenderer",
     "render.entity.MixinLivingEntityRenderer",
     "render.entity.MixinPaintingEntityRenderer",