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

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.14.9
 
 # Mod Properties
-    mod_version=0.4.13
+    mod_version=0.4.14
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra
 

src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java

@@ -17,7 +17,7 @@ protected CaffeineConfig createConfig() {
                 .addMixinOption("cloud", true)
                 .addMixinOption("compat", true) // Should not allow users to turn this off
                 .addMixinOption("fog", true)
-                .addMixinOption("fog.falloff", true)
+                .addMixinOption("fog_falloff", true)
                 .addMixinOption("gui", true)
                 .addMixinOption("instant_sneak", true)
                 .addMixinOption("light_updates", true)

src/main/java/me/flashyreese/mods/sodiumextra/mixin/adaptive_sync/MixinWindow.java

@@ -9,7 +9,7 @@
 
 @Mixin(Window.class)
 public class MixinWindow {
-    @Redirect(method = "setVsync", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSwapInterval(I)V"))
+    @Redirect(method = "setVsync", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSwapInterval(I)V", remap = false))
     private void setSwapInterval(int interval) {
         if (SodiumExtraClientMod.options().extraSettings.useAdaptiveSync) {
             if (GLFW.glfwExtensionSupported("GLX_EXT_swap_control_tear") || GLFW.glfwExtensionSupported("WGL_EXT_swap_control_tear")) {

src/main/java/me/flashyreese/mods/sodiumextra/mixin/compat/MixinSodiumOptionsGUI.java

@@ -12,7 +12,7 @@
 
 import java.util.List;
 
-@Mixin(SodiumOptionsGUI.class)
+@Mixin(value = SodiumOptionsGUI.class, remap = false)
 public class MixinSodiumOptionsGUI {
 
     @Shadow

src/main/java/me/flashyreese/mods/sodiumextra/mixin/fog_falloff/MixinBackgroundRenderer.java

@@ -0,0 +1,16 @@
+package me.flashyreese.mods.sodiumextra.mixin.fog_falloff;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.render.BackgroundRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(BackgroundRenderer.class)
+public class MixinBackgroundRenderer {
+    @ModifyArg(method = "applyFog", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;fogStart(F)V"), index = 0)
+    private static float modifySetShaderFogStart(float original) {
+        float fogStart = (float) SodiumExtraClientMod.options().renderSettings.fogStart / 100;
+        return original * fogStart;
+    }
+}

src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/accessibility/MixinSodiumGameOptionPages.java

@@ -19,7 +19,7 @@
 
 import java.util.List;
 
-@Mixin(SodiumGameOptionPages.class)
+@Mixin(value = SodiumGameOptionPages.class, remap = false)
 public class MixinSodiumGameOptionPages {
 
     @Shadow

src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/fast_random/MixinBlockRenderer.java

@@ -15,7 +15,7 @@
 
 import java.util.Random;
 
-@Mixin(BlockRenderer.class)
+@Mixin(value = BlockRenderer.class, remap = false)
 public class MixinBlockRenderer {
     @Shadow
     @Final

src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/resolution/MixinSodiumGameOptionPages.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Optional;
 
-@Mixin(SodiumGameOptionPages.class)
+@Mixin(value = SodiumGameOptionPages.class, remap = false)
 public class MixinSodiumGameOptionPages {
 
     @Shadow

src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/vsync/MixinSodiumGameOptionsPages.java

@@ -18,7 +18,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(SodiumGameOptionPages.class)
+@Mixin(value = SodiumGameOptionPages.class, remap = false)
 public class MixinSodiumGameOptionsPages {
     @Shadow
     @Final

src/main/resources/assets/sodium-extra/lang/cs_cz.json

@@ -168,10 +168,10 @@
   "options.particles.minecraft.soul_fire_flame.tooltip": "Appears on top of soul torches as a flame.",
   "options.particles.minecraft.spit": "Plivnutí",
   "options.particles.minecraft.spit.tooltip": "Llamas spitting at a player or mob.",
-  "options.particles.minecraft.splash": "Šplouch",
-  "options.particles.minecraft.splash.tooltip": "Emits around a spore blossom.",
   "options.particles.minecraft.spore_blossom_air": "Vzduch prášenky",
-  "options.particles.minecraft.spore_blossom_air.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
+  "options.particles.minecraft.spore_blossom_air.tooltip": "Emits around a spore blossom.",
+  "options.particles.minecraft.splash": "Šplouch",
+  "options.particles.minecraft.splash.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
   "options.particles.minecraft.squid_ink": "Inkoust z olihně",
   "options.particles.minecraft.squid_ink.tooltip": "Produced by squid when attacked.",
   "options.particles.minecraft.sweep_attack": "Plošný úder",

src/main/resources/assets/sodium-extra/lang/de_de.json

@@ -168,10 +168,10 @@
   "options.particles.minecraft.soul_fire_flame.tooltip": "Appears on top of soul torches as a flame.",
   "options.particles.minecraft.spit": "Spit",
   "options.particles.minecraft.spit.tooltip": "Llamas spitting at a player or mob.",
-  "options.particles.minecraft.splash": "Splash",
-  "options.particles.minecraft.splash.tooltip": "Emits around a spore blossom.",
   "options.particles.minecraft.spore_blossom_air": "Spore Blossom Air",
-  "options.particles.minecraft.spore_blossom_air.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
+  "options.particles.minecraft.spore_blossom_air.tooltip": "Emits around a spore blossom.",
+  "options.particles.minecraft.splash": "Splash",
+  "options.particles.minecraft.splash.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
   "options.particles.minecraft.squid_ink": "Squid Ink",
   "options.particles.minecraft.squid_ink.tooltip": "Produced by squid when attacked.",
   "options.particles.minecraft.sweep_attack": "Sweep Attack",

src/main/resources/assets/sodium-extra/lang/el_gr.json

@@ -168,10 +168,10 @@
   "options.particles.minecraft.soul_fire_flame.tooltip": "Appears on top of soul torches as a flame.",
   "options.particles.minecraft.spit": "Spit",
   "options.particles.minecraft.spit.tooltip": "Llamas spitting at a player or mob.",
-  "options.particles.minecraft.splash": "Splash",
-  "options.particles.minecraft.splash.tooltip": "Emits around a spore blossom.",
   "options.particles.minecraft.spore_blossom_air": "Spore Blossom Air",
-  "options.particles.minecraft.spore_blossom_air.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
+  "options.particles.minecraft.spore_blossom_air.tooltip": "Emits around a spore blossom.",
+  "options.particles.minecraft.splash": "Splash",
+  "options.particles.minecraft.splash.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
   "options.particles.minecraft.squid_ink": "Squid Ink",
   "options.particles.minecraft.squid_ink.tooltip": "Produced by squid when attacked.",
   "options.particles.minecraft.sweep_attack": "Sweep Attack",

src/main/resources/assets/sodium-extra/lang/es_mx.json

@@ -168,10 +168,10 @@
   "options.particles.minecraft.soul_fire_flame.tooltip": "Aparece encima de las antorchas del alma como una llama.",
   "options.particles.minecraft.spit": "Saliva",
   "options.particles.minecraft.spit.tooltip": "Llamas escupiendo a un jugador o criatura.",
-  "options.particles.minecraft.splash": "Arrojadiza",
-  "options.particles.minecraft.splash.tooltip": "Emite alrededor de una flor de esporas.",
   "options.particles.minecraft.spore_blossom_air": "Aire del Flor de Esporas",
-  "options.particles.minecraft.spore_blossom_air.tooltip": "Entidades en el agua, lobos sacudiéndose después de nadar, botes.",
+  "options.particles.minecraft.spore_blossom_air.tooltip": "Emite alrededor de una flor de esporas.",
+  "options.particles.minecraft.splash": "Arrojadiza",
+  "options.particles.minecraft.splash.tooltip": "Entidades en el agua, lobos sacudiéndose después de nadar, botes.",
   "options.particles.minecraft.squid_ink": "Tinta de calamar",
   "options.particles.minecraft.squid_ink.tooltip": "Producido por calamar cuando es atacado.",
   "options.particles.minecraft.sweep_attack": "Ataque de barrido",
@@ -281,7 +281,7 @@
   "sodium-extra.option.tutorial_toast": "Notificación de tutorial",
   "sodium-extra.option.tutorial_toast.tooltip": "Si está habilitado, se mostrarán ventanas emergentes de tutorial.",
   "sodium-extra.option.use_adaptive_sync.name": "Adaptivo",
-  "sodium-extra.option.use_adaptive_sync.tooltip": "If enabled, V-Sync will be able to swap mid-frame and disable itself at times, usually notably helping responsiveness. May cause issues with some GPU drivers.",
+  "sodium-extra.option.use_adaptive_sync.tooltip": "Si está habilitado, V-Sync podrá cambiar la fotograma media y deshabilitarse a sí mismo a veces, lo que generalmente ayuda notablemente a la tiempo de respuesta. Puede causar problemas con algunos controladores de GPU.",
   "sodium-extra.option.use_fast_random": "Utilice aleatorio rápido",
   "sodium-extra.option.use_fast_random.tooltip": "Si está habilitada, se utilizará una función aleatoria rápida para la representación de bloques. Esto puede afectar la rotación de texturas rotadas aleatoriamente en comparación con vainilla.",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",

src/main/resources/assets/sodium-extra/lang/et_ee.json

@@ -168,10 +168,10 @@
   "options.particles.minecraft.soul_fire_flame.tooltip": "Appears on top of soul torches as a flame.",
   "options.particles.minecraft.spit": "Sülg",
   "options.particles.minecraft.spit.tooltip": "Llamas spitting at a player or mob.",
-  "options.particles.minecraft.splash": "Pritsmed",
-  "options.particles.minecraft.splash.tooltip": "Emits around a spore blossom.",
   "options.particles.minecraft.spore_blossom_air": "Eoseõie õhk",
-  "options.particles.minecraft.spore_blossom_air.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
+  "options.particles.minecraft.spore_blossom_air.tooltip": "Emits around a spore blossom.",
+  "options.particles.minecraft.splash": "Pritsmed",
+  "options.particles.minecraft.splash.tooltip": "Entities in water, wolves shaking off after swimming, boats.",
   "options.particles.minecraft.squid_ink": "Kalmaari tint",
   "options.particles.minecraft.squid_ink.tooltip": "Produced by squid when attacked.",
   "options.particles.minecraft.sweep_attack": "Pühkiv rünne",