sync wind direction with wilder wilds / frozenlib

RandomMcSomethin · May 26, 2024 · cc08b7b · cc08b7b
1 parent d23b820
commit cc08b7b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,6 +37,10 @@ dependencies {
     }
 
     modCompileOnly "com.github.Fourmisain:fabric-seasons:jitpack-SNAPSHOT"
+
+    // TODO frozenlib jitpack build fails, same with local builds...?!
+    //modCompileOnly "com.github.Fourmisain:FrozenLib:depends-SNAPSHOT"
+    modCompileOnly files("frozenlib-1.7.2-mc1.20.6.jar")
 }
 
 processResources {

diff --git a/src/main/java/randommcsomethin/fallingleaves/particle/FallingLeafParticle.java b/src/main/java/randommcsomethin/fallingleaves/particle/FallingLeafParticle.java
@@ -2,6 +2,8 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.loader.api.FabricLoader;
+import net.frozenblock.lib.wind.api.ClientWindManager;
 import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
@@ -153,8 +155,26 @@ public void tick() {
             // the wind coefficient is just another factor in (0, 1) to add some variance between leaves.
             // this implementation lags behind the actual wind speed and will never reach it fully,
             // so wind speeds needs to be adjusted accordingly
-            velocityX += (Wind.windX - velocityX) * windCoefficient / 60.0f;
-            velocityZ += (Wind.windZ - velocityZ) * windCoefficient / 60.0f;
+            double ax = (Wind.windX - velocityX) * windCoefficient / 60.0f;
+            double az = (Wind.windZ - velocityZ) * windCoefficient / 60.0f;
+
+            if (FabricLoader.getInstance().isModLoaded("wilderwild")) {
+                // redirect wind in direction of Wilder Wild / FrozenLib wind
+                Vec3d wind = ClientWindManager.getWindMovement(world, new Vec3d(x, y, z));
+
+                double windNorm2d = Math.sqrt(wind.x * wind.x + wind.z * wind.z);
+                if (windNorm2d >= 1.0E-4) {
+                    double norm = Math.sqrt(ax*ax + az*az);
+                    ax = norm * wind.x / windNorm2d;
+                    az = norm * wind.z / windNorm2d;
+                } else {
+                    // hopefully doesn't happen too often
+                    ax = az = 0;
+                }
+            }
+
+            velocityX += ax;
+            velocityZ += az;
         }
 
         move(velocityX, velocityY, velocityZ);