Update manifest.json for release v1.7.1.3 [skip ci]

Injector_new.cs

@@ -0,0 +1,207 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Loader;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+using MediaBrowser.Common.Configuration;
+using Jellyfin.Plugin.Seasonals.Helpers;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Jellyfin.Plugin.Seasonals;
+
+/// <summary>
+/// Handles the injection of the Seasonals script into the Jellyfin web interface.
+/// </summary>
+public class ScriptInjector
+{
+    private readonly IApplicationPaths _appPaths;
+    private readonly ILogger<ScriptInjector> _logger;
+    public const string ScriptTag = "<script src=\"../Seasonals/Resources/seasonals.js\" defer></script>";
+    public const string Marker = "</body>";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ScriptInjector"/> class.
+    /// </summary>
+    /// <param name="appPaths">The application paths.</param>
+    /// <param name="logger">The logger.</param>
+    public ScriptInjector(IApplicationPaths appPaths, ILogger<ScriptInjector> logger)
+    {
+        _appPaths = appPaths;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Injects the script tag into index.html if it's not already present.
+    /// </summary>
+    public void Inject()
+    {
+        try
+        {
+            var webPath = GetWebPath();
+            if (string.IsNullOrEmpty(webPath))
+            {
+                _logger.LogWarning("Could not find Jellyfin web path. Script injection skipped. Attempting fallback.");
+                RegisterFileTransformation();
+                return;
+            }
+
+            var indexPath = Path.Combine(webPath, "index.html");
+            if (!File.Exists(indexPath))
+            {
+                _logger.LogWarning("index.html not found at {Path}. Script injection skipped. Attempting fallback.", indexPath);
+                RegisterFileTransformation();
+                return;
+            }
+
+            var content = File.ReadAllText(indexPath);
+            if (!content.Contains(ScriptTag))
+            {
+                var index = content.IndexOf(Marker, StringComparison.OrdinalIgnoreCase);
+                if (index != -1)
+                {
+                    content = content.Insert(index, ScriptTag + Environment.NewLine);
+                    File.WriteAllText(indexPath, content);
+                    _logger.LogInformation("Successfully injected Seasonals script into index.html.");
+                }
+                else
+                {
+                    _logger.LogWarning("Script already present in index.html. Or could not be injected.");
+                }
+            }
+        }
+        catch (UnauthorizedAccessException)
+        {
+            _logger.LogWarning("Unauthorized access when attempting to inject script into index.html. Automatic injection failed. Attempting fallback now...");
+            RegisterFileTransformation();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error injecting Seasonals script. Attempting fallback.");
+            RegisterFileTransformation();
+        }
+    }
+
+    /// <summary>
+    /// Removes the script tag from index.html.
+    /// </summary>
+    public void Remove()
+    {
+        UnregisterFileTransformation();
+
+        try
+        {
+            var webPath = GetWebPath();
+            if (string.IsNullOrEmpty(webPath))
+            {
+                return;
+            }
+
+            var indexPath = Path.Combine(webPath, "index.html");
+            if (!File.Exists(indexPath))
+            {
+                return;
+            }
+
+            var content = File.ReadAllText(indexPath);
+            if (content.Contains(ScriptTag))
+            {
+                content = content.Replace(ScriptTag + Environment.NewLine, "").Replace(ScriptTag, "");
+                File.WriteAllText(indexPath, content);
+                _logger.LogInformation("Successfully removed Seasonals script from index.html.");
+            } else {
+                _logger.LogInformation("Seasonals script tag not found in index.html. No removal necessary.");
+            }
+        }
+        catch (UnauthorizedAccessException)
+        {
+            _logger.LogWarning("Unauthorized access when attempting to remove script from index.html.");
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error removing Seasonals script.");
+        }
+    }
+
+    /// <summary>
+    /// Retrieves the path to the Jellyfin web interface directory.
+    /// </summary>
+    /// <returns>The path to the web directory, or null if not found.</returns>
+    private string? GetWebPath()
+    {
+        // Use reflection to access WebPath property to ensure compatibility across different Jellyfin versions
+        var prop = _appPaths.GetType().GetProperty("WebPath", BindingFlags.Instance | BindingFlags.Public);
+        return prop?.GetValue(_appPaths) as string;
+    }
+
+    private void RegisterFileTransformation()
+    {
+        _logger.LogInformation("Seasonals Fallback. Registering file transformations.");
+        
+        List<JObject> payloads = new List<JObject>();
+
+        {
+            JObject payload = new JObject();
+            payload.Add("id", "ef1e863f-cbb0-4e47-9f23-f0cbb1826ad4"); 
+            payload.Add("fileNamePattern", "index.html");
+            payload.Add("callbackAssembly", GetType().Assembly.FullName);
+            payload.Add("callbackClass", typeof(TransformationPatches).FullName);
+            payload.Add("callbackMethod", nameof(TransformationPatches.IndexHtml));
+            
+            payloads.Add(payload);
+        }
+
+        Assembly? fileTransformationAssembly =
+            AssemblyLoadContext.All.SelectMany(x => x.Assemblies).FirstOrDefault(x =>
+                x.FullName?.Contains(".FileTransformation") ?? false);
+
+        if (fileTransformationAssembly != null)
+        {
+            Type? pluginInterfaceType = fileTransformationAssembly.GetType("Jellyfin.Plugin.FileTransformation.PluginInterface");
+
+            if (pluginInterfaceType != null)
+            {
+                foreach (JObject payload in payloads)
+                {
+                    pluginInterfaceType.GetMethod("RegisterTransformation")?.Invoke(null, new object?[] { payload });
+                }
+                _logger.LogInformation("File transformations registered successfully.");
+            }
+            else
+            {
+                _logger.LogWarning("FileTransformation plugin found but PluginInterface type missing.");
+            }
+        }
+        else
+        {
+                _logger.LogWarning("FileTransformation plugin assembly not found. Fallback injection skipped.");
+        }
+    }
+    
+    private void UnregisterFileTransformation()
+    {
+        try 
+        {
+            Assembly? fileTransformationAssembly =
+                AssemblyLoadContext.All.SelectMany(x => x.Assemblies).FirstOrDefault(x =>
+                    x.FullName?.Contains(".FileTransformation") ?? false);
+
+            if (fileTransformationAssembly != null)
+            {
+                Type? pluginInterfaceType = fileTransformationAssembly.GetType("Jellyfin.Plugin.FileTransformation.PluginInterface");
+
+                if (pluginInterfaceType != null)
+                {
+                    Guid id = Guid.Parse("ef1e863f-cbb0-4e47-9f23-f0cbb1826ad4");
+                    pluginInterfaceType.GetMethod("RemoveTransformation")?.Invoke(null, new object?[] { id });
+                    _logger.LogInformation("File transformation unregistered successfully.");
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Error attempting to unregister file transformation. It might not have been registered.");
+        }
+    }
+}

Jellyfin.Plugin.Seasonals/Configuration/PluginConfiguration.cs

@@ -30,6 +30,7 @@ public class PluginConfiguration : BasePluginConfiguration
         Resurrection = new ResurrectionOptions();
         Spring = new SpringOptions();
         Summer = new SummerOptions();
+        CherryBlossom = new CherryBlossomOptions();
         Carnival = new CarnivalOptions();
     }
 
@@ -74,6 +75,7 @@ public class PluginConfiguration : BasePluginConfiguration
     public ResurrectionOptions Resurrection { get; set; }
     public SpringOptions Spring { get; set; }
     public SummerOptions Summer { get; set; }
+    public CherryBlossomOptions CherryBlossom { get; set; }
     public CarnivalOptions Carnival { get; set; }
 }
 
@@ -191,11 +193,14 @@ public class ResurrectionOptions
 
 public class SpringOptions
 {
-    public int PetalCount { get; set; } = 25;
+    public int PollenCount { get; set; } = 30;
-    public int PollenCount { get; set; } = 15;
-    public int LadybugCount { get; set; } = 5;
     public int SunbeamCount { get; set; } = 5;
+    public int BirdCount { get; set; } = 3;
+    public int ButterflyCount { get; set; } = 4;
+    public int BeeCount { get; set; } = 1;
+    public int LadybugCount { get; set; } = 1;
     public bool EnableSpring { get; set; } = true;
+    public bool EnableSpringSunbeams { get; set; } = true;
     public bool EnableRandomSpring { get; set; } = true;
     public bool EnableRandomSpringMobile { get; set; } = false;
     public bool EnableDifferentDuration { get; set; } = true;
@@ -218,4 +223,14 @@ public class CarnivalOptions
     public bool EnableRandomCarnival { get; set; } = true;
     public bool EnableRandomCarnivalMobile { get; set; } = false;
     public bool EnableDifferentDuration { get; set; } = true;
+    public bool EnableCarnivalSway { get; set; } = true;
+}
+
+public class CherryBlossomOptions
+{
+    public int PetalCount { get; set; } = 25;
+    public bool EnableCherryBlossom { get; set; } = true;
+    public bool EnableRandomCherryBlossom { get; set; } = true;
+    public bool EnableRandomCherryBlossomMobile { get; set; } = false;
+    public bool EnableDifferentDuration { get; set; } = true;
 }

Jellyfin.Plugin.Seasonals/Configuration/configPage.html

@@ -582,39 +582,29 @@
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
                                     <input id="EnableSpring" name="EnableSpring" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Spring Seasonal</span>
+                                    <span class="checkboxLabel">Enable Spring</span>
                                 </label>
-                                <div class="fieldDescription">Enable the Spring theme in general (e.g. for automation).</div>
+                                <div class="fieldDescription">Enables the Spring theme (grass, pollen).</div>
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
                                     <input id="EnableRandomSpring" name="EnableRandomSpring" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Additional Random Sakura Petals</span>
+                                    <span>Enable Animation Assets</span>
                                 </label>
-                                <div class="fieldDescription">Displays additional Sakura petals falling across the screen.</div>
+                                <div class="fieldDescription">Enables animated spring assets (birds, butterflies, bees, etc.).</div>
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
                                     <input id="EnableRandomSpringMobile" name="EnableRandomSpringMobile" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Additional Random Sakura Petals on Mobile</span>
+                                    <span>Enable Animation Assets on Mobile</span>
                                 </label>
-                                <div class="fieldDescription">Displays additional Sakura petals falling across the screen on mobile devices. Warning: High values may affect performance.</div>
+                                <div class="fieldDescription">Displays animated assets on mobile devices. Warning: High values may affect performance.</div>
-                            </div>
-                            <div class="inputContainer">
-                                <label class="inputLabel" for="SpringPetalCount">Sakura Petal Count</label>
-                                <input is="emby-input" type="number" id="SpringPetalCount" name="SpringPetalCount" />
-                                <div class="fieldDescription">Number of additional Sakura petals (if enabled).</div>
                             </div>
                             <div class="inputContainer">
                                 <label class="inputLabel" for="SpringPollenCount">Pollen Count</label>
                                 <input is="emby-input" type="number" id="SpringPollenCount" name="SpringPollenCount" />
                                 <div class="fieldDescription">Number of pollen particles (if enabled).</div>
                             </div>
-                            <div class="inputContainer">
-                                <label class="inputLabel" for="SpringLadybugCount">Ladybug Count</label>
-                                <input is="emby-input" type="number" id="SpringLadybugCount" name="SpringLadybugCount" />
-                                <div class="fieldDescription">Number of ladybugs.</div>
-                            </div>
                             <div class="inputContainer">
                                 <label class="inputLabel" for="SpringSunbeamCount">Sunbeam Count</label>
                                 <input is="emby-input" type="number" id="SpringSunbeamCount" name="SpringSunbeamCount" />
@@ -622,10 +612,37 @@
                             </div>
                             <div class="checkboxContainer checkboxContainer-withDescription">
                                 <label class="emby-checkbox-label">
-                                    <input id="EnableDifferentDurationSpring" name="EnableDifferentDurationSpring" type="checkbox" is="emby-checkbox" />
+                                    <input id="EnableSpringSunbeams" name="EnableSpringSunbeams" type="checkbox" is="emby-checkbox" />
-                                    <span>Enable Different Falling Speed</span>
+                                    <span>Enable Sunbeams</span>
                                 </label>
-                                <div class="fieldDescription">Randomize the falling speed of petals.</div>
+                                <div class="fieldDescription">Display sunbeams at the top of the screen.</div>
+                            </div>
+							<div class="inputContainer">
+                                <label class="inputLabel" for="SpringBirdCount">Bird Count</label>
+                                <input is="emby-input" type="number" id="SpringBirdCount" name="SpringBirdCount" />
+                                <div class="fieldDescription">Number of birds flying across the screen.</div>
+                            </div>
+                            <div class="inputContainer">
+                                <label class="inputLabel" for="SpringButterflyCount">Butterfly Count</label>
+                                <input is="emby-input" type="number" id="SpringButterflyCount" name="SpringButterflyCount" />
+                                <div class="fieldDescription">Number of butterflies.</div>
+                            </div>
+                            <div class="inputContainer">
+                                <label class="inputLabel" for="SpringBeeCount">Bee Count</label>
+                                <input is="emby-input" type="number" id="SpringBeeCount" name="SpringBeeCount" />
+                                <div class="fieldDescription">Number of bees.</div>
+                            </div>
+                            <div class="inputContainer">
+                                <label class="inputLabel" for="SpringLadybugCount">Ladybug Count</label>
+                                <input is="emby-input" type="number" id="SpringLadybugCount" name="SpringLadybugCount" />
+                                <div class="fieldDescription">Number of ladybugs walking along the bottom.</div>
+                            </div>
+                            <div class="checkboxContainer checkboxContainer-withDescription">
+                                <label class="emby-checkbox-label">
+                                    <input id="EnableDifferentDurationSpring" name="EnableDifferentDurationSpring" type="checkbox" is="emby-checkbox" />
+                                    <span>Enable Different Duration</span>
+                                </label>
+                                <div class="fieldDescription">Randomize the animations duration.</div>
                             </div>
                         </details>
                         <hr style="max-width: 800px; margin: 1em 0;">
@@ -708,6 +725,51 @@
                                 </label>
                                 <div class="fieldDescription">Randomize the falling speed of confetti.</div>
                             </div>
+                            <div class="checkboxContainer checkboxContainer-withDescription">
+                                <label class="emby-checkbox-label">
+                                    <input id="EnableCarnivalSway" name="EnableCarnivalSway" type="checkbox" is="emby-checkbox" />
+                                    <span>Enable Sway</span>
+                                </label>
+                                <div class="fieldDescription">Enable sway animation for carnival confetti.</div>
+                            </div>
+                        </details>
+                        <hr style="max-width: 800px; margin: 1em 0;">
+
+                        <details>
+                            <summary>Cherry Blossom</summary>
+                            <div class="checkboxContainer checkboxContainer-withDescription">
+                                <label class="emby-checkbox-label">
+                                    <input id="EnableCherryBlossom" name="EnableCherryBlossom" type="checkbox" is="emby-checkbox" />
+                                    <span>Enable Cherry Blossom Seasonal</span>
+                                </label>
+                                <div class="fieldDescription">Enable the Cherry Blossom theme in general (e.g. for automation).</div>
+                            </div>
+                            <div class="checkboxContainer checkboxContainer-withDescription">
+                                <label class="emby-checkbox-label">
+                                    <input id="EnableRandomCherryBlossom" name="EnableRandomCherryBlossom" type="checkbox" is="emby-checkbox" />
+                                    <span>Enable Additional Random Cherry Blossoms</span>
+                                </label>
+                                <div class="fieldDescription">Displays additional cherry blossoms falling and fluttering across the screen.</div>
+                            </div>
+                            <div class="checkboxContainer checkboxContainer-withDescription">
+                                <label class="emby-checkbox-label">
+                                    <input id="EnableRandomCherryBlossomMobile" name="EnableRandomCherryBlossomMobile" type="checkbox" is="emby-checkbox" />
+                                    <span>Enable Additional Random Cherry Blossoms on Mobile</span>
+                                </label>
+                                <div class="fieldDescription">Displays additional cherry blossoms falling and fluttering across the screen on mobile devices. Warning: High values may affect performance.</div>
+                            </div>
+                            <div class="inputContainer">
+                                <label class="inputLabel" for="CherryBlossomPetalCount">Petal Count</label>
+                                <input is="emby-input" type="number" id="CherryBlossomPetalCount" name="CherryBlossomPetalCount" />
+                                <div class="fieldDescription">Number of additional cherry blossoms (if enabled).</div>
+                            </div>
+                            <div class="checkboxContainer checkboxContainer-withDescription">
+                                <label class="emby-checkbox-label">
+                                    <input id="EnableDifferentDurationCherryBlossom" name="EnableDifferentDurationCherryBlossom" type="checkbox" is="emby-checkbox" />
+                                    <span>Enable Different Falling Speed</span>
+                                </label>
+                                <div class="fieldDescription">Randomize the falling speed of cherry blossoms.</div>
+                            </div>
                         </details>
                     </div>
                 
@@ -889,6 +951,7 @@
                         '            <option value="easter">Easter</option>' +
                         '            <option value="resurrection">Resurrection</option>' +
                         '            <option value="spring">Spring</option>' +
+                        '            <option value="cherryblossom">Cherry Blossom</option>' +
                         '            <option value="summer">Summer</option>' +
                         '            <option value="carnival">Carnival</option>' +
                         '        </select>' +
@@ -1065,10 +1128,13 @@
 
                         // Spring
                         document.querySelector('#EnableSpring').checked = config.Spring.EnableSpring;
-                        document.querySelector('#SpringPetalCount').value = config.Spring.PetalCount;
+                        document.querySelector('#EnableSpringSunbeams').checked = config.Spring.EnableSpringSunbeams !== undefined ? config.Spring.EnableSpringSunbeams : true;
                         document.querySelector('#SpringPollenCount').value = config.Spring.PollenCount;
-                        document.querySelector('#SpringLadybugCount').value = config.Spring.LadybugCount;
                         document.querySelector('#SpringSunbeamCount').value = config.Spring.SunbeamCount;
+                        document.querySelector('#SpringBirdCount').value = config.Spring.BirdCount !== undefined ? config.Spring.BirdCount : 3;
+                        document.querySelector('#SpringButterflyCount').value = config.Spring.ButterflyCount !== undefined ? config.Spring.ButterflyCount : 2;
+                        document.querySelector('#SpringBeeCount').value = config.Spring.BeeCount !== undefined ? config.Spring.BeeCount : 1;
+                        document.querySelector('#SpringLadybugCount').value = config.Spring.LadybugCount !== undefined ? config.Spring.LadybugCount : 1;
                         document.querySelector('#EnableRandomSpring').checked = config.Spring.EnableRandomSpring;
                         document.querySelector('#EnableRandomSpringMobile').checked = config.Spring.EnableRandomSpringMobile;
                         document.querySelector('#EnableDifferentDurationSpring').checked = config.Spring.EnableDifferentDuration;
@@ -1083,11 +1149,19 @@
 
                         // Carnival
                         document.querySelector('#EnableCarnival').checked = config.Carnival.EnableCarnival;
+                        document.querySelector('#EnableCarnivalSway').checked = config.Carnival.EnableCarnivalSway !== undefined ? config.Carnival.EnableCarnivalSway : true;
                         document.querySelector('#CarnivalObjectCount').value = config.Carnival.ObjectCount;
                         document.querySelector('#EnableRandomCarnival').checked = config.Carnival.EnableRandomCarnival;
                         document.querySelector('#EnableRandomCarnivalMobile').checked = config.Carnival.EnableRandomCarnivalMobile;
                         document.querySelector('#EnableDifferentDurationCarnival').checked = config.Carnival.EnableDifferentDuration;
 
+                        // Cherry Blossom
+                        document.querySelector('#EnableCherryBlossom').checked = config.CherryBlossom.EnableCherryBlossom;
+                        document.querySelector('#CherryBlossomPetalCount').value = config.CherryBlossom.PetalCount;
+                        document.querySelector('#EnableRandomCherryBlossom').checked = config.CherryBlossom.EnableRandomCherryBlossom;
+                        document.querySelector('#EnableRandomCherryBlossomMobile').checked = config.CherryBlossom.EnableRandomCherryBlossomMobile;
+                        document.querySelector('#EnableDifferentDurationCherryBlossom').checked = config.CherryBlossom.EnableDifferentDuration;
+
                         Dashboard.hideLoadingMsg();
                     });
                 });
