From 1faeb31f20775859d54650b2e144372b3b59ada5 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Fri, 18 Mar 2022 11:17:40 +0800
Subject: [PATCH 01/20] new: Suggest Reese's Sodium Option

---
 .../client/gui/SodiumExtraGameOptions.java    | 18 ++++++
 .../client/gui/SuggestRSOScreen.java          | 56 +++++++++++++++++++
 .../mixin/compat/MixinTitleScreen.java        | 28 ++++++++++
 .../assets/sodium-extra/lang/cs_cz.json       |  4 +-
 .../assets/sodium-extra/lang/de_de.json       |  4 +-
 .../assets/sodium-extra/lang/en_us.json       |  4 +-
 .../assets/sodium-extra/lang/es_mx.json       |  4 +-
 .../assets/sodium-extra/lang/et_ee.json       |  4 +-
 .../assets/sodium-extra/lang/fr_fr.json       |  4 +-
 .../assets/sodium-extra/lang/it_it.json       |  4 +-
 .../assets/sodium-extra/lang/pt_br.json       |  4 +-
 .../assets/sodium-extra/lang/ru_ru.json       |  4 +-
 .../assets/sodium-extra/lang/th_th.json       |  4 +-
 .../assets/sodium-extra/lang/tr_TR.json       |  4 +-
 .../assets/sodium-extra/lang/zh_cn.json       |  4 +-
 src/main/resources/sodium-extra.mixins.json   |  1 +
 16 files changed, 139 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SuggestRSOScreen.java
 create mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/mixin/compat/MixinTitleScreen.java

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
index 0c1f49e6..623e9d27 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
@@ -24,7 +24,9 @@ public class SodiumExtraGameOptions {
     public final DetailSettings detailSettings = new DetailSettings();
     public final RenderSettings renderSettings = new RenderSettings();
     public final ExtraSettings extraSettings = new ExtraSettings();
+    public final NotificationSettings notificationSettings = new NotificationSettings();
     private File file;
+    private boolean suggestedRSO;
 
     public static SodiumExtraGameOptions load(File file) {
         SodiumExtraGameOptions config;
@@ -40,6 +42,7 @@ public static SodiumExtraGameOptions load(File file) {
         }
 
         config.file = file;
+        config.suggestedRSO = false;
         config.writeChanges();
 
         return config;
@@ -63,6 +66,14 @@ public void writeChanges() {
         }
     }
 
+    public boolean hasSuggestedRSO() {
+        return this.suggestedRSO;
+    }
+
+    public void setSuggestedRSO(boolean suggestedRSO) {
+        this.suggestedRSO = suggestedRSO;
+    }
+
     public enum OverlayCorner implements TextProvider {
         TOP_LEFT("sodium-extra.option.overlay_corner.top_left"),
         TOP_RIGHT("sodium-extra.option.overlay_corner.top_right"),
@@ -199,4 +210,11 @@ public ExtraSettings() {
         }
     }
 
+    public static class NotificationSettings {
+        public boolean hideRSORecommendation;
+
+        public NotificationSettings() {
+            this.hideRSORecommendation = false;
+        }
+    }
 }
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SuggestRSOScreen.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SuggestRSOScreen.java
new file mode 100644
index 00000000..51741ec4
--- /dev/null
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SuggestRSOScreen.java
@@ -0,0 +1,56 @@
+package me.flashyreese.mods.sodiumextra.client.gui;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import net.minecraft.client.font.MultilineText;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ScreenTexts;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.CheckboxWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Util;
+
+public class SuggestRSOScreen extends Screen {
+
+    private static final Text HEADER = new TranslatableText("sodium-extra.suggestRSO.header").formatted(Formatting.BOLD);
+    private static final Text MESSAGE = new TranslatableText("sodium-extra.suggestRSO.message");
+    private static final Text CHECK_MESSAGE = new TranslatableText("multiplayerWarning.check");
+    private CheckboxWidget checkbox;
+    private MultilineText lines = MultilineText.EMPTY;
+    private final Screen prevScreen;
+
+    public SuggestRSOScreen(Screen prevScreen) {
+        super(new LiteralText("Reese's Sodium Options Suggestion"));
+        this.prevScreen = prevScreen;
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        this.lines = MultilineText.create(this.textRenderer, MESSAGE, this.width - 50);
+        int i = (this.lines.count() + 1) * this.textRenderer.fontHeight * 2;
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, 130 + i, 150, 20, new LiteralText("CurseForge"), buttonWidget -> Util.getOperatingSystem().open("https://curseforge.com/minecraft/mc-mods/reeses-sodium-options")));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155 + 160, 130 + i, 150, 20, new LiteralText("Modrinth"), buttonWidget -> Util.getOperatingSystem().open("https://modrinth.com/mod/reeses-sodium-options")));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, 100 + i, 150, 20, ScreenTexts.PROCEED, buttonWidget -> {
+            if (this.checkbox.isChecked()) {
+                SodiumExtraClientMod.options().notificationSettings.hideRSORecommendation = true;
+                SodiumExtraClientMod.options().writeChanges();
+            }
+            this.client.setScreen(this.prevScreen);
+        }));
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 155 + 160, 100 + i, 150, 20, new TranslatableText("menu.quit"), buttonWidget -> this.client.scheduleStop()));
+        this.checkbox = new CheckboxWidget(this.width / 2 - 155 + 80, 76 + i, 150, 20, CHECK_MESSAGE, false);
+        this.addDrawableChild(this.checkbox);
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        this.renderBackgroundTexture(0);
+        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);
+    }
+}
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/compat/MixinTitleScreen.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/compat/MixinTitleScreen.java
new file mode 100644
index 00000000..e65f2f6c
--- /dev/null
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/compat/MixinTitleScreen.java
@@ -0,0 +1,28 @@
+package me.flashyreese.mods.sodiumextra.mixin.compat;
+
+import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
+import me.flashyreese.mods.sodiumextra.client.gui.SuggestRSOScreen;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.TitleScreen;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(TitleScreen.class)
+public abstract class MixinTitleScreen extends Screen {
+
+    protected MixinTitleScreen(Text title) {
+        super(title);
+    }
+
+    @Inject(method = "init", at = @At(value = "RETURN"))
+    private void postInit(CallbackInfo ci) {
+        if (!FabricLoader.getInstance().isModLoaded("reeses-sodium-options") && !SodiumExtraClientMod.options().notificationSettings.hideRSORecommendation && !SodiumExtraClientMod.options().hasSuggestedRSO()) {
+            this.client.setScreen(new SuggestRSOScreen(this));
+            SodiumExtraClientMod.options().setSuggestedRSO(true);
+        }
+    }
+}
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
index fe7d58aa..0ac4437b 100644
--- a/src/main/resources/assets/sodium-extra/lang/cs_cz.json
+++ b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Přepnout částice vody",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / prům. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / prům. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
index 9c02fbb9..6e3882da 100644
--- a/src/main/resources/assets/sodium-extra/lang/de_de.json
+++ b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Wasserpartikel umschalten",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
index 7f83de6a..6cc6fff7 100644
--- a/src/main/resources/assets/sodium-extra/lang/en_us.json
+++ b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "If enabled, water particles are processed.",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
index a01ccad6..4ed4fb39 100644
--- a/src/main/resources/assets/sodium-extra/lang/es_mx.json
+++ b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Si está habilitado, se procesan las partículas de agua.",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / prom. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / prom. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Sugerencia: Instale Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "Se recomienda enfáticamente que instale Reese's Sodium Options junto con Sodium Extra. Debido a la creciente cantidad de funciones, ya no encaja correctamente en las opciones de video de Sodium."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index 053f89b1..44bed9e3 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Lülita veeosakesed sisse/välja",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s k/s",
-  "sodium-extra.overlay.fps_extended": "(max. %s / kesk. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / kesk. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
index 9c556b14..443af6d6 100644
--- a/src/main/resources/assets/sodium-extra/lang/fr_fr.json
+++ b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Activer les particules de l'eau",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / moy. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / moy. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
index 19ac989b..e37fbb71 100644
--- a/src/main/resources/assets/sodium-extra/lang/it_it.json
+++ b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Attiva/disattiva le particelle dell'acqua",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / med. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / med. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
index 3b37e05d..c2b52530 100644
--- a/src/main/resources/assets/sodium-extra/lang/pt_br.json
+++ b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Alterna as partículas de água",
   "sodium-extra.overlay.coordinates": "%s  %s  %s",
   "sodium-extra.overlay.fps": "Taxa de quadros: %s",