@@ -1197,10 +1271,13 @@
 
                         // Spring
                         config.Spring.EnableSpring = document.querySelector('#EnableSpring').checked;
-                        config.Spring.PetalCount = parseInt(document.querySelector('#SpringPetalCount').value);
+                        config.Spring.EnableSpringSunbeams = document.querySelector('#EnableSpringSunbeams').checked;
                         config.Spring.PollenCount = parseInt(document.querySelector('#SpringPollenCount').value);
-                        config.Spring.LadybugCount = parseInt(document.querySelector('#SpringLadybugCount').value);
                         config.Spring.SunbeamCount = parseInt(document.querySelector('#SpringSunbeamCount').value);
+                        config.Spring.BirdCount = parseInt(document.querySelector('#SpringBirdCount').value);
+                        config.Spring.ButterflyCount = parseInt(document.querySelector('#SpringButterflyCount').value);
+                        config.Spring.BeeCount = parseInt(document.querySelector('#SpringBeeCount').value);
+                        config.Spring.LadybugCount = parseInt(document.querySelector('#SpringLadybugCount').value);
                         config.Spring.EnableRandomSpring = document.querySelector('#EnableRandomSpring').checked;
                         config.Spring.EnableRandomSpringMobile = document.querySelector('#EnableRandomSpringMobile').checked;
                         config.Spring.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationSpring').checked;
@@ -1215,11 +1292,19 @@
 
                         // Carnival
                         config.Carnival.EnableCarnival = document.querySelector('#EnableCarnival').checked;
+                        config.Carnival.EnableCarnivalSway = document.querySelector('#EnableCarnivalSway').checked;
                         config.Carnival.ObjectCount = parseInt(document.querySelector('#CarnivalObjectCount').value);
                         config.Carnival.EnableRandomCarnival = document.querySelector('#EnableRandomCarnival').checked;
                         config.Carnival.EnableRandomCarnivalMobile = document.querySelector('#EnableRandomCarnivalMobile').checked;
                         config.Carnival.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationCarnival').checked;
 
+                        // Cherry Blossom
+                        config.CherryBlossom.EnableCherryBlossom = document.querySelector('#EnableCherryBlossom').checked;
+                        config.CherryBlossom.PetalCount = parseInt(document.querySelector('#CherryBlossomPetalCount').value);
+                        config.CherryBlossom.EnableRandomCherryBlossom = document.querySelector('#EnableRandomCherryBlossom').checked;
+                        config.CherryBlossom.EnableRandomCherryBlossomMobile = document.querySelector('#EnableRandomCherryBlossomMobile').checked;
+                        config.CherryBlossom.EnableDifferentDuration = document.querySelector('#EnableDifferentDurationCherryBlossom').checked;
+
                         ApiClient.updatePluginConfiguration(SeasonalsConfigPage.pluginUniqueId, config).then(function (result) {
                             Dashboard.processPluginConfigurationUpdateResult(result);
                         });

Jellyfin.Plugin.Seasonals/Jellyfin.Plugin.Seasonals.csproj

@@ -12,7 +12,7 @@
     <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
     <Title>Jellyfin Seasonals Plugin</Title>
     <Authors>CodeDevMLH</Authors>
-    <Version>1.7.1.0</Version>
+    <Version>1.7.1.3</Version>
     <RepositoryUrl>https://github.com/CodeDevMLH/Jellyfin-Seasonals</RepositoryUrl>
   </PropertyGroup>
 

Jellyfin.Plugin.Seasonals/ScriptInjector.cs

@@ -56,6 +56,18 @@ public class ScriptInjector
             }
 
             var content = File.ReadAllText(indexPath);
+
+
+            // MARK: Legacy Tags, remove in future versions
+            bool modified = false;
+            // Cleanup legacy tags first to avoid duplicates or conflicts
+            content = RemoveLegacyTags(content, ref modified);
+            if (modified)
+            {
+                _logger.LogInformation("Removed legacy tags from index.html.");
+            }
+
+
             if (!content.Contains(ScriptTag))
             {
                 var index = content.IndexOf(Marker, StringComparison.OrdinalIgnoreCase);
@@ -113,6 +125,17 @@ public class ScriptInjector
             } else {
                 _logger.LogInformation("Seasonals script tag not found in index.html. No removal necessary.");
             }
+
+            // MARK: Legacy Tags, remove in future versions
+            // Remove legacy tags
+            bool modified = false;
+            content = RemoveLegacyTags(content, ref modified);
+            if (modified)
+            {
+                _logger.LogInformation("Removed legacy tags from index.html.");
+            }
+
+
         }
         catch (UnauthorizedAccessException)
         {
@@ -204,4 +227,21 @@ public class ScriptInjector
             _logger.LogWarning(ex, "Error attempting to unregister file transformation. It might not have been registered.");
         }
     }
+
+    // MARK: Legacy Tags, remove in future versions
+    /// <summary>
+    /// Removes legacy script tags from the content.
+    /// </summary>
+    private string RemoveLegacyTags(string content, ref bool modified)
+    {
+        // Legacy tags (used in versions prior to 1.6.3.0 where paths started with / instead of ../)
+        const string LegacyScriptTag = "<script src=\"/Seasonals/Resources/seasonals.js\" defer></script>";
+
+        if (content.Contains(LegacyScriptTag))
+        {
+            content = content.Replace(LegacyScriptTag + Environment.NewLine, "").Replace(LegacyScriptTag, "");
+            modified = true;
+        }
+        return content;
+    }
 }

Jellyfin.Plugin.Seasonals/Web/carnival.css

@@ -18,7 +18,8 @@
   will-change: top;
   animation-name: carnival-fall;
   animation-timing-function: linear;