-  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 8c4db540..65cbf944 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Переключение частиц воды",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(макс. %s / сред. %s / мин. %s)"
+  "sodium-extra.overlay.fps_extended": "(макс. %s / сред. %s / мин. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
index 5ff04269..4fe280fa 100644
--- a/src/main/resources/assets/sodium-extra/lang/th_th.json
+++ b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "ถ้าเปิดตัวเลือกนี้ อนุภาคจากน้ำจะทำงาน",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(สูง %s / กลาง %s / ต่ำ %s)"
+  "sodium-extra.overlay.fps_extended": "(สูง %s / กลาง %s / ต่ำ %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index 0a1d48e3..cdd2a672 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Su parçacıkları için aç/kapa",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(mak. %s / ort. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(mak. %s / ort. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 851a1fd4..01176495 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "开启或关闭水面粒子效果",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
diff --git a/src/main/resources/sodium-extra.mixins.json b/src/main/resources/sodium-extra.mixins.json
index 522a80ce..f44a052d 100644
--- a/src/main/resources/sodium-extra.mixins.json
+++ b/src/main/resources/sodium-extra.mixins.json
@@ -11,6 +11,7 @@
     "biome_colors.MixinBiomeColors",
     "cloud.MixinWorldRenderer",
     "compat.MixinSodiumOptionsGUI",
+    "compat.MixinTitleScreen",
     "entity.MixinGuardianEntityRenderer",
     "entity.MixinItemFrameEntityRenderer",
     "entity.MixinLivingEntityRenderer",

From 73dbc5db5ab1f9838facf48beccdcbdc95a2241e Mon Sep 17 00:00:00 2001
From: 7777777_4547 <83630775+7777777-4547@users.noreply.github.com>
Date: Fri, 18 Mar 2022 11:26:14 +0800
Subject: [PATCH 02/20] change: Update zh_cn.json for 1.17.1 (#161)

* Update zh_cn.json

* Update zh_cn.json
---
 src/main/resources/assets/sodium-extra/lang/zh_cn.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 01176495..12b049ee 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -25,8 +25,8 @@
   "sodium-extra.option.fireworks.tooltip": "开启或关闭烟花粒子效果",
   "sodium-extra.option.fog": "迷雾",
   "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离.\n0 - 使用原版的迷雾设置\n1-32 - 以方块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL调试输出",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "调试输出是OpenGL的一个功能，它使得调试和优化OpenGL应用程序更加容易。简而言之，该功能为驱动程序提供了一种将文本信息返回给应用程序的方法。\n修改此选项需要重新启动游戏。",
   "sodium-extra.option.instant_sneak": "直接潜行",
   "sodium-extra.option.instant_sneak.tooltip": "潜行时视角直接下移而不是缓慢地",
   "sodium-extra.option.item_frames.tooltip": "开启或关闭显示物品展示框",

From 6365aea021c2d61e8ecc850c5bd9bc8222d24657 Mon Sep 17 00:00:00 2001
From: EuropaYou <53128780+EuropaYou@users.noreply.github.com>
Date: Fri, 18 Mar 2022 06:25:38 +0300
Subject: [PATCH 03/20] change: Improved Turkish translation (#163)

Co-authored-by: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
---
 .../assets/sodium-extra/lang/tr_TR.json       | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index cdd2a672..e4d1cd8b 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -1,35 +1,35 @@
 {
-  "sodium-extra.option.animate_fire.tooltip": "Ateş animasyonu için aç/kapa",
-  "sodium-extra.option.animate_lava.tooltip": "Lav animasyonu için aç/kapa",
-  "sodium-extra.option.animate_portal.tooltip": "Portal animasyonu için aç/kapa",
-  "sodium-extra.option.animate_water.tooltip": "Su animasyonu için aç/kapa",
+  "sodium-extra.option.animate_fire.tooltip": "Ateş animasyonunu aç/kapa",
+  "sodium-extra.option.animate_lava.tooltip": "Lav animasyonunu aç/kapa",
+  "sodium-extra.option.animate_portal.tooltip": "Portal animasyonunu aç/kapa",
+  "sodium-extra.option.animate_water.tooltip": "Su animasyonunu aç/kapa",
   "sodium-extra.option.animations": "Animasyonlar",
   "sodium-extra.option.animations_all.tooltip": "Tüm animasyonları aç/kapa",
-  "sodium-extra.option.armor_stands.tooltip": "Zırh askılarını göstermek için aç/kapa",
+  "sodium-extra.option.armor_stands.tooltip": "Zırh askılarını işlemeyi aç/kapa",
   "sodium-extra.option.biome_colors": "Biyom Renkleri",
   "sodium-extra.option.biome_colors.tooltip": "Biyoma göre değişen biyom renkleri",
   "sodium-extra.option.block_animations": "Blok Animasyonları",
   "sodium-extra.option.block_animations.tooltip": "Blok animasyonlarını işler",
   "sodium-extra.option.block_break.tooltip": "Blok kırma parçacıklarını işler",
   "sodium-extra.option.block_breaking.tooltip": "Kırılmış blok parçacıklarını işler",
-  "sodium-extra.option.bubbles.tooltip": "Baloncuk parçacıkları için aç/kapa",
+  "sodium-extra.option.bubbles.tooltip": "Baloncuk parçacıklarını aç/kapa",
   "sodium-extra.option.cloud_height": "Bulut Yüksekliği",
   "sodium-extra.option.cloud_height.tooltip": "Bulutların yüksekliğini ayarlar",
-  "sodium-extra.option.composter.tooltip": "Gübre varil parçacıkları için aç/kapa",
+  "sodium-extra.option.composter.tooltip": "Gübre varil parçacıklarını aç/kapa",
   "sodium-extra.option.details": "Detaylar",
   "sodium-extra.option.dripping_particles": "Damlama parçacıkları",
-  "sodium-extra.option.dripping_particles.tooltip": "Damlama parçacıkları için aç/kapa",
-  "sodium-extra.option.environment.tooltip": "Çevre parçacıkları için aç/kapa",
-  "sodium-extra.option.explosions.tooltip": "Patlama parçacıkları için aç/kapa",
+  "sodium-extra.option.dripping_particles.tooltip": "Damlama parçacıklarını aç/kapa",
+  "sodium-extra.option.environment.tooltip": "Çevre parçacıklarını aç/kapa",
+  "sodium-extra.option.explosions.tooltip": "Patlama parçacıklarını aç/kapa",
   "sodium-extra.option.extras": "Ekstralar",
-  "sodium-extra.option.fireworks.tooltip": "Havai fişek parçacıkları için aç/kapa",
+  "sodium-extra.option.fireworks.tooltip": "Havai fişek parçacıklarını aç/kapa",
   "sodium-extra.option.fog": "Sis",
   "sodium-extra.option.fog.tooltip": "Arazideki sis efekt menzilini ayarlar. \n0 - varsayılan sis ayarlarını kullan\n1-32 - yığın (chunk) olarak sis menzili ayarla\n33 - maksimum sis menzili (bir bakıma sisi devre dışı bırakır)",
-  "sodium-extra.option.gl_debug_verbosity": "OpenGL Debug Output",
-  "sodium-extra.option.gl_debug_verbosity.tooltip": "Debug Output is an OpenGL feature that makes debugging and optimizing OpenGL applications easier. Briefly, this feature provides a method for the driver to provide textual message information back to the application.\nModifying this option will require a game restart.",
+  "sodium-extra.option.gl_debug_verbosity": "OpenGL Hata Ayıklama Çıktısı",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Hata Ayıklama Çıktısı, OpenGL uygulamalarında hata ayıklamayı ve optimize etmeyi kolaylaştıran bir OpenGL özelliğidir. Kısaca, bu özellik, sürücünün uygulamaya metinsel mesaj bilgilerini geri sağlaması için bir yöntem sağlar.\nBu seçeneğin değiştirilmesi, oyunun yeniden başlatılmasını gerektirir.",
   "sodium-extra.option.instant_sneak": "Hızlı Eğilme",
   "sodium-extra.option.instant_sneak.tooltip": "Eğilirken kameraya lineer enterpolasyon yapma",
-  "sodium-extra.option.item_frames.tooltip": "Eşya çerçevelerini göstermek için aç/kapa",
+  "sodium-extra.option.item_frames.tooltip": "Eşya çerçevelerini işlemeyi aç/kapa",
   "sodium-extra.option.light_updates": "Işık Güncellemeleri",
   "sodium-extra.option.light_updates.tooltip": "Işık güncellemelerini işler",
   "sodium-extra.option.overlay_corner": "Katman Köşesi",
@@ -38,15 +38,15 @@
   "sodium-extra.option.overlay_corner.tooltip": "Katmanın (FPS ve koordinatların) ekranın hangi köşesinde görüntüleneceğini belirler",
   "sodium-extra.option.overlay_corner.top_left": "Sol Üst",
   "sodium-extra.option.overlay_corner.top_right": "Sağ Üst",
-  "sodium-extra.option.paintings.tooltip": "Resim tablolarını göstermek için aç/kapa",
+  "sodium-extra.option.paintings.tooltip": "Resim tablolarını işlemeyi aç/kapa",
   "sodium-extra.option.particles_all.tooltip": "Tüm parçacıkları aç/kapa",
   "sodium-extra.option.piston.tooltip": "Piston animasyonlarını işle",
-  "sodium-extra.option.portal.tooltip": "Portal parçacıkları için aç/kapa",
-  "sodium-extra.option.potions.tooltip": "İksir parçacıkları için aç/kapa",
+  "sodium-extra.option.portal.tooltip": "Portal parçacıklarını aç/kapa",
+  "sodium-extra.option.potions.tooltip": "İksir parçacıklarını aç/kapa",
   "sodium-extra.option.prevent_shaders": "Shader Engelle",
   "sodium-extra.option.prevent_shaders.tooltip": "Herhangi bir shader'ın yüklenmesini önler",
-  "sodium-extra.option.rain_snow.tooltip": "Yağmur ve kar için aç/kapa",
-  "sodium-extra.option.rain_splash.tooltip": "Yağmur düşme parçacıkları için aç/kapa",
+  "sodium-extra.option.rain_snow.tooltip": "Yağmur ve kar efektlerini aç/kapa",
+  "sodium-extra.option.rain_splash.tooltip": "Yağmur düşme parçacıklarını aç/kapa",
   "sodium-extra.option.redstone.tooltip": "Kızıltaş parçacıkları için aç/kapa",
   "sodium-extra.option.reduce_resolution_on_mac": "macOS üzerinde çözünürlüğü azalt",
   "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Retine ekranlarda yarı çözünürlük kullanır, bunu yaparak macOS'ta oldukça performansı arttırır.\nBu ayarı değiştirmek oyunu yeniden başlatmayı gerektirecektir.",
@@ -58,25 +58,25 @@
   "sodium-extra.option.show_fps.tooltip": "Sol üst köşede mak. ortalama ve min. FPS'i göster",
   "sodium-extra.option.show_fps_extended": "Gelişmiş FPS'i Göster",
   "sodium-extra.option.show_fps_extended.tooltip": "Katmanda min, ortalama ve mak. FPS'i göster",
-  "sodium-extra.option.sky": "Sky",
-  "sodium-extra.option.sky.tooltip": "If enabled, the sky will be rendered.",
-  "sodium-extra.option.sky_colors": "Gök Renkleri",
-  "sodium-extra.option.sky_colors.tooltip": "Biyoma göre gök renklerinin değişmesini sağlar",
+  "sodium-extra.option.sky": "Gökyüzü",
+  "sodium-extra.option.sky.tooltip": "Etkinleştirilirse, gökyüzü işlenecektir.",
+  "sodium-extra.option.sky_colors": "Gökyüzü Renkleri",
+  "sodium-extra.option.sky_colors.tooltip": "Biyoma göre gökyüzünün renklerinin değişmesini sağlar",
   "sodium-extra.option.smoke": "Duman",
-  "sodium-extra.option.smoke.tooltip": "Duman parçacıkları için aç/kapa",
-  "sodium-extra.option.stars": "Stars",
-  "sodium-extra.option.stars.tooltip": "If enabled, the stars will be rendered.",
-  "sodium-extra.option.sun_moon": "Sun & Moon",
-  "sodium-extra.option.sun_moon.tooltip": "If enabled, the sun and moon will be rendered.",
+  "sodium-extra.option.smoke.tooltip": "Duman parçacıklarını aç/kapa",
+  "sodium-extra.option.stars": "Yıldızlar",
+  "sodium-extra.option.stars.tooltip": "Etkinleştirilirse, yıldızlar işlenecektir.",
+  "sodium-extra.option.sun_moon": "Güneş ve Ay",
+  "sodium-extra.option.sun_moon.tooltip": "Etkinleştirilirse, güneş ve ay işlenecektir.",
   "sodium-extra.option.toasts": "Bildirim Kutucuğu",
   "sodium-extra.option.toasts.tooltip": "Gelişim ve üretim tarif bildirimleri",
   "sodium-extra.option.use_fast_random": "Hızlı Olasılık Dağılımı Kullan",
   "sodium-extra.option.use_fast_random.tooltip": "Etkin ise, bir hızlı olasılık dağılım fonksiyonu blok görüntülemesi için kullanılacak. Bu ayar, vanillaya göre rastgele döndürülmüş dokuların rotasyonunu etkileyecektir.",
-  "sodium-extra.option.villagers.tooltip": "Köylülerin parçacıkları için aç/kapa",
-  "sodium-extra.option.water.tooltip": "Su parçacıkları için aç/kapa",
+  "sodium-extra.option.villagers.tooltip": "Köylülerin parçacıklarını aç/kapa",
+  "sodium-extra.option.water.tooltip": "Su parçacıklarını aç/kapa",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(mak. %s / ort. %s / min. %s)",
   "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
   "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
-}
\ No newline at end of file
+}

From 853465c5a9afdb7c318d6ae3a272e2c32595a9f6 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Wed, 23 Mar 2022 12:48:32 +0800
Subject: [PATCH 04/20] change: Use static FPS accessor

---
 .../mods/sodiumextra/client/ClientTickHandler.java            | 2 +-
 .../mods/sodiumextra/mixin/gui/MinecraftClientAccessor.java   | 4 +++-
 .../mods/sodiumextra/mixin/gui/MixinInGameHud.java            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/ClientTickHandler.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/ClientTickHandler.java
index b40b3f10..ee7d5f14 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/ClientTickHandler.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/ClientTickHandler.java
@@ -11,7 +11,7 @@ public class ClientTickHandler {
 
     public void onClientInitialize() {
         ClientTickEvents.START_CLIENT_TICK.register(minecraftClient -> {
-            int currentFPS = ((MinecraftClientAccessor) minecraftClient).getCurrentFPS();
+            int currentFPS = MinecraftClientAccessor.getCurrentFPS();
             this.averageFps.add(currentFPS);
         });
     }
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MinecraftClientAccessor.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MinecraftClientAccessor.java
index 5df86a93..22338b08 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MinecraftClientAccessor.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MinecraftClientAccessor.java
@@ -7,5 +7,7 @@
 @Mixin(MinecraftClient.class)
 public interface MinecraftClientAccessor {
     @Accessor("currentFps")
-    int getCurrentFPS();
+    static int getCurrentFPS() {
+        return 0;
+    }
 }
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java
index dd1a5694..2eb0cec5 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/gui/MixinInGameHud.java
@@ -44,7 +44,7 @@ public void render(MatrixStack matrices, float tickDelta, CallbackInfo callbackI
 
     //Should I make this OOP or just leave as it :> I don't think I will be adding any more than these 2.
     private void renderFPS(MatrixStack matrices) {
-        int currentFPS = ((MinecraftClientAccessor) this.client).getCurrentFPS();
+        int currentFPS = MinecraftClientAccessor.getCurrentFPS();
 
         Text text = new TranslatableText("sodium-extra.overlay.fps", currentFPS);
 

From 88ce78e50802ccd1b5701fee2a678b1d4c816d76 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Wed, 23 Mar 2022 12:49:24 +0800
Subject: [PATCH 05/20] change: Enable resolution mixing for RSO when present

---
 .../mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
index f9780ddf..13c9bcc6 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
@@ -30,7 +30,7 @@ protected CaffeineConfig createConfig() {
                 .addMixinOption("sodium.fast_random", true)
                 .addMixinOption("sodium.gui_scale", true)
                 .addMixinOption("sodium.resolution", true)
-                .addMixinOption("sodium.resolution.reeses_sodium_options", true) // whacky packaging
+                .addMixinOption("sodium.resolution.reeses_sodium_options", FabricLoader.getInstance().isModLoaded("reeses-sodium-options"))
                 .addMixinOption("stars", true)
                 .addMixinOption("sun_moon", true)
                 .addMixinOption("toasts", true)

From 203114f5076095cce3b92eb2f1e7df16297f87dc Mon Sep 17 00:00:00 2001
From: jogurciQ <58147676+jogurciQ@users.noreply.github.com>
Date: Wed, 23 Mar 2022 05:50:34 +0100
Subject: [PATCH 06/20] new Added polish translation (#167)

---
 .../assets/sodium-extra/lang/pl_pl.json       | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 src/main/resources/assets/sodium-extra/lang/pl_pl.json

diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
new file mode 100644
index 00000000..87d363e7
--- /dev/null
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -0,0 +1,80 @@
+{
+  "sodium-extra.option.animate_fire.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje ognia.",
+  "sodium-extra.option.animate_lava.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje lawy.",
+  "sodium-extra.option.animate_portal.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje portali.",
+  "sodium-extra.option.animate_water.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje wody.",
+  "sodium-extra.option.animations": "Animacje",
+  "sodium-extra.option.animations_all.tooltip": "Jeśli ta opcja jest włączona, animacje są przetwarzane.",
+  "sodium-extra.option.armor_stands.tooltip": "Jeśli ta opcja jest włączona, stojaki na zbroje są renderowane.",
+  "sodium-extra.option.biome_colors": "Korory biomów",
+  "sodium-extra.option.biome_colors.tooltip": "Jeśli ta opcja jest włączona, kolory biomów zmieniają się w zależności od biomu.",
+  "sodium-extra.option.block_animations": "Animacje bloków",
+  "sodium-extra.option.block_animations.tooltip": "Jeśli ta opcja jest włączona, animacje bloków są przetwarzane.",
+  "sodium-extra.option.block_break.tooltip": "Jeśli ta opcja jest włączona, animacje niszczenia bloków są przetwarzane.",
+  "sodium-extra.option.block_breaking.tooltip": "Jeśli ta opcja jest włączona, cząstki niszczenia bloków są przetwarzane.",
+  "sodium-extra.option.bubbles.tooltip": "Jeśli ta opcja jest włączona, cząstki bąbelków są przetwarzane.",
+  "sodium-extra.option.cloud_height": "Wysokość chmur",
+  "sodium-extra.option.cloud_height.tooltip": "Steruje wysokością renderowanych chmur.",
+  "sodium-extra.option.composter.tooltip": "Jeśli ta opcja jest włączona, cząstki kompostowników są przetwarzane.",
+  "sodium-extra.option.details": "Detale",
+  "sodium-extra.option.dripping_particles": "Cząstki kapania",
+  "sodium-extra.option.dripping_particles.tooltip": "Jeśli ta opcja jest włączona, cząstki kapania są przetwarzane.",
+  "sodium-extra.option.environment.tooltip": "Jeśli ta opcja jest włączona, cząstki otoczenia są przetwarzane.",
+  "sodium-extra.option.explosions.tooltip": "Jeśli ta opcja jest włączona, cząstki wybuchów są przetwarzane",
+  "sodium-extra.option.extras": "Dodatki",
+  "sodium-extra.option.fireworks.tooltip": "Jeśli ta opcja jest włączona, cząstki fajerwerków są przetwarzane.",
+  "sodium-extra.option.fog": "Mgła",
+  "sodium-extra.option.fog.tooltip": "Dostosowuje odległość efektu mgły na terenie. \n0 - użyj ustawień domyślnej mgły\n1-32 - ustaw odległość mgły w chunkach\n33 - maksymalna odległość mgły (zasadniczo wyłącza mgłę)",
+  "sodium-extra.option.gl_debug_verbosity": "Wyjście debugowania OpenGL",
+  "sodium-extra.option.gl_debug_verbosity.tooltip": "Wyjście debugowania to funkcja OpenGL, która ułatwia debugowanie i optymalizację aplikacji OpenGL. Krótko mówiąc, ta funkcja umożliwia sterownikowi dostarczenie informacji tekstowych z powrotem do aplikacji.\nZmiana tej opcji będzie wymagać ponownego uruchomienia gry.",
+  "sodium-extra.option.instant_sneak": "Natychmiastowe skradanie się",
+  "sodium-extra.option.instant_sneak.tooltip": "Jeśli ta opcja jest włączona, kamera nie będzie się płynnie obniżać przy skradaniu.",
+  "sodium-extra.option.item_frames.tooltip": "Jeśli ta opcja jest włączona, przedmioty są renderowane.",
+  "sodium-extra.option.light_updates": "Aktualizacje oświetlenia",
+  "sodium-extra.option.light_updates.tooltip": "Jeśli ta opcja jest włączona, aktualizacje oświetlenia są przetwarzane. Jeśli jest wyłączona, może to wpłynąć na oświetlenie podczas generowania nowych chunków. Wyłącz to tylko wtedy, gdy wiesz, co robisz. ",
+  "sodium-extra.option.overlay_corner": "Róg nakładki",
+  "sodium-extra.option.overlay_corner.bottom_left": "Lewy dolny",
+  "sodium-extra.option.overlay_corner.bottom_right": "Prawy dolny",
+  "sodium-extra.option.overlay_corner.tooltip": "Określa, w którym rogu ekranu zostanie wyrenderowana nakładka (FPS i współrzędne).",
+  "sodium-extra.option.overlay_corner.top_left": "Lewy górny",
+  "sodium-extra.option.overlay_corner.top_right": "Prawy górny",
+  "sodium-extra.option.paintings.tooltip": "Jeśli ta opcja jest włączona, obrazy są renderowane.",
+  "sodium-extra.option.particles_all.tooltip": "Jeśli ta opcja jest włączona, cząstki są renderowane.",
+  "sodium-extra.option.piston.tooltip": "Jeśli ta opcja jest włączona, animacje wysuwania się tłoków są przetwarzane.",
+  "sodium-extra.option.portal.tooltip": "Jeśli ta opcja jest włączona, cząstki portali są przetwarzane.",
+  "sodium-extra.option.potions.tooltip": "Jeśli ta opcja jest włączona, cząstki mikstur są przetwarzane.",
+  "sodium-extra.option.prevent_shaders": "Zapobiegaj shaderom ",
+  "sodium-extra.option.prevent_shaders.tooltip": "Jeśli ta opcja jest włączona, ładowanie domyślnych shaderów nie będzie możliwe. ",
+  "sodium-extra.option.rain_snow.tooltip": "Jeśli ta opcja jest włączona, deszcz i śnieg są przetwarzane.",
+  "sodium-extra.option.rain_splash.tooltip": "Jeśli ta opcja jest włączona, cząstki rozprysku deszczu są przetwarzane.",
+  "sodium-extra.option.redstone.tooltip": "Jeśli ta opcja jest włączona, cząstki redstone'a są przetwarzane.",
+  "sodium-extra.option.reduce_resolution_on_mac": "Zmniejsz rozdzielczość na macOS",
+  "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Użyj połowy rozdzielczości na wyświetlaczach Retina, znacznie poprawiając wydajność na systemie macOS.\nZmiana tej opcji będzie wymagać ponownego uruchomienia gry.",
+  "sodium-extra.option.render": "Renderowanie",
+  "sodium-extra.option.resolution.tooltip": "Określa rozdzielczość gry w trybie pełnoekranowym.",
+  "sodium-extra.option.show_coordinates": "Pokaż współrzędne",
+  "sodium-extra.option.show_coordinates.tooltip": "Wyświetla współrzędne gracza na nakładce.",
+  "sodium-extra.option.show_fps": "Pokaż FPS",
+  "sodium-extra.option.show_fps.tooltip": "Wyświetla aktualną liczbę klatek na sekundę w grze na nakładce.",
+  "sodium-extra.option.show_fps_extended": "Pokaż FPS (rozszerzone)",
+  "sodium-extra.option.show_fps_extended.tooltip": "Wyświetla dodatkowe informacje (maksymalna, średnia i minimalna liczba klatek na sekundę) wraz z bieżącą liczbą klatek na sekundę na nakładce.",
+  "sodium-extra.option.sky": "Niebo",
+  "sodium-extra.option.sky.tooltip": "Jeśli ta opcja jest włączona, niebo będzie renderowane.",
+  "sodium-extra.option.sky_colors": "Kolory nieba",
+  "sodium-extra.option.sky_colors.tooltip": "Jeśli ta opcja jest włączona, kolory nieba zmieniają się w zależności od biomu.",
+  "sodium-extra.option.smoke": "Dym",
+  "sodium-extra.option.smoke.tooltip": "Jeśli ta opcja jest włączona, smoke particles są przetwarzane.",
+  "sodium-extra.option.stars": "Gwiazdy",
+  "sodium-extra.option.stars.tooltip": "Jeśli ta opcja jest włączona, the stars will be rendered.",
+  "sodium-extra.option.sun_moon": "Słońce i księżyc",
+  "sodium-extra.option.sun_moon.tooltip": "Jeśli ta opcja jest włączona, the sun and moon will be rendered.",
+  "sodium-extra.option.toasts": "Wyskakujące powiadomienia",
+  "sodium-extra.option.toasts.tooltip": "Jeśli ta opcja jest włączona, wyskakujące powiadomienia o postępach i recepturach będą wyświetlane.",
+  "sodium-extra.option.use_fast_random": "Użyj szybkiej losowości",
+  "sodium-extra.option.use_fast_random.tooltip": "Jeśli ta opcja jest włączona, do renderowania bloków zostanie użyta szybka funkcja losowa. Może to wpłynąć na rotację losowo obracanych tekstur w porównaniu z domyślnym ustawieniem.",
+  "sodium-extra.option.villagers.tooltip": "Jeśli ta opcja jest włączona, cząstki osadników są przetwarzane.",
+  "sodium-extra.option.water.tooltip": "Jeśli ta opcja jest włączona, cząstki wody są przetwarzane.",
+  "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
+  "sodium-extra.overlay.fps": "%s FPS",
+  "sodium-extra.overlay.fps_extended": "(maks. %s / śr. %s / min. %s)"
+}
\ No newline at end of file

From 4d01353e2f439dde7f250b9a37fe158bd66cce02 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:17:17 +0800
Subject: [PATCH 07/20] change: Add missing Polish translation strings

---
 src/main/resources/assets/sodium-extra/lang/pl_pl.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 87d363e7..51a4a49e 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -76,5 +76,7 @@
   "sodium-extra.option.water.tooltip": "Jeśli ta opcja jest włączona, cząstki wody są przetwarzane.",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
-  "sodium-extra.overlay.fps_extended": "(maks. %s / śr. %s / min. %s)"
+  "sodium-extra.overlay.fps_extended": "(maks. %s / śr. %s / min. %s)",
+  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
 }
\ No newline at end of file

From 9f431ef6fa58baebcd4b9b81afba86a2580ce1bd Mon Sep 17 00:00:00 2001
From: 7777777_4547 <83630775+7777777-4547@users.noreply.github.com>
Date: Thu, 24 Mar 2022 13:53:22 +0800
Subject: [PATCH 08/20] change: Update zh_cn.json for 1.17.1 (#171)

* Update zh_cn.json

* Update zh_cn.json

* Update zh_cn.json
---
 .../resources/assets/sodium-extra/lang/zh_cn.json    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 12b049ee..35a272bd 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -24,7 +24,7 @@
   "sodium-extra.option.extras": "其他",
   "sodium-extra.option.fireworks.tooltip": "开启或关闭烟花粒子效果",
   "sodium-extra.option.fog": "迷雾",
-  "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离.\n0 - 使用原版的迷雾设置\n1-32 - 以方块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
+  "sodium-extra.option.fog.tooltip": "设置地形开始显示迷雾效果的距离。\n0 - 使用原版的迷雾设置\n1-32 - 以方块为单位设置迷雾距离\n33 - 最大迷雾距离(基本上禁用迷雾)",
   "sodium-extra.option.gl_debug_verbosity": "OpenGL调试输出",
   "sodium-extra.option.gl_debug_verbosity.tooltip": "调试输出是OpenGL的一个功能，它使得调试和优化OpenGL应用程序更加容易。简而言之，该功能为驱动程序提供了一种将文本信息返回给应用程序的方法。\n修改此选项需要重新启动游戏。",
   "sodium-extra.option.instant_sneak": "直接潜行",
@@ -65,18 +65,18 @@
   "sodium-extra.option.smoke": "烟雾粒子",
   "sodium-extra.option.smoke.tooltip": "开启或关闭烟雾粒子效果效果",
   "sodium-extra.option.stars": "星星",
-  "sodium-extra.option.stars.tooltip": "开启或关闭星星渲染.",
+  "sodium-extra.option.stars.tooltip": "开启或关闭星星渲染",
   "sodium-extra.option.sun_moon": "太阳和月亮",
-  "sodium-extra.option.sun_moon.tooltip": "开启或关闭太阳和月亮的渲染.",
+  "sodium-extra.option.sun_moon.tooltip": "开启或关闭太阳和月亮的渲染",
   "sodium-extra.option.toasts": "弹窗提示",
   "sodium-extra.option.toasts.tooltip": "显示成就和合成配方的弹窗提示",
   "sodium-extra.option.use_fast_random": "快速随机材质",
-  "sodium-extra.option.use_fast_random.tooltip": "启用后, 将使用快速随机函数来渲染方块.\n与原版相比, 这会影响随机旋转纹理的旋转方向.",
+  "sodium-extra.option.use_fast_random.tooltip": "启用后, 将使用快速随机函数来渲染方块。\n与原版相比, 这会影响随机旋转纹理的旋转方向。",
   "sodium-extra.option.villagers.tooltip": "开启或关闭村民粒子效果",
   "sodium-extra.option.water.tooltip": "开启或关闭水面粒子效果",
   "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
   "sodium-extra.overlay.fps": "%s FPS",
   "sodium-extra.overlay.fps_extended": "(max. %s / avg. %s / min. %s)",
-  "sodium-extra.suggestRSO.header": "Suggestion: Install Reese's Sodium Options",
-  "sodium-extra.suggestRSO.message": "It is highly recommended you install Reese's Sodium Options alongside Sodium Extra. Due to the growing amount of features, it no longer fits properly on Sodium's video options."
+  "sodium-extra.suggestRSO.header": "建议: 安装Reese's Sodium Options",
+  "sodium-extra.suggestRSO.message": "强烈建议您在安装Sodium Extra的同时安装Reese's Sodium Options。由于越来越多的功能，它不再适合Sodium的视频设置。"
 }

From b1bd801d569b7ec5fb83925447a82da0c16b188f Mon Sep 17 00:00:00 2001
From: Alpha <alphakr93@outlook.com>
Date: Sat, 26 Mar 2022 14:09:54 +0900
Subject: [PATCH 09/20] new: Add ko_kr.json (#175)

---
 .../assets/sodium-extra/lang/ko_kr.json       | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 src/main/resources/assets/sodium-extra/lang/ko_kr.json

diff --git a/src/main/resources/assets/sodium-extra/lang/ko_kr.json b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
new file mode 100644
index 00000000..9f02b44e
--- /dev/null
+++ b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
@@ -0,0 +1,82 @@
+{
+    "sodium-extra.option.animate_fire.tooltip": "활성화 하면, 불 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.animate_lava.tooltip": "활성화 하면, 용암 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.animate_portal.tooltip": "활성화 하면, 차원문 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.animate_water.tooltip": "활성화 하면, 물 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.animations": "애니메이션",
+    "sodium-extra.option.animations_all.tooltip": "비활성화 하면, 모든 애니메이션이 처리되지 않습니다.",
+    "sodium-extra.option.armor_stands.tooltip": "활성화 하면, 갑옷 거치대가 렌더링됩니다.",
+    "sodium-extra.option.biome_colors": "생물 군계 색",
+    "sodium-extra.option.biome_colors.tooltip": "활성화 하면, 생물 군계 색이 생물 군계를 기준으로 변경됩니다.",
+    "sodium-extra.option.block_animations": "블록 애니메이션",
+    "sodium-extra.option.block_animations.tooltip": "활성화 하면, 블록 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.block_break.tooltip": "활성화 하면, 볼록 파괴 입자가 렌더링 됩니다.",
+    "sodium-extra.option.block_breaking.tooltip": "활성화 하면, 블록을 파괴중일 때 입자가 렌더링 됩니다.",
+    "sodium-extra.option.bubbles.tooltip": "활성화 하면, 거품 입자가 렌더링 됩니다.",
+    "sodium-extra.option.cloud_height": "구름 높이",
+    "sodium-extra.option.cloud_height.tooltip": "렌더링되는 구룸의 높이를 제어합니다.",
+    "sodium-extra.option.composter.tooltip": "활성화 하면, 퇴비 입자가 렌더링 됩니다.",
+    "sodium-extra.option.details": "상세",
+    "sodium-extra.option.dripping_particles": "떨어지는 입자",
+    "sodium-extra.option.dripping_particles.tooltip": "활성화 하면, 떨어지는 입자가 렌더링 됩니다.",
+    "sodium-extra.option.environment.tooltip": "활성화 하면, 환경 입자가 렌더링 됩니다.",
+    "sodium-extra.option.explosions.tooltip": "활성화 하면, 폭발 입자가 렌더링 됩니다.",
+    "sodium-extra.option.extras": "기타",
+    "sodium-extra.option.fireworks.tooltip": "활성화 하면, 폭죽 입자가 렌더링 됩니다.",
+    "sodium-extra.option.fog": "안개",
+    "sodium-extra.option.fog.tooltip": "안개 효과의 거리를 조절합니다.\n0 - 바닐라 설정 사용\n1-32 - 청크 단위로 안개 거리 제어\n33 - 최대 안개 거리 (보통 안개를 제거함)",
+    "sodium-extra.option.gl_debug_verbosity": "OpenGL 디버그 출력",
+    "sodium-extra.option.gl_debug_verbosity.tooltip": "디버그 출력은 OpenGL 응용 프로그램의 디버깅과 최적화를 쉽게 하는 OpenGL의 기능입니다. 간단히 말해, 이 기능은 드라이버가 텍스트 메시지 정보를 응용 프로그램에 제공하는 방법을 제공합니다.\n이 옵션을 변경 사항을 적용하려면 게임을 재시작해야 합니다.",
+    "sodium-extra.option.instant_sneak": "즉시 웅크리기",
+    "sodium-extra.option.instant_sneak.tooltip": "활성화 하면, 카메라가 웅크릴때 선형보강법을 사용하지 않습니다.",
+    "sodium-extra.option.item_frames.tooltip": "활성화 하면, 아이템 액자가 렌더링됩니다.",
+    "sodium-extra.option.light_updates": "빛 업데이트",
+    "sodium-extra.option.light_updates.tooltip": "활성화 하면, 빛 업데이트가 렌더링 됩니다. 비활성화 하면, 새 청크를 생성할 때 조명 효과에 영향을 줄 수 있습니다. 이것이 어떠한 기능을 하는지 모르면 비활성화 하지 마십시오.",
+    "sodium-extra.option.overlay_corner": "오버레이 위치",
+    "sodium-extra.option.overlay_corner.bottom_left": "좌측 하단",
+    "sodium-extra.option.overlay_corner.bottom_right": "우측 하단",
+    "sodium-extra.option.overlay_corner.tooltip": "오버레이(FPS 및 좌표 등) 를 렌더링할 위치를 선택합니다.",
+    "sodium-extra.option.overlay_corner.top_left": "좌측 상단 (기본)",
+    "sodium-extra.option.overlay_corner.top_right": "우측 상단",
+    "sodium-extra.option.paintings.tooltip": "활성화 하면, 그림이 렌더링됩니다.",
+    "sodium-extra.option.particles_all.tooltip": "비활성화 하면, 모든 입자가 처리되지 않습니다.",
+    "sodium-extra.option.piston.tooltip": "활성화 하면, 피스톤 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.portal.tooltip": "활성화 하면, 차원문 입자가 렌더링 됩니다.",
+    "sodium-extra.option.potions.tooltip": "활성화 하면, 포션 효과 입자가 렌더링 됩니다.",
+    "sodium-extra.option.prevent_shaders": "셰이더 차단",
+    "sodium-extra.option.prevent_shaders.tooltip": "활성화 하면, 모든 바닐라 셰이더가 로드되지 않습니다.",
+    "sodium-extra.option.rain_snow.tooltip": "활성화 하면, 비와 눈 입자가 렌더링 됩니다.",
+    "sodium-extra.option.rain_splash.tooltip": "활성화 하면, 떨어진 빗방울 입자가 렌더링 됩니다.",
+    "sodium-extra.option.redstone.tooltip": "활성화 하면, 레드스톤 입자가 렌더링 됩니다.",
+    "sodium-extra.option.reduce_resolution_on_mac": "macOS에서 해상도 감소",
+    "sodium-extra.option.reduce_resolution_on_mac.tooltip": "Retina 디스플레이에서 절반의 해상도만 사용하여 macOS의 성능을 크게 향상시킵니다.\n이 옵션을 변경 사항을 적용하려면 게임을 재시작해야 합니다.",
+    "sodium-extra.option.render": "렌더",
+    "sodium-extra.option.resolution.tooltip": "게임이 전체화면 일때 해상도를 설정합니다.",
+    "sodium-extra.option.show_coordinates": "좌표 표시",
+    "sodium-extra.option.show_coordinates.tooltip": "오버레이에 현재 좌표를 표시합니다.",
+    "sodium-extra.option.show_fps": "FPS 표시",
+    "sodium-extra.option.show_fps.tooltip": "오버레이에 게임의 현재 FPS를 표시합니다.",
+    "sodium-extra.option.show_fps_extended": "상세 FPS 표시",
+    "sodium-extra.option.show_fps_extended.tooltip": "오버레이의 FPS 정보를 상세히(최대, 평균, 최소) 표시합니다.",
+    "sodium-extra.option.sky": "하늘",
+    "sodium-extra.option.sky.tooltip": "활성화 하면, 하늘이 렌더링 됩니다.",
+    "sodium-extra.option.sky_colors": "하늘 색",
+    "sodium-extra.option.sky_colors.tooltip": "활성화 하면, 하늘 색이 생물 군계를 기준으로 변경됩니다.",
+    "sodium-extra.option.smoke": "연기",
+    "sodium-extra.option.smoke.tooltip": "활성화 하면, 연기 입자가 렌더링 됩니다.",
+    "sodium-extra.option.stars": "별",
+    "sodium-extra.option.stars.tooltip": "활성화 하면, 하늘의 별이 렌더링 됩니다.",
+    "sodium-extra.option.sun_moon": "태양 & 달",
+    "sodium-extra.option.sun_moon.tooltip": "활성화 하면, 태양과 달이 렌더링 됩니다.",
+    "sodium-extra.option.toasts": "토스트",
+    "sodium-extra.option.toasts.tooltip": "활성화 하면, 토스트(도전과제, 레시피 등 알림) 가 표시됩니다.",
+    "sodium-extra.option.use_fast_random": "빠른 랜덤 함수 사용",
+    "sodium-extra.option.use_fast_random.tooltip": "활성화 하면, 블록 렌더링을 위해 빠른 랜덤 함수가 사용됩니다. 클라이언트에서 회전되는 텍스쳐의 영향을 줄 수 있습니다.",
+    "sodium-extra.option.villagers.tooltip": "활성화 하면, 주민 입자가 렌더링 됩니다.",
+    "sodium-extra.option.water.tooltip": "활성화 하면, 물 입자가 렌더링 됩니다.",
+    "sodium-extra.overlay.coordinates": "X: %s, Y: %s, Z: %s",
+    "sodium-extra.overlay.fps": "%s FPS",
+    "sodium-extra.overlay.fps_extended": "(최대 %s / 평균 %s / 최소 %s)",
+    "sodium-extra.suggestRSO.header": "Reese's Sodium Options 모드를 설치하는것을 추천합니다.",
+    "sodium-extra.suggestRSO.message": "Sodium Extra와 함께 Reese's Sodium Options 모드를 설치하는것이 좋습니다. 기능의 수가 증가함에 따라 Sodium의 비디오 옵션에서 모두 표시되지 않을 수 있습니다."
+  }

From 80a94cb6eeeba6ca6ce4c7e60279a6feb1cc95e4 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 00:19:18 +0800
Subject: [PATCH 10/20] change: Set CaffeineConfig settings key

---
 .../mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
index 13c9bcc6..ba5ba9aa 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
@@ -10,7 +10,7 @@ public class SodiumExtraMixinConfigPlugin extends AbstractCaffeineConfigMixinPlu
 
     @Override
     protected CaffeineConfig createConfig() {
-        return CaffeineConfig.builder("Sodium Extra")
+        return CaffeineConfig.builder("Sodium Extra").withSettingsKey("sodium-extra")
                 .addMixinOption("animation", true)
                 .addMixinOption("biome_colors", true)
                 .addMixinOption("cloud", true)

From 40bfc2a8e521cfb51490e56f5a65de65e73289e8 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 00:20:00 +0800
Subject: [PATCH 11/20] new: Add Quiltflower decompiler

---
 build.gradle    | 1 +
 settings.gradle | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index 2f66577e..3cc4dcc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'fabric-loom' version '0.11-SNAPSHOT'
     id 'maven-publish'
+    id 'io.github.juuxel.loom-quiltflower' version '1.6.1'
 }
 
 sourceCompatibility = JavaVersion.VERSION_16
diff --git a/settings.gradle b/settings.gradle
index 2875cdef..9dbdd7f3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,10 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'Cotton'
+            url = 'https://server.bbkr.space/artifactory/libs-release/'
+        }
         gradlePluginPortal()
     }
 }
\ No newline at end of file

From 1c07f1b57bfca0d274a46c9614d1eb847260b6cb Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:13:10 +0800
Subject: [PATCH 12/20] change: Update `CaffeineConfig` settings key again
 _sigh_

---
 .../mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
index ba5ba9aa..d42810d7 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java
@@ -10,7 +10,7 @@ public class SodiumExtraMixinConfigPlugin extends AbstractCaffeineConfigMixinPlu
 
     @Override
     protected CaffeineConfig createConfig() {
-        return CaffeineConfig.builder("Sodium Extra").withSettingsKey("sodium-extra")
+        return CaffeineConfig.builder("Sodium Extra").withSettingsKey("sodium-extra:options")
                 .addMixinOption("animation", true)
                 .addMixinOption("biome_colors", true)
                 .addMixinOption("cloud", true)

From 17d1fe3841871625182e18a8bc65df680f7df6a8 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:32:02 +0800
Subject: [PATCH 13/20] change: Update CaffeineConfig

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3cc4dcc0..ba94e6cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // Currently using altrisi/CaffeineConfig until it is officially available through CaffeineMC's maven repository
     // Todo: Use https://github.com/CaffeineMC/mixin-config when available
-    include(modImplementation("com.github.FlashyReese:CaffeineConfig:383ee33be5"))
+    include(modImplementation("com.github.FlashyReese:CaffeineConfig:afbaa017c6"))
 
     modRuntimeOnly "maven.modrinth:lazydfu:0.1.2"
 }

From 40a198062fab0bb8bf6741c94ba27d34391e24ed Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:32:33 +0800
Subject: [PATCH 14/20] change: Migrate from log4j to slf4j

---
 .../mods/sodiumextra/client/SodiumExtraClientMod.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
index c5c08279..4b44c5a8 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
@@ -4,8 +4,8 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
@@ -26,7 +26,7 @@ public static SodiumExtraGameOptions options() {
 
     public static Logger logger() {
         if (LOGGER == null) {
-            LOGGER = LogManager.getLogger("Sodium Extra");
+            LOGGER = LoggerFactory.getLogger("Sodium Extra");
         }
         return LOGGER;
     }

From 52d9c6f6f90b118c9bd8e1879b95b940c2b3c409 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 20:54:39 +0800
Subject: [PATCH 15/20] change: Optimize animation toggles

---
 .../animation/SpriteAnimationExtended.java    |  9 -----
 .../gui/SodiumExtraGameOptionPages.java       |  6 ++++
 .../mixin/animation/MixinSprite.java          | 26 --------------
 .../mixin/animation/MixinSpriteAnimation.java | 22 ------------
 .../animation/MixinSpriteAtlasTexture.java    | 35 +++++--------------
 src/main/resources/sodium-extra.mixins.json   |  2 --
 6 files changed, 15 insertions(+), 85 deletions(-)
 delete mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/client/animation/SpriteAnimationExtended.java
 delete mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSprite.java
 delete mode 100644 src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAnimation.java

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/animation/SpriteAnimationExtended.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/animation/SpriteAnimationExtended.java
deleted file mode 100644
index 67820b57..00000000
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/animation/SpriteAnimationExtended.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package me.flashyreese.mods.sodiumextra.client.animation;
-
-import net.minecraft.util.Identifier;
-
-public interface SpriteAnimationExtended {
-    Identifier getId();
-
-    void setId(Identifier id);
-}
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
index ae04f79b..53cf6305 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -28,6 +28,7 @@ public static OptionPage animation() {
                         .setTooltip(new TranslatableText("sodium-extra.option.animations_all.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.animation = value, opts -> opts.animationSettings.animation)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
                 .build());
@@ -38,6 +39,7 @@ public static OptionPage animation() {
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_water.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.water = value, opts -> opts.animationSettings.water)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
@@ -45,6 +47,7 @@ public static OptionPage animation() {
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_lava.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.lava = value, opts -> opts.animationSettings.lava)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
@@ -52,6 +55,7 @@ public static OptionPage animation() {
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_fire.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.fire = value, opts -> opts.animationSettings.fire)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
@@ -59,6 +63,7 @@ public static OptionPage animation() {
                         .setTooltip(new TranslatableText("sodium-extra.option.animate_portal.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.animationSettings.portal = value, opts -> opts.animationSettings.portal)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
                 .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
@@ -66,6 +71,7 @@ public static OptionPage animation() {
                         .setTooltip(new TranslatableText("sodium-extra.option.block_animations.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((options, value) -> options.animationSettings.blockAnimations = value, options -> options.animationSettings.blockAnimations)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
                 .build());
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSprite.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSprite.java
deleted file mode 100644
index e39e22d5..00000000
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSprite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package me.flashyreese.mods.sodiumextra.mixin.animation;
-
-import me.flashyreese.mods.sodiumextra.client.animation.SpriteAnimationExtended;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(Sprite.class)
-public class MixinSprite {
-
-    @Shadow
-    @Final
-    private Identifier id;
-
-    @Inject(method = "createAnimation", at = @At(value = "RETURN"), cancellable = true)
-    public void createAnimation(Sprite.Info info, int nativeImageWidth, int nativeImageHeight, int maxLevel, CallbackInfoReturnable<Sprite.Animation> cir) {
-        Sprite.Animation value = cir.getReturnValue();
-        if (value != null)
-            ((SpriteAnimationExtended) value).setId(this.id);
-    }
-}
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAnimation.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAnimation.java
deleted file mode 100644
index 4b524ad0..00000000
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAnimation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.flashyreese.mods.sodiumextra.mixin.animation;
-
-import me.flashyreese.mods.sodiumextra.client.animation.SpriteAnimationExtended;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(Sprite.Animation.class)
-public class MixinSpriteAnimation implements SpriteAnimationExtended {
-
-    private Identifier identifier;
-
-    @Override
-    public Identifier getId() {
-        return this.identifier;
-    }
-
-    @Override
-    public void setId(Identifier id) {
-        this.identifier = id;
-    }
-}
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
index 7e997712..7f5885f6 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
@@ -1,40 +1,23 @@
 package me.flashyreese.mods.sodiumextra.mixin.animation;
 
 import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod;
-import me.flashyreese.mods.sodiumextra.client.animation.SpriteAnimationExtended;
 import net.minecraft.client.texture.AbstractTexture;
+import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.texture.TextureTickListener;
 import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.List;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(SpriteAtlasTexture.class)
 public abstract class MixinSpriteAtlasTexture extends AbstractTexture {
-
-    @Shadow
-    @Final
-    private List<TextureTickListener> animatedSprites;
-
-    /**
-     * @author FlashyReese
-     */
-    @Overwrite
-    public void tickAnimatedSprites() {
-        this.bindTexture();
-
-        if (SodiumExtraClientMod.options().animationSettings.animation) {
-            for (TextureTickListener textureTickListener : this.animatedSprites) {
-                if (textureTickListener instanceof SpriteAnimationExtended animationExtended) {
-                    if (this.shouldAnimate(animationExtended.getId()))
-                        textureTickListener.tick();
-                }
-            }
-        }
+    
+    @Redirect(method = "upload", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/Sprite;getAnimation()Lnet/minecraft/client/texture/TextureTickListener;"))
+    public TextureTickListener sodiumExtra$tickAnimatedSprites(Sprite instance) {
+        if (SodiumExtraClientMod.options().animationSettings.animation && this.shouldAnimate(instance.getId()))
+            return instance.getAnimation();
+        return null;
     }
 
     private boolean shouldAnimate(Identifier identifier) {
diff --git a/src/main/resources/sodium-extra.mixins.json b/src/main/resources/sodium-extra.mixins.json
index f44a052d..730b05e0 100644
--- a/src/main/resources/sodium-extra.mixins.json
+++ b/src/main/resources/sodium-extra.mixins.json
@@ -5,8 +5,6 @@
   "package": "me.flashyreese.mods.sodiumextra.mixin",
   "compatibilityLevel": "JAVA_16",
   "client": [
-    "animation.MixinSprite",
-    "animation.MixinSpriteAnimation",
     "animation.MixinSpriteAtlasTexture",
     "biome_colors.MixinBiomeColors",
     "cloud.MixinWorldRenderer",

From e5144fb2ba703875f752128ab82b6e96afc62efc Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sat, 2 Apr 2022 21:39:26 +0800
Subject: [PATCH 16/20] change: Use precise injection point for guardian bug
 fix

---
 .../sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java
index be757339..95bdba2a 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/entity/MixinGuardianEntityRenderer.java
@@ -12,7 +12,7 @@ public class MixinGuardianEntityRenderer {
      * @reason Use the time of day instead of the time of the world in guardian beam rendering
      * @author AMereBagatelle
      */
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getTime()J"))
+    @Redirect(method = "render(Lnet/minecraft/entity/mob/GuardianEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getTime()J"))
     private long useTimeOfDay(World world) {
         return world.getTimeOfDay();
     }

From ead24efdb5a16feb26570febc193aed910c2480a Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sun, 3 Apr 2022 20:19:15 +0800
Subject: [PATCH 17/20] change: Remove logger

---
 .../mods/sodiumextra/client/SodiumExtraClientMod.java | 11 -----------
 .../mixin/sun_moon/MixinWorldRenderer.java            |  3 ---
 2 files changed, 14 deletions(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
index 4b44c5a8..41c85c65 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java
@@ -4,9 +4,6 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.File;
 
 @Environment(EnvType.CLIENT)
@@ -14,7 +11,6 @@ public class SodiumExtraClientMod implements ClientModInitializer {
 
     private static final ClientTickHandler clientTickHandler = new ClientTickHandler();
     private static SodiumExtraGameOptions CONFIG;
-    private static Logger LOGGER;
 
     public static SodiumExtraGameOptions options() {
         if (CONFIG == null) {
@@ -24,13 +20,6 @@ public static SodiumExtraGameOptions options() {
         return CONFIG;
     }
 
-    public static Logger logger() {
-        if (LOGGER == null) {
-            LOGGER = LoggerFactory.getLogger("Sodium Extra");
-        }
-        return LOGGER;
-    }
-
     public static ClientTickHandler getClientTickHandler() {
         return clientTickHandler;
     }
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sun_moon/MixinWorldRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sun_moon/MixinWorldRenderer.java
index 7a4ce14a..9e6472c4 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sun_moon/MixinWorldRenderer.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sun_moon/MixinWorldRenderer.java
@@ -51,9 +51,6 @@ private void postWorldRendererReload(CallbackInfo ci) {
             MOON_PHASES = new Identifier("textures/environment/moon_phases.png");
             SUN = new Identifier("textures/environment/sun.png");
         } else {
-            if (FabricLoader.getInstance().isModLoaded("enhancedcelestials")) {
-                SodiumExtraClientMod.logger().warn("Enhanced Celestials detected, moon phases will not be disabled while in lunar event.");
-            }
             MOON_PHASES = new Identifier("sodium-extra", "textures/transparent.png");
             SUN = new Identifier("sodium-extra", "textures/transparent.png");
         }

From b51c11ab16e29ac08e6cd799aad13050c236944d Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sun, 3 Apr 2022 21:16:03 +0800
Subject: [PATCH 18/20] change: Check for animation sprites only

---
 .../sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
index 7f5885f6..68785a55 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
@@ -15,7 +15,7 @@ public abstract class MixinSpriteAtlasTexture extends AbstractTexture {
     
     @Redirect(method = "upload", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/Sprite;getAnimation()Lnet/minecraft/client/texture/TextureTickListener;"))
     public TextureTickListener sodiumExtra$tickAnimatedSprites(Sprite instance) {
-        if (SodiumExtraClientMod.options().animationSettings.animation && this.shouldAnimate(instance.getId()))
+        if (instance.getAnimation() != null && SodiumExtraClientMod.options().animationSettings.animation && this.shouldAnimate(instance.getId()))
             return instance.getAnimation();
         return null;
     }

From db0a23bf8834c9264bea65e93bc2c80ed360beb2 Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sun, 3 Apr 2022 21:14:23 +0800
Subject: [PATCH 19/20] new: Add Sculk Sensor animation toggle

I'm aware the sculk sensor is unobtainable in 1.18/1.17 but you can still spawn one with the give command.
---
 .../client/gui/SodiumExtraGameOptionPages.java            | 8 ++++++++
 .../sodiumextra/client/gui/SodiumExtraGameOptions.java    | 2 ++
 .../mixin/animation/MixinSpriteAtlasTexture.java          | 3 +++
 src/main/resources/assets/sodium-extra/lang/cs_cz.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/de_de.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/en_us.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/es_mx.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/et_ee.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/fr_fr.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/it_it.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/ko_kr.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/pl_pl.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/pt_br.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/ru_ru.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/th_th.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/tr_TR.json    | 1 +
 src/main/resources/assets/sodium-extra/lang/zh_cn.json    | 1 +
 17 files changed, 27 insertions(+)

diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
index 53cf6305..1c65aa3b 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java
@@ -74,6 +74,14 @@ public static OptionPage animation() {
                         .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
                         .build()
                 )
+                .add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
+                        .setName(new TranslatableText("block.minecraft.sculk_sensor"))
+                        .setTooltip(new TranslatableText("sodium-extra.option.animate_sculk_sensor.tooltip"))
+                        .setControl(TickBoxControl::new)
+                        .setBinding((options, value) -> options.animationSettings.sculkSensor = value, options -> options.animationSettings.sculkSensor)
+                        .setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
+                        .build()
+                )
                 .build());
         return new OptionPage(new TranslatableText("sodium-extra.option.animations"), ImmutableList.copyOf(groups));
     }
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
index 623e9d27..014af96b 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptions.java
@@ -99,6 +99,7 @@ public static class AnimationSettings {
         public boolean fire;
         public boolean portal;
         public boolean blockAnimations;
+        public boolean sculkSensor;
 
         public AnimationSettings() {
             this.animation = true;
@@ -107,6 +108,7 @@ public AnimationSettings() {
             this.fire = true;
             this.portal = true;
             this.blockAnimations = true;
+            this.sculkSensor = false;
         }
     }
 
diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
index 68785a55..49ce1f9f 100644
--- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
+++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/animation/MixinSpriteAtlasTexture.java
@@ -39,6 +39,9 @@ private boolean shouldAnimate(Identifier identifier) {
                     path.endsWith("blast_furnace_front_on") || path.endsWith("smoker_front_on") ||
                     path.endsWith("stonecutter_saw")) {
                 return SodiumExtraClientMod.options().animationSettings.blockAnimations;
+            } else if (path.endsWith("sculk_sensor_tendril_inactive") || path.endsWith("sculk_sensor_tendril_active") ||
+                    path.endsWith("particle/vibration")) {
+                return SodiumExtraClientMod.options().animationSettings.sculkSensor;
             }
         }
         return true;
diff --git a/src/main/resources/assets/sodium-extra/lang/cs_cz.json b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
index 0ac4437b..efcdc2c1 100644
--- a/src/main/resources/assets/sodium-extra/lang/cs_cz.json
+++ b/src/main/resources/assets/sodium-extra/lang/cs_cz.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Přepnout animaci ohně",
   "sodium-extra.option.animate_lava.tooltip": "Přepnout animaci lávy",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Přepnout animaci portálů",
   "sodium-extra.option.animate_water.tooltip": "Přepnout animaci vody",
   "sodium-extra.option.animations": "Animaci",
diff --git a/src/main/resources/assets/sodium-extra/lang/de_de.json b/src/main/resources/assets/sodium-extra/lang/de_de.json
index 6e3882da..1e95cec7 100644
--- a/src/main/resources/assets/sodium-extra/lang/de_de.json
+++ b/src/main/resources/assets/sodium-extra/lang/de_de.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Feuer-Animationen umschalten",
   "sodium-extra.option.animate_lava.tooltip": "Lava-Animationen umschalten",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Portal-Animationen umschalten",
   "sodium-extra.option.animate_water.tooltip": "Wasser-Animationen umschalten",
   "sodium-extra.option.animations": "Animationen",
diff --git a/src/main/resources/assets/sodium-extra/lang/en_us.json b/src/main/resources/assets/sodium-extra/lang/en_us.json
index 6cc6fff7..a0f9bc89 100644
--- a/src/main/resources/assets/sodium-extra/lang/en_us.json
+++ b/src/main/resources/assets/sodium-extra/lang/en_us.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "If enabled, fire animations are processed.",
   "sodium-extra.option.animate_lava.tooltip": "If enabled, lava animations are processed.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "If enabled, portal animations are processed.",
   "sodium-extra.option.animate_water.tooltip": "If enabled, water animations are processed.",
   "sodium-extra.option.animations": "Animations",
diff --git a/src/main/resources/assets/sodium-extra/lang/es_mx.json b/src/main/resources/assets/sodium-extra/lang/es_mx.json
index 4ed4fb39..05cb575f 100644
--- a/src/main/resources/assets/sodium-extra/lang/es_mx.json
+++ b/src/main/resources/assets/sodium-extra/lang/es_mx.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Si está habilitado, se procesan las animaciones de fuego.",
   "sodium-extra.option.animate_lava.tooltip": "Si está habilitado, se procesan las animaciones de lava.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "Si está habilitado, se procesan las animaciones del sensor de sculk.",
   "sodium-extra.option.animate_portal.tooltip": "Si está habilitado, se procesan las animaciones del portal.",
   "sodium-extra.option.animate_water.tooltip": "Si está habilitado, se procesan las animaciones de agua.",
   "sodium-extra.option.animations": "Animaciones",
diff --git a/src/main/resources/assets/sodium-extra/lang/et_ee.json b/src/main/resources/assets/sodium-extra/lang/et_ee.json
index 44bed9e3..55086abd 100644
--- a/src/main/resources/assets/sodium-extra/lang/et_ee.json
+++ b/src/main/resources/assets/sodium-extra/lang/et_ee.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Lülita tuleanimatsioon sisse/välja",
   "sodium-extra.option.animate_lava.tooltip": "Lülita laavaanimatsioon sisse/välja",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Lülita portaalianimatsioon sisse/välja",
   "sodium-extra.option.animate_water.tooltip": "Lülita veeanimatsioon sisse/välja",
   "sodium-extra.option.animations": "Animatsioonid",
diff --git a/src/main/resources/assets/sodium-extra/lang/fr_fr.json b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
index 443af6d6..e8fa93bd 100644
--- a/src/main/resources/assets/sodium-extra/lang/fr_fr.json
+++ b/src/main/resources/assets/sodium-extra/lang/fr_fr.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Activer l'animation du feu",
   "sodium-extra.option.animate_lava.tooltip": "Activer l'animation de la lave",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Activer l'animation des portails",
   "sodium-extra.option.animate_water.tooltip": "Activer l'animation de l'eau",
   "sodium-extra.option.animations": "Animations",
diff --git a/src/main/resources/assets/sodium-extra/lang/it_it.json b/src/main/resources/assets/sodium-extra/lang/it_it.json
index e37fbb71..41195e06 100644
--- a/src/main/resources/assets/sodium-extra/lang/it_it.json
+++ b/src/main/resources/assets/sodium-extra/lang/it_it.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Attiva/disattiva l'animazione del fuoco",
   "sodium-extra.option.animate_lava.tooltip": "Attiva/disattiva l'animazione della lava",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Attiva/disattiva l'animazione dei portali",
   "sodium-extra.option.animate_water.tooltip": "Attiva/disattiva l'animazione dell'acqua",
   "sodium-extra.option.animations": "Animazioni",
diff --git a/src/main/resources/assets/sodium-extra/lang/ko_kr.json b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
index 9f02b44e..50473522 100644
--- a/src/main/resources/assets/sodium-extra/lang/ko_kr.json
+++ b/src/main/resources/assets/sodium-extra/lang/ko_kr.json
@@ -1,6 +1,7 @@
 {
     "sodium-extra.option.animate_fire.tooltip": "활성화 하면, 불 애니메이션이 렌더링 됩니다.",
     "sodium-extra.option.animate_lava.tooltip": "활성화 하면, 용암 애니메이션이 렌더링 됩니다.",
+    "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
     "sodium-extra.option.animate_portal.tooltip": "활성화 하면, 차원문 애니메이션이 렌더링 됩니다.",
     "sodium-extra.option.animate_water.tooltip": "활성화 하면, 물 애니메이션이 렌더링 됩니다.",
     "sodium-extra.option.animations": "애니메이션",
diff --git a/src/main/resources/assets/sodium-extra/lang/pl_pl.json b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
index 51a4a49e..6852ae3a 100644
--- a/src/main/resources/assets/sodium-extra/lang/pl_pl.json
+++ b/src/main/resources/assets/sodium-extra/lang/pl_pl.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje ognia.",
   "sodium-extra.option.animate_lava.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje lawy.",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje portali.",
   "sodium-extra.option.animate_water.tooltip": "Jeśli ta opcja jest włączona, przetwarzane są animacje wody.",
   "sodium-extra.option.animations": "Animacje",
diff --git a/src/main/resources/assets/sodium-extra/lang/pt_br.json b/src/main/resources/assets/sodium-extra/lang/pt_br.json
index c2b52530..0574148f 100644
--- a/src/main/resources/assets/sodium-extra/lang/pt_br.json
+++ b/src/main/resources/assets/sodium-extra/lang/pt_br.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Alterna a animação do fogo",
   "sodium-extra.option.animate_lava.tooltip": "Alterna a animação da lava",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Alterna a animação do portal",
   "sodium-extra.option.animate_water.tooltip": "Alterna a animação da água",
   "sodium-extra.option.animations": "Animações",
diff --git a/src/main/resources/assets/sodium-extra/lang/ru_ru.json b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
index 65cbf944..564d812d 100644
--- a/src/main/resources/assets/sodium-extra/lang/ru_ru.json
+++ b/src/main/resources/assets/sodium-extra/lang/ru_ru.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Переключение анимации огня",
   "sodium-extra.option.animate_lava.tooltip": "Переключение анимации лавы",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Переключение анимации портала",
   "sodium-extra.option.animate_water.tooltip": "Переключение анимации воды",
   "sodium-extra.option.animations": "Анимация",
diff --git a/src/main/resources/assets/sodium-extra/lang/th_th.json b/src/main/resources/assets/sodium-extra/lang/th_th.json
index 4fe280fa..42b5912d 100644
--- a/src/main/resources/assets/sodium-extra/lang/th_th.json
+++ b/src/main/resources/assets/sodium-extra/lang/th_th.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของไฟจะทำงาน",
   "sodium-extra.option.animate_lava.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของลาวาจะทำงาน",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของประตูมิติเนเธอร์จะทำงาน",
   "sodium-extra.option.animate_water.tooltip": "ถ้าเปิดตัวเลือกนี้ ภาพเคลื่อนไหวของน้ำจะทำงาน",
   "sodium-extra.option.animations": "ภาพเคลื่อนไหว",
diff --git a/src/main/resources/assets/sodium-extra/lang/tr_TR.json b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
index e4d1cd8b..ac8ef715 100644
--- a/src/main/resources/assets/sodium-extra/lang/tr_TR.json
+++ b/src/main/resources/assets/sodium-extra/lang/tr_TR.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "Ateş animasyonunu aç/kapa",
   "sodium-extra.option.animate_lava.tooltip": "Lav animasyonunu aç/kapa",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "Portal animasyonunu aç/kapa",
   "sodium-extra.option.animate_water.tooltip": "Su animasyonunu aç/kapa",
   "sodium-extra.option.animations": "Animasyonlar",
diff --git a/src/main/resources/assets/sodium-extra/lang/zh_cn.json b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
index 35a272bd..1b83f703 100644
--- a/src/main/resources/assets/sodium-extra/lang/zh_cn.json
+++ b/src/main/resources/assets/sodium-extra/lang/zh_cn.json
@@ -1,6 +1,7 @@
 {
   "sodium-extra.option.animate_fire.tooltip": "开启或关闭火焰动画",
   "sodium-extra.option.animate_lava.tooltip": "开启或关闭岩浆动画",
+  "sodium-extra.option.animate_sculk_sensor.tooltip": "If enabled, sculk sensor animations are processed.",
   "sodium-extra.option.animate_portal.tooltip": "开启或关闭传送门动画",
   "sodium-extra.option.animate_water.tooltip": "开启或关闭水面动画",
   "sodium-extra.option.animations": "动画",

From ae13c41976416b38ca2033e7acb5ff1314e1654c Mon Sep 17 00:00:00 2001
From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com>
Date: Sun, 3 Apr 2022 22:35:07 +0800
Subject: [PATCH 20/20] change: Bump for release

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3a6411e6..d75bd9f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.13.3
 
 # Mod Properties
-    mod_version=0.4.2
+    mod_version=0.4.3
     maven_group=me.flashyreese.mods
     archives_base_name=sodium-extra