-  animation-iteration-count: infinite;
+  animation-iteration-count: 1;
+  animation-fill-mode: forwards;
 }
 
 .carnival-sway-wrapper {
@@ -35,9 +36,8 @@
   background-color: #f0f;
   will-change: transform;
   animation-name: carnival-flutter;
-  animation-timing-function: ease-in-out;
+  animation-timing-function: linear;
   animation-iteration-count: infinite;
-  animation-duration: 2s;
 }
 
 .carnival-confetti.circle {
@@ -52,15 +52,8 @@
 }
 
 .carnival-confetti.triangle {
-    width: 0;
-    height: 0;
-    background-color: transparent !important;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-bottom: 10px solid;
     width: 10px;
     height: 10px;
-    background-color: inherit;
     clip-path: polygon(50% 0%, 0% 100%, 100% 100%);
 }
 
@@ -84,18 +77,9 @@
 
 @keyframes carnival-flutter {
   0% {
-    transform: rotate3d(1, 1, 1, 0deg);
+    transform: rotate3d(var(--rx, 1), var(--ry, 1), var(--rz, 0), 0deg);
-  }
-  25% {
-    transform: rotate3d(1, 0.5, 0, 90deg);
-  }
-  50% {
-    transform: rotate3d(0.5, 1, 0.5, 180deg);
-  }
-  75% {
-    transform: rotate3d(0, 0.5, 1, 270deg);
   }
   100% {
-    transform: rotate3d(1, 1, 1, 360deg);
+    transform: rotate3d(var(--rx, 1), var(--ry, 1), var(--rz, 0), var(--rot-dir, 360deg));
   }
 }

Jellyfin.Plugin.Seasonals/Web/carnival.js

@@ -1,11 +1,11 @@
 const config = window.SeasonalsPluginConfig?.Carnival || {};
 
-const carnival = config.EnableCarnival !== undefined ? config.EnableCarnival : true; 
+const carnival = config.EnableCarnival !== undefined ? config.EnableCarnival : true; // Enable/disable carnival
-const randomCarnival = config.EnableRandomCarnival !== undefined ? config.EnableRandomCarnival : true; 
+const randomCarnival = config.EnableRandomCarnival !== undefined ? config.EnableRandomCarnival : true; // Enable random carnival objects
-const randomCarnivalMobile = config.EnableRandomCarnivalMobile !== undefined ? config.EnableRandomCarnivalMobile : false; 
+const randomCarnivalMobile = config.EnableRandomCarnivalMobile !== undefined ? config.EnableRandomCarnivalMobile : false; // Enable random carnival objects on mobile
-const enableDifferentDuration = config.EnableDifferentDuration !== undefined ? config.EnableDifferentDuration : true; 
+const enableDifferentDuration = config.EnableDifferentDuration !== undefined ? config.EnableDifferentDuration : true; // Randomize falling and flutter speeds
-const enableSway = config.EnableCarnivalSway !== undefined ? config.EnableCarnivalSway : true;
+const enableSway = config.EnableCarnivalSway !== undefined ? config.EnableCarnivalSway : true; // Enable side-to-side sway animation
-const carnivalCount = config.ObjectCount || 80;
+const carnivalCount = config.ObjectCount || 120; // Number of confetti pieces to spawn
 
 let msgPrinted = false;
 
@@ -86,14 +86,21 @@ function createConfettiPiece(container, isInitial = false) {
     wrapper.style.left = `${Math.random() * 100}%`;
 
     // Random dimensions
+    // MARK: CONFETTI SIZE (RECTANGLES)
     if (!confetti.classList.contains('circle') && !confetti.classList.contains('square') && !confetti.classList.contains('triangle')) {
-        const width = Math.random() * 5 + 4; 
+        const width = Math.random() * 3 + 4; // 4-7px
-        const height = Math.random() * 6 + 8; 
+        const height = Math.random() * 5 + 8; // 8-13px
         confetti.style.width = `${width}px`;
         confetti.style.height = `${height}px`;
+    } else if (confetti.classList.contains('circle') || confetti.classList.contains('square')) {
+        // MARK: CONFETTI SIZE (CIRCLES/SQUARES)
+        const size = Math.random() * 5 + 5; // 5-10px
+        confetti.style.width = `${size}px`;
+        confetti.style.height = `${size}px`;
     }
 
     // Animation settings
+    // MARK: CONFETTI FALLING SPEED (in seconds)
     const duration = Math.random() * 5 + 5; 
 
     let delay = 0;
@@ -113,14 +120,22 @@ function createConfettiPiece(container, isInitial = false) {
         swayWrapper.style.animationDelay = `-${Math.random() * 5}s`;
         
         // Random sway amplitude (using CSS variable for dynamic keyframe)
-        // Sway between 30px and 100px
+        // MARK: SWAY DISTANCE RANGE (in px)
-        const swayAmount = Math.random() * 70 + 30; 
+        const swayAmount = Math.random() * 70 + 30; // 30-100px
         const direction = Math.random() > 0.5 ? 1 : -1;
         swayWrapper.style.setProperty('--sway-amount', `${swayAmount * direction}px`);
     }
     
-    // Flutter speed variation
+    // Flutter speed and random 3D rotation axis
+    // MARK: CONFETTI FLUTTER ROTATION SPEED
     confetti.style.animationDuration = `${Math.random() * 2 + 1}s`;
+    confetti.style.setProperty('--rx', Math.random().toFixed(2));
+    confetti.style.setProperty('--ry', Math.random().toFixed(2));
+    confetti.style.setProperty('--rz', (Math.random() * 0.5).toFixed(2));
+    
+    // Random direction for 3D rotation
+    const rotDir = Math.random() > 0.5 ? 1 : -1;
+    confetti.style.setProperty('--rot-dir', `${rotDir * 360}deg`);
 
     if (enableSway) {
         swayWrapper.appendChild(confetti);
@@ -129,6 +144,14 @@ function createConfettiPiece(container, isInitial = false) {
         wrapper.appendChild(confetti);
     }
     
+    // Respawn confetti when it hits the bottom
+    wrapper.addEventListener('animationend', (e) => {
+        if (e.animationName === 'carnival-fall') {
+            wrapper.remove();
+            createConfettiPiece(container, false); // respawn without initial huge delay
+        }
+    });
+
     container.appendChild(wrapper);
 }
 
@@ -154,7 +177,7 @@ function initCarnivalObjects() {
     }
 
     // Initial confetti
-    for (let i = 0; i < 30; i++) {
+    for (let i = 0; i < 60; i++) {
         createConfettiPiece(container, true);
     }
 }

Jellyfin.Plugin.Seasonals/Web/cherryblossom.css

@@ -0,0 +1,58 @@
+.cherryblossom-container {
+    display: block;
+    position: fixed;
+    overflow: hidden;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    pointer-events: none;
+    z-index: 1000; 
+}
+
+/* Petals */
+.cherryblossom-petal {
+    position: fixed;
+    top: -20px;
+    z-index: 1005;
+    width: 15px;
+    height: 10px;
+    background-color: #ffc0cb; 
+    border-radius: 15px 0px 15px 0px; 
+    
+    will-change: transform, top;
+    animation-name: cherryblossom-fall, cherryblossom-sway;
+    animation-timing-function: linear, ease-in-out;
+    animation-iteration-count: infinite, infinite;
+    animation-duration: 10s, 3s;
+}
+
+.cherryblossom-petal.lighter {
+    background-color: #ffd1dc; 
+    opacity: 0.8;
+}
+
+.cherryblossom-petal.darker {
+    background-color: #ffb7c5; 
+    opacity: 0.9;
+}
+
+.cherryblossom-petal.type2 {
+    width: 12px;
+    height: 12px;
+    border-radius: 10px 0px 10px 5px;
+}
+
+@keyframes cherryblossom-fall {
+    0% { top: -10%; }
+    100% { top: 100%; }
+}
+
+@keyframes cherryblossom-sway {
+    0%, 100% {
+        transform: translateX(0) rotate(0deg);
+    }
+    50% {
+        transform: translateX(30px) rotate(45deg);
+    }
+}

Jellyfin.Plugin.Seasonals/Web/cherryblossom.js

@@ -0,0 +1,101 @@
+const config = window.SeasonalsPluginConfig?.CherryBlossom || {};
+
+const cherryBlossom = config.EnableCherryBlossom !== undefined ? config.EnableCherryBlossom : true;
+const petalCount = config.PetalCount || 25;
+const randomCherryBlossom = config.EnableRandomCherryBlossom !== undefined ? config.EnableRandomCherryBlossom : true;
+const randomCherryBlossomMobile = config.EnableRandomCherryBlossomMobile !== undefined ? config.EnableRandomCherryBlossomMobile : false;
+const enableDifferentDuration = config.EnableDifferentDuration !== undefined ? config.EnableDifferentDuration : true;
+
+let msgPrinted = false;
+
+function toggleCherryBlossom() {
+  const container = document.querySelector('.cherryblossom-container');
+  if (!container) return;
+
+  const videoPlayer = document.querySelector('.videoPlayerContainer');
+  const trailerPlayer = document.querySelector('.youtubePlayerContainer');
+  const isDashboard = document.body.classList.contains('dashboardDocument');
+  const hasUserMenu = document.querySelector('#app-user-menu');
+
+  if (videoPlayer || trailerPlayer || isDashboard || hasUserMenu) {
+    container.style.display = 'none';
+    if (!msgPrinted) {
+      console.log('CherryBlossom hidden');
+      msgPrinted = true;
+    }
+  } else {
+    container.style.display = 'block';
+    if (msgPrinted) {
+      console.log('CherryBlossom visible');
+      msgPrinted = false;
+    }
+  }
+}
+
+const observer = new MutationObserver(toggleCherryBlossom);
+observer.observe(document.body, { childList: true, subtree: true, attributes: true });
+
+function createPetal(container) {
+    const petal = document.createElement('div');
+    petal.classList.add('cherryblossom-petal');
+
+    const type = Math.random() > 0.5 ? 'type1' : 'type2';
+    petal.classList.add(type);
+
+    const color = Math.random() > 0.7 ? 'darker' : 'lighter';
+    petal.classList.add(color);
+
+    const randomLeft = Math.random() * 100;
+    petal.style.left = `${randomLeft}%`;
+
+    const size = Math.random() * 0.5 + 0.5;
+    petal.style.transform = `scale(${size})`;
+
+    const duration = Math.random() * 5 + 8;
+    const delay = Math.random() * 10;
+    const swayDuration = Math.random() * 2 + 2;
+
+    if (enableDifferentDuration) {
+        petal.style.animationDuration = `${duration}s, ${swayDuration}s`;
+    }
+    petal.style.animationDelay = `${delay}s, ${Math.random() * 3}s`;
+
+    container.appendChild(petal);
+}
+
+function addRandomObjects() {
+    const container = document.querySelector('.cherryblossom-container');
+    if (!container) return;
+
+    for (let i = 0; i < petalCount; i++) {
+        createPetal(container);
+    }
+}
+
+function initObjects() {
+    let container = document.querySelector('.cherryblossom-container');
+    if (!container) {
+        container = document.createElement("div");
+        container.className = "cherryblossom-container";
+        container.setAttribute("aria-hidden", "true");
+        document.body.appendChild(container);
+    }
+    
+    // Initial batch
+    for (let i = 0; i < 15; i++) {
+        createPetal(container);
+    }
+}
+
+function initializeCherryBlossom() {
+    if (!cherryBlossom) return;
+    initObjects();
+    toggleCherryBlossom();
+
+    const screenWidth = window.innerWidth;
+    if (randomCherryBlossom && (screenWidth > 768 || randomCherryBlossomMobile)) {
+        addRandomObjects();
+    }
+}
+
+initializeCherryBlossom();

Jellyfin.Plugin.Seasonals/Web/seasonals.js

@@ -73,6 +73,11 @@ const ThemeConfigs = {
         js: '../Seasonals/Resources/carnival.js',
         containerClass: 'carnival-container'
     },
+    cherryblossom: {
+        css: '../Seasonals/Resources/cherryblossom.css',
+        js: '../Seasonals/Resources/cherryblossom.js',
+        containerClass: 'cherryblossom-container'
+    },
     none: {
         containerClass: 'none'
     },
@@ -246,6 +251,12 @@ const SeasonalsManager = {
             if (response.ok) {
                 this.config = await response.json();
                 window.SeasonalsPluginConfig = this.config;
+                
+                if (this.config.IsEnabled === false) {
+                    console.log('Seasonals: Plugin is disabled globally.');
+                    return;
+                }
+
                 console.log('Seasonals: Seasonals Config loaded:', this.config);
             }
         } catch (error) {

Jellyfin.Plugin.Seasonals/Web/spring.css

@@ -5,44 +5,11 @@
     top: 0;
     left: 0;
     width: 100%;
-    height: 100%;
+    height: 100vh;
     pointer-events: none;
     z-index: 1000; 
 }
 
-/* Petals */
-.spring-petal {
-    position: fixed;
-    top: -20px;
-    z-index: 1005;
-    width: 15px;
-    height: 10px;
-    background-color: #ffc0cb; 
-    border-radius: 15px 0px 15px 0px; 
-    
-    will-change: transform, top;
-    animation-name: spring-fall, spring-sway;
-    animation-timing-function: linear, ease-in-out;
-    animation-iteration-count: infinite, infinite;
-    animation-duration: 10s, 3s;
-}
-
-.spring-petal.lighter {
-    background-color: #ffd1dc; 
-    opacity: 0.8;
-}
-
-.spring-petal.darker {
-    background-color: #ffb7c5; 
-    opacity: 0.9;
-}
-
-.spring-petal.type2 {
-    width: 12px;
-    height: 12px;
-    border-radius: 10px 0px 10px 5px;
-}
-
 /* Pollen */
 .spring-pollen {
     position: fixed;
@@ -67,21 +34,16 @@
     z-index: 5; 
     transform-origin: top center;
     pointer-events: none;
-    
+    opacity: 0; 
-    animation-name: spring-beam-pulse;
-    animation-timing-function: ease-in-out;
-    animation-iteration-count: infinite;
 }
 
 /* Grass */
 .spring-grass-container {
-    position: fixed;
+    position: absolute;
     bottom: 0;
     left: 0;
     width: 100%;
     height: 80px; 
-    z-index: 1002; 
-    overflow: hidden;
     pointer-events: none;
 }
 
@@ -99,55 +61,75 @@
     animation-iteration-count: infinite;
 }
 
-/* Ladybugs */
+/* Birds */
-.spring-ladybug {
+.spring-bird {
-    position: absolute;
+    position: static !important; 
-    width: 6px;
+    display: block;
-    height: 4px;
+    z-index: 1001;
-    background-color: #e74c3c; /* Red */
+    /* MARK: BIRD SIZE */
-    border-radius: 3px 3px 0 0;
+    width: 80px; 
-    z-index: 1003;
+    height: auto;
-    
+    will-change: transform;
-    will-change: left, transform;
     animation-timing-function: linear;
     animation-iteration-count: infinite;
 }
 
-.spring-ladybug.right {
+/* Butterflies */
-    animation-name: spring-bug-crawl-right;
+.spring-butterfly {
-    transform: scaleX(1);
+    position: static !important;
+    display: block;
+    z-index: 1001;
+    /* MARK: BUTTERFLY SIZE */
+    width: 40px; 
+    height: auto;
+    will-change: transform;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
 }
 
-.spring-ladybug.left {
+/* Bee */
-    animation-name: spring-bug-crawl-left;
+.spring-bee {
-    transform: scaleX(-1);
+    position: static !important;
+    display: block;
+    z-index: 1001;
+    /* MARK: BEE SIZE */
+    width: 30px; 
+    height: auto;
+    will-change: transform;
 }
 
-.spring-ladybug::before {
+/* Ladybug */
-    content: '';
+.spring-ladybug-gif {
-    position: absolute;
+    position: static !important;
-    right: -2px;
+    display: block;
-    top: 1px;
+    /* MARK: LADYBUG SIZE */
-    width: 2px;
+    width: 30px; 
-    height: 2px;
+    height: auto;
-    background-color: #000;
+    will-change: transform;
-    border-radius: 50%;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    --bug-rotation: -55deg;
 }
 
-@keyframes spring-fall {
+.spring-ladybug-wrapper {
-    0% { top: -10%; }
+    z-index: 1002;
-    100% { top: 100%; }
 }
 
-@keyframes spring-sway {
+/* Generic Wrappers */
-    0%, 100% {
+.spring-anim-wrapper {
-        transform: translateX(0) rotate(0deg);
+    position: fixed;
-    }
+    z-index: 1001;
-    50% {
+    will-change: transform;
-        transform: translateX(30px) rotate(45deg);
+    top: 0; left: 0;
-    }
 }
 
+.spring-mirror-wrapper {
+    width: 100%; height: 100%;
+    will-change: transform;
+    transform-origin: center;
+}
+
+
 @keyframes spring-float {
     0% { transform: translateX(0) translateY(0); }
     25% { transform: translateX(20px) translateY(-10px); }
@@ -157,9 +139,9 @@
 }
 
 @keyframes spring-beam-pulse {
-    0% { opacity: 0.3; transform: rotate(45deg) scaleX(1); }
+    0% { opacity: 0; transform: rotate(var(--beam-rotation, 45deg)) scaleX(0.8); }
-    50% { opacity: 0.6; transform: rotate(45deg) scaleX(1.1); }
+    50% { opacity: 0.6; transform: rotate(var(--beam-rotation, 45deg)) scaleX(1.2); }
-    100% { opacity: 0.3; transform: rotate(45deg) scaleX(1); }
+    100% { opacity: 0; transform: rotate(var(--beam-rotation, 45deg)) scaleX(0.8); }
 }
 
 @keyframes spring-grass-sway {
@@ -168,12 +150,63 @@
     100% { transform: rotate(0deg); }
 }
 
-@keyframes spring-bug-crawl-right {
+/* Wrapper animations (Flight across screen) */
-    0% { left: -5%; }
+@keyframes spring-fly-right-wrapper {
-    100% { left: 105%; }
+    0% { transform: translateX(-10vw); }
+    100% { transform: translateX(110vw); }
 }
 
-@keyframes spring-bug-crawl-left {
+@keyframes spring-fly-left-wrapper {
-    0% { left: 105%; }
+    0% { transform: translateX(110vw); }
-    100% { left: -5%; }
+    100% { transform: translateX(-10vw); }
+}
+
+/* Vertical Drift for Sloped Flight */
+@keyframes spring-vertical-drift {
+    0% { top: var(--start-y, 10%); }
+    100% { top: var(--end-y, 10%); }
+}
+
+/* Inner animations (Bobbing/Fluttering) */
+@keyframes spring-bob {
+    0% { transform: translateY(0); }
+    50% { transform: translateY(-20px); }
+    100% { transform: translateY(0); }
+}
+
+@keyframes spring-flutter {
+    0% { transform: translateY(0) rotate(0deg); }
+    25% { transform: translateY(-5px) rotate(5deg); }
+    50% { transform: translateY(0) rotate(0deg); }
+    75% { transform: translateY(5px) rotate(-5deg); }
+    100% { transform: translateY(0) rotate(0deg); }
+}
+
+/* Bee Buzz - Reduced Intensity */
+@keyframes spring-buzz {
+    0% { transform: translate(0, 0); }
+    25% { transform: translate(2px, -2px); }
+    50% { transform: translate(0, 2px); }
+    75% { transform: translate(-2px, -2px); }
+    100% { transform: translate(0, 0); }
+}
+
+/* Ladybug Walk (Wrapper handles X) */
+@keyframes spring-walk-right {
+    0% { transform: translateX(-10vw); }
+    100% { transform: translateX(110vw); }
+}
+
+@keyframes spring-walk-left {
+    0% { transform: translateX(110vw); }
+    100% { transform: translateX(-10vw); }
+}
+
+/* Ladybug Crawl (Inner Wobble) */
+@keyframes spring-crawl {
+    0% { transform: translateY(0) rotate(var(--bug-rotation, 0deg)); }
+    25% { transform: translateY(-3px) rotate(calc(var(--bug-rotation, 0deg) + 8deg)); }
+    50% { transform: translateY(0) rotate(var(--bug-rotation, 0deg)); }
+    75% { transform: translateY(-3px) rotate(calc(var(--bug-rotation, 0deg) - 8deg)); }
+    100% { transform: translateY(0) rotate(var(--bug-rotation, 0deg)); }
 }

Jellyfin.Plugin.Seasonals/Web/spring.js

@@ -1,16 +1,28 @@
 const config = window.SeasonalsPluginConfig?.Spring || {};
 
-const spring = config.EnableSpring !== undefined ? config.EnableSpring : true; 
+const spring = config.EnableSpring !== undefined ? config.EnableSpring : true; // Enable/disable spring
-const petalCount = config.PetalCount || 25;
+const pollenCount = config.PollenCount || 30; // Number of pollen particles
-const pollenCount = config.PollenCount || 15;
+const sunbeamCount = config.SunbeamCount || 5; // Number of sunbeams
-const ladybugCountConfig = config.LadybugCount || 5;
+const enableSunbeams = config.EnableSpringSunbeams !== undefined ? config.EnableSpringSunbeams : true; // Enable/disable sunbeams
-const sunbeamCount = config.SunbeamCount || 5;
+const birdCount = config.BirdCount !== undefined ? config.BirdCount : 3; // Number of birds
+const butterflyCount = config.ButterflyCount !== undefined ? config.ButterflyCount : 4; // Number of butterflies
+const beeCount = config.BeeCount !== undefined ? config.BeeCount : 1; // Number of bees
+const ladybugCount = config.LadybugCount !== undefined ? config.LadybugCount : 1; // Number of ladybugs
+const randomSpring = config.EnableRandomSpring !== undefined ? config.EnableRandomSpring : true; // Enable random spring objects
 
-const randomSpring = config.EnableRandomSpring !== undefined ? config.EnableRandomSpring : true; 
+const birdImages = [
-const randomSpringMobile = config.EnableRandomSpringMobile !== undefined ? config.EnableRandomSpringMobile : false; 
+    '../Seasonals/Resources/spring_assets/Bird_1.gif',
-const enableDifferentDuration = config.EnableDifferentDuration !== undefined ? config.EnableDifferentDuration : true; 
+    '../Seasonals/Resources/spring_assets/Bird_2.gif',
-const enablePetals = config.EnableSpringPetals !== undefined ? config.EnableSpringPetals : true;
+    '../Seasonals/Resources/spring_assets/Bird_3.gif'
-const enableSunbeams = config.EnableSpringSunbeams !== undefined ? config.EnableSpringSunbeams : true;
+];
+
+const butterflyImages = [
+    '../Seasonals/Resources/spring_assets/Butterfly_1.gif',
+    '../Seasonals/Resources/spring_assets/Butterfly_2.gif'
+];
+
+const beeImage = '../Seasonals/Resources/spring_assets/Bee.gif';
+const ladybugImage = '../Seasonals/Resources/spring_assets/ladybug.gif';
 
 let msgPrinted = false;
 
@@ -41,45 +53,18 @@ function toggleSpring() {
 const observer = new MutationObserver(toggleSpring);
 observer.observe(document.body, { childList: true, subtree: true, attributes: true });
 
-function createPetal(container) {
-    if (!enablePetals) return;
-
-    const petal = document.createElement('div');
-    petal.classList.add('spring-petal');
-
-    const type = Math.random() > 0.5 ? 'type1' : 'type2';
-    petal.classList.add(type);
-
-    const color = Math.random() > 0.7 ? 'darker' : 'lighter';
-    petal.classList.add(color);
-
-    const randomLeft = Math.random() * 100;
-    petal.style.left = `${randomLeft}%`;
-
-    const size = Math.random() * 0.5 + 0.5;
-    petal.style.transform = `scale(${size})`;
-
-    const duration = Math.random() * 5 + 8;
-    const delay = Math.random() * 10;
-    const swayDuration = Math.random() * 2 + 2;
-
-    if (enableDifferentDuration) {
-        petal.style.animationDuration = `${duration}s, ${swayDuration}s`;
-    }
-    petal.style.animationDelay = `${delay}s, ${Math.random() * 3}s`;
-
-    container.appendChild(petal);
-}
 
 function createPollen(container) {
     const pollen = document.createElement('div');
     pollen.classList.add('spring-pollen');
     
+    // MARK: POLLEN START VERTICAL POSITION (in %)
     const startY = Math.random() * 60 + 20; 
     pollen.style.top = `${startY}%`;
     pollen.style.left = `${Math.random() * 100}%`;
     
-    const size = Math.random() * 3 + 1; 
+    // MARK: POLLEN SIZE
+    const size = Math.random() * 3 + 1; // 1-4px
     pollen.style.width = `${size}px`;
     pollen.style.height = `${size}px`;
     
@@ -90,27 +75,40 @@ function createPollen(container) {
     container.appendChild(pollen);
 }
 
-function createSunbeam(container) {
+function spawnSunbeamGroup(container, count) {
     if (!enableSunbeams) return;
 
-    const beam = document.createElement('div');
+    const rotate = Math.random() * 30 - 15 + 45; 
-    beam.classList.add('spring-sunbeam');
+    let beamsActive = count;
-    
+
-    const left = Math.random() * 100; // Spread across full width
+    for (let i = 0; i < count; i++) {
-    beam.style.left = `${left}%`;
+        const beam = document.createElement('div');
-    
+        beam.classList.add('spring-sunbeam');
-    // Thinner beams as requested
+        
-    const width = Math.random() * 20 + 10; // 10-30px wide
+        const left = Math.random() * 100;
-    beam.style.width = `${width}px`;
+        beam.style.left = `${left}%`;
-    
+        
-    const rotate = Math.random() * 20 - 10 + 45; 
+        // MARK: SUNBEAM WIDTH (in px)
-    beam.style.transform = `rotate(${rotate}deg)`;
+        const width = Math.random() * 5 + 15; // 5-20px wide
-    
+        beam.style.width = `${width}px`;
-    const duration = Math.random() * 10 + 10; 
+        
-    beam.style.animationDuration = `${duration}s`;
+        beam.style.setProperty('--beam-rotation', `${rotate}deg`);
-    beam.style.animationDelay = `-${Math.random() * 10}s`;
+        
-    
+        const duration = Math.random() * 7 + 8; // 8-15s
-    container.appendChild(beam);
+        beam.style.animation = `spring-beam-pulse ${duration}s ease-in-out forwards`;
+        
+        beam.style.animationDelay = `${Math.random() * 3}s`;
+        
+        beam.addEventListener('animationend', () => {
+            beam.remove();
+            beamsActive--;
+            if (beamsActive === 0) {
+                spawnSunbeamGroup(container, count);
+            }
+        });
+        
+        container.appendChild(beam);
+    }
 }
 
 function createGrass(container) {
@@ -121,12 +119,14 @@ function createGrass(container) {
         container.appendChild(grassContainer);
     }
     
-    // More grass: 1 blade every 3px (was 15px)
+    grassContainer.innerHTML = '';
+    
     const bladeCount = window.innerWidth / 3; 
     for (let i = 0; i < bladeCount; i++) {
         const blade = document.createElement('div');
         blade.classList.add('spring-grass');
         
+        // MARK: GRASS HEIGHT
         const height = Math.random() * 40 + 20; // 20-60px height
         blade.style.height = `${height}px`;
         blade.style.left = `${i * 3 + Math.random() * 2}px`;
@@ -138,54 +138,13 @@ function createGrass(container) {
         const hue = 100 + Math.random() * 40; 
         blade.style.backgroundColor = `hsl(${hue}, 60%, 40%)`;
         
+        // Random z-index to interleave with Ladybug (1002)
+        // Values: 1001 (behind) or 1003 (front)
+        const z = Math.random() > 0.5 ? 1001 : 1003;
+        blade.style.zIndex = z;
+        
         grassContainer.appendChild(blade);
     }
-
-    // Add Ladybugs
-    const bugs = ladybugCountConfig;
-    for (let i = 0; i < bugs; i++) {
-        createLadybug(grassContainer);
-    }
-}
-
-function createLadybug(container) {
-    const bug = document.createElement('div');
-    bug.classList.add('spring-ladybug');
-    
-    const direction = Math.random() > 0.5 ? 'right' : 'left';
-    bug.classList.add(direction);
-    
-    // Position lower (bottom of grass), but ensure visibility
-    const bottomOffset = direction === 'right' ? Math.random() * 5 + 6 : Math.random() * 5 + 2; 
-    bug.style.bottom = `${bottomOffset}px`;
-
-    // Start position depends on direction
-    if (direction === 'right') {
-        bug.style.left = '-5%'; // Start off-screen left
-    } else {
-        bug.style.left = '105%'; // Start off-screen right
-    }
-
-    const duration = Math.random() * 20 + 20; // Slow crawl
-    bug.style.animationDuration = `${duration}s`;
-    bug.style.animationDelay = `-${Math.random() * 20}s`;
-    
-    container.appendChild(bug);
-}
-
-function addRandomSpringObjects() {
-    const container = document.querySelector('.spring-container');
-    if (!container) return;
-
-    if (enablePetals) {
-        for (let i = 0; i < petalCount; i++) {
-            createPetal(container);
-        }
-    }
-    
-    for (let i = 0; i < pollenCount; i++) {
-        createPollen(container);
-    }
 }
 
 function initSpringObjects() {
@@ -199,47 +158,239 @@ function initSpringObjects() {
     
     createGrass(container);
     
-    if (enablePetals) {
-        for (let i = 0; i < 15; i++) {
-            const petal = document.createElement('div');
-            petal.classList.add('spring-petal');
-            const type = Math.random() > 0.5 ? 'type1' : 'type2';
-            petal.classList.add(type);
-            const color = Math.random() > 0.7 ? 'darker' : 'lighter';
-            petal.classList.add(color);
-            const randomLeft = Math.random() * 100;
-            petal.style.left = `${randomLeft}%`;
-            const size = Math.random() * 0.5 + 0.5;
-            petal.style.transform = `scale(${size})`;
-            
-            const duration = Math.random() * 5 + 8;
-            const swayDuration = Math.random() * 2 + 2;
-            
-            if (enableDifferentDuration) {
-            petal.style.animationDuration = `${duration}s, ${swayDuration}s`;
-            }
-            petal.style.animationDelay = `-${Math.random() * 10}s, -${Math.random() * 3}s`;
-            container.appendChild(petal);
-        }
-    }
-    
     if (enableSunbeams) {
-        // Initial sunbeams
+        spawnSunbeamGroup(container, sunbeamCount);
-        for (let i = 0; i < sunbeamCount; i++) {
-            createSunbeam(container);
-        }
     }
 }
 
 function initializeSpring() {
-    if (!spring) return;
+    if (!spring) {
+        console.warn('Spring is disabled.');
+        return;
+    }
+
     initSpringObjects();
     toggleSpring();
 
-    const screenWidth = window.innerWidth;
+    const container = document.querySelector('.spring-container');
-    if (randomSpring && (screenWidth > 768 || randomSpringMobile)) {
+    if (container) {
-        addRandomSpringObjects();
+        if (randomSpring) {
+            // Add Pollen
+            for (let i = 0; i < pollenCount; i++) {
+                createPollen(container);
+            }
+
+            // Add Birds
+            for (let i = 0; i < birdCount; i++) {
+                setTimeout(() => createBird(container), Math.random() * 1000); // 0-1s desync
+            }
+            // Add Butterflies
+            for (let i = 0; i < butterflyCount; i++) {
+                setTimeout(() => createButterfly(container), Math.random() * 1000); // 0-1s desync
+            }
+            // Add Bees
+            for (let i = 0; i < beeCount; i++) {
+                setTimeout(() => createBee(container), Math.random() * 1000); // 0-1s desync
+            }
+            // Add Ladybugs
+            for (let i = 0; i < ladybugCount; i++) {
+                setTimeout(() => createLadybugGif(container), Math.random() * 1000); // 0-1s desync
+            }
+        }
     }
 }
 
+function createBird(container) {
+    const wrapper = document.createElement('div');
+    wrapper.classList.add('spring-anim-wrapper'); 
+    wrapper.classList.add('spring-bird-wrapper'); 
+    
+    const mirror = document.createElement('div');
+    mirror.classList.add('spring-mirror-wrapper');
+    
+    const bird = document.createElement('img');
+    bird.classList.add('spring-bird');
+    
+    const randomSrc = birdImages[Math.floor(Math.random() * birdImages.length)];
+    bird.src = randomSrc;
+    
+    const direction = Math.random() > 0.5 ? 'right' : 'left';
+    // MARK: BIRD SPEED (10-15s)
+    const duration = Math.random() * 5 + 10;
+    
+    // MARK: BIRD HEIGHT RANGE (in %)
+    const startY = Math.random() * 55 + 5; // Start 5-60%
+    const endY = Math.random() * 55 + 5;   // End 5-60%
+    wrapper.style.setProperty('--start-y', `${startY}%`);
+    wrapper.style.setProperty('--end-y', `${endY}%`);
+    
+    if (direction === 'right') {
+        wrapper.style.animation = `spring-fly-right-wrapper ${duration}s linear forwards, spring-vertical-drift ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(-1)'; 
+    } else {
+        wrapper.style.animation = `spring-fly-left-wrapper ${duration}s linear forwards, spring-vertical-drift ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(1)'; 
+    }
+    
+    wrapper.addEventListener('animationend', (e) => {
+        if (e.animationName.includes('fly-')) {
+            wrapper.remove();
+            createBird(container);
+        }
+    });
+    
+    bird.style.animation = `spring-bob 2s ease-in-out infinite`;
+     
+    wrapper.style.top = `${startY}%`; 
+    
+    mirror.appendChild(bird);
+    wrapper.appendChild(mirror);
+    container.appendChild(wrapper);
+}
+
+function createButterfly(container) {
+    const wrapper = document.createElement('div');
+    wrapper.classList.add('spring-anim-wrapper');
+    wrapper.classList.add('spring-butterfly-wrapper');
+
+    const mirror = document.createElement('div');
+    mirror.classList.add('spring-mirror-wrapper');
+
+    const butterfly = document.createElement('img');
+    butterfly.classList.add('spring-butterfly');
+    
+    const randomSrc = butterflyImages[Math.floor(Math.random() * butterflyImages.length)];
+    butterfly.src = randomSrc;
+    
+    const duration = Math.random() * 15 + 25; 
+    const direction = Math.random() > 0.5 ? 'right' : 'left';
+    
+    if (direction === 'right') {
+        wrapper.style.animation = `spring-fly-right-wrapper ${duration}s linear forwards`;  
+        mirror.style.transform = 'scaleX(1)'; 
+    } else {
+        wrapper.style.animation = `spring-fly-left-wrapper ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(-1)'; 
+    }
+    
+    wrapper.addEventListener('animationend', (e) => {
+        if (e.animationName.includes('fly-')) {
+            wrapper.remove();
+            createButterfly(container);
+        }
+    });
+
+    // MARK: BUTTERFLY FLUTTER RHYTHM
+    butterfly.style.animation = `spring-flutter 3s ease-in-out infinite`;
+    butterfly.style.animationDelay = `-${Math.random() * 3}s`;
+
+    // MARK: BUTTERFLY HEIGHT (in %)
+    const top = Math.random() * 35 + 50; // 50-85% 
+    wrapper.style.top = `${top}%`;
+    
+    mirror.appendChild(butterfly);
+    wrapper.appendChild(mirror);
+    container.appendChild(wrapper);
+}
+
+function createBee(container) {
+    const wrapper = document.createElement('div');
+    wrapper.classList.add('spring-anim-wrapper'); 
+    wrapper.classList.add('spring-bee-wrapper');
+
+    const mirror = document.createElement('div');
+    mirror.classList.add('spring-mirror-wrapper');
+
+    const bee = document.createElement('img');
+    bee.classList.add('spring-bee');
+    bee.src = beeImage;
+    
+    const duration = Math.random() * 10 + 15;
+    const direction = Math.random() > 0.5 ? 'right' : 'left';
+    
+    if (direction === 'right') {
+        wrapper.style.animation = `spring-fly-right-wrapper ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(1)'; 
+    } else {
+        wrapper.style.animation = `spring-fly-left-wrapper ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(-1)';
+    }
+
+    wrapper.addEventListener('animationend', (e) => {
+        if (e.animationName.includes('fly-')) {
+            wrapper.remove();
+            createBee(container);
+        }
+    });
+
+    // MARK: BEE HEIGHT (in %)
+    const top = Math.random() * 60 + 20; // 20-80%
+    wrapper.style.top = `${top}%`;
+    
+    mirror.appendChild(bee);
+    wrapper.appendChild(mirror);
+    container.appendChild(wrapper);
+}
+
+function createLadybugGif(container) {
+    const wrapper = document.createElement('div');
+    wrapper.classList.add('spring-anim-wrapper'); 
+    wrapper.classList.add('spring-ladybug-wrapper');
+
+    const mirror = document.createElement('div');
+    mirror.classList.add('spring-mirror-wrapper');
+
+    const bug = document.createElement('img');
+    bug.classList.add('spring-ladybug-gif');
+    bug.src = ladybugImage;
+    
+    const direction = Math.random() > 0.5 ? 'right' : 'left';
+    const duration = Math.random() * 20 + 30; 
+    
+    if (direction === 'right') {
+        wrapper.style.animation = `spring-walk-right ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(1)'; 
+    } else {
+        wrapper.style.animation = `spring-walk-left ${duration}s linear forwards`;
+        mirror.style.transform = 'scaleX(-1)';
+    }
+    
+    wrapper.addEventListener('animationend', (e) => {
+        if (e.animationName.includes('walk-')) {
+            wrapper.remove();
+            createLadybugGif(container);
+        }
+    });
+        
+    bug.style.animation = `spring-crawl 2s ease-in-out infinite`;
+
+    wrapper.style.top = 'auto'; 
+    wrapper.style.bottom = '5px';
+    
+    mirror.appendChild(bug);
+    wrapper.appendChild(mirror);
+    container.appendChild(wrapper);
+}
+
+function debounce(func, wait) {
+    let timeout;
+    return function executedFunction(...args) {
+        const later = () => {
+            clearTimeout(timeout);
+            func(...args);
+        };
+        clearTimeout(timeout);
+        timeout = setTimeout(later, wait);
+    };
+}
+
+const handleResize = debounce(() => {
+    const container = document.querySelector('.spring-container');
+    if (container) {
+        createGrass(container);
+    }
+}, 250);
+
+window.addEventListener('resize', handleResize);
+
 initializeSpring();

Jellyfin.Plugin.Seasonals/Web/summer.js

@@ -1,11 +1,11 @@
 const config = window.SeasonalsPluginConfig?.Summer || {};
 
-const summer = config.EnableSummer !== undefined ? config.EnableSummer : true; // enable/disable summer
+const summer = config.EnableSummer !== undefined ? config.EnableSummer : true; // Enable/disable summer theme
-const bubbleCount = config.BubbleCount || 20;
+const bubbleCount = config.BubbleCount || 30; // Number of bubbles
-const dustCount = config.DustCount || 50;
+const dustCount = config.DustCount || 50; // Number of dust particles
-const randomSummer = config.EnableRandomSummer !== undefined ? config.EnableRandomSummer : true; // enable random objects
+const randomSummer = config.EnableRandomSummer !== undefined ? config.EnableRandomSummer : true; // Enable random generating objects
-const randomSummerMobile = config.EnableRandomSummerMobile !== undefined ? config.EnableRandomSummerMobile : false; // enable random objects on mobile
+const randomSummerMobile = config.EnableRandomSummerMobile !== undefined ? config.EnableRandomSummerMobile : false; // Enable random generating objects on mobile
-const enableDifferentDuration = config.EnableDifferentDuration !== undefined ? config.EnableDifferentDuration : true; // enable different animation duration
+const enableDifferentDuration = config.EnableDifferentDuration !== undefined ? config.EnableDifferentDuration : true; // Randomize animation duration of bubbles and dust
 
 let msgPrinted = false;
 
@@ -51,10 +51,12 @@ function createBubble(container, isDust = false) {
 
     // Random size
     if (!isDust) {
+        // MARK: BUBBLE SIZE
         const size = Math.random() * 20 + 10; // 10-30px bubbles
         bubble.style.width = `${size}px`;
         bubble.style.height = `${size}px`;
     } else {
+        // MARK: DUST SIZE
         const size = Math.random() * 3 + 1; // 1-4px dust
         bubble.style.width = `${size}px`;
         bubble.style.height = `${size}px`;
@@ -81,7 +83,7 @@ function addRandomSummerObjects() {
         createBubble(container, false);
     }
     
-    // Add some dust particles (more of them, they are subtle)
+    // Add some dust particles
     for (let i = 0; i < dustCount; i++) {
         createBubble(container, true);
     }
@@ -110,10 +112,12 @@ function initSummerObjects() {
         bubble.style.left = `${randomLeft}%`;
         
         if (!isDust) {
+            // MARK: BUBBLE SIZE
             const size = Math.random() * 20 + 10;
             bubble.style.width = `${size}px`;
             bubble.style.height = `${size}px`;
         } else {
+            // MARK: DUST SIZE
             const size = Math.random() * 3 + 1;
             bubble.style.width = `${size}px`;
             bubble.style.height = `${size}px`;

Jellyfin.Plugin.Seasonals/Web/test-site.html

@@ -248,6 +248,7 @@
             <option value="spring">Spring</option>
             <option value="summer">Summer (Bubbles)</option>
             <option value="carnival">Carnival (Confetti)</option>
+            <option value="cherryblossom">Cherryblossom</option>
             <option value="custom">⚙ Custom (Local Files)</option>
         </select>
 
@@ -333,6 +334,7 @@
             spring:       { css: 'spring.css',        js: 'spring.js',       container: 'spring-container' },
             summer:       { css: 'summer.css',        js: 'summer.js',       container: 'summer-container' },
             carnival:     { css: 'carnival.css',      js: 'carnival.js',     container: 'carnival-container' },
+            cherryblossom:     { css: 'cherryblossom.css',      js: 'cherryblossom.js',     container: 'cherryblossom-container' },
         };
 
         const select = document.getElementById('theme-select');

manifest.json

@@ -9,12 +9,12 @@
     "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/raw/branch/main/logo.png",
     "versions": [
       {
-        "version": "1.7.1.0",
+        "version": "1.7.1.3",
         "changelog": "- feat: add summer, spring and carnival themes",
         "targetAbi": "10.11.0.0",
-        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/releases/download/v1.7.1.0/Jellyfin.Plugin.Seasonals.zip",
+        "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/Jellyfin-Seasonals-Plugin/releases/download/v1.7.1.3/Jellyfin.Plugin.Seasonals.zip",
-        "checksum": "5f288972124771d1223484f75138f566",
+        "checksum": "5dcad8f2341533765b15d89a9a2e94c2",
-        "timestamp": "2026-02-19T02:20:23Z"
+        "timestamp": "2026-02-21T13:50:19Z"
       },
       {
         "version": "1.7.0.15",