Fixed tree sounds being heard from too far away

DynamicTreesTeam · Nov 26, 2024 · 2af0051 · 2af0051
1 parent 2bd2cb8
commit 2af0051
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 33 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ jeiVersion=15.0.0.12
 patchouliVersion=1.20.1-84-FORGE
 suggestionProviderFixVersion=1.0.0
 ccVersion=1.109.4
-ssVersion=5790653
+ssVersion=5790633
 gcVersion=5787839
 jadeVersion=4986594
 

diff --git a/src/main/java/com/ferreusveritas/dynamictrees/entity/animation/FalloverAnimationHandler.java b/src/main/java/com/ferreusveritas/dynamictrees/entity/animation/FalloverAnimationHandler.java
@@ -66,7 +66,7 @@ protected void playEndSound(FallingTreeEntity entity){
             } else {
                 Species species = entity.getSpecies();
                 SoundEvent sound = species.getFallingTreeEndSound(entity.getVolume(), entity.hasLeaves());
-                entity.playSound(sound, 3, species.getFallingTreePitch(entity.getVolume()));
+                entity.playSound(sound, 1.5f, species.getFallingTreePitch(entity.getVolume()));
                 getData(entity).endSoundPlayed = true;
             }
 

diff --git a/src/main/resources/assets/dynamictrees/sounds.json b/src/main/resources/assets/dynamictrees/sounds.json
@@ -3,46 +3,40 @@
     "subtitle": "sounds.dynamictrees.falling_tree.start",
     "sounds": [
       {"name": "dynamictrees:falling_tree/big/start1",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/big/start2",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/big/start3",
-        "attenuation_distance": 32}
+        "attenuation_distance": 16}
     ]
   },
   "falling_tree_medium_start": {
     "subtitle": "sounds.dynamictrees.falling_tree.start",
     "sounds": [
       {"name": "dynamictrees:falling_tree/medium/start1",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/medium/start2",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/medium/start3",
-        "attenuation_distance": 32}
+        "attenuation_distance": 16}
     ]
   },
 
 
   "falling_tree_big_end": {
     "subtitle": "sounds.dynamictrees.falling_tree.end",
     "sounds": [
-      {"name": "dynamictrees:falling_tree/big/end1",
-        "attenuation_distance": 48},
-      {"name": "dynamictrees:falling_tree/big/end2",
-        "attenuation_distance": 48},
-      {"name": "dynamictrees:falling_tree/big/end3",
-        "attenuation_distance": 48}
+      {"name": "dynamictrees:falling_tree/big/end1"},
+      {"name": "dynamictrees:falling_tree/big/end2"},
+      {"name": "dynamictrees:falling_tree/big/end3"}
     ]
   },
   "falling_tree_medium_end": {
     "subtitle": "sounds.dynamictrees.falling_tree.end",
     "sounds": [
-      {"name": "dynamictrees:falling_tree/medium/end1",
-        "attenuation_distance": 48},
-      {"name": "dynamictrees:falling_tree/medium/end2",
-        "attenuation_distance": 48},
-      {"name": "dynamictrees:falling_tree/medium/end3",
-        "attenuation_distance": 48}
+      {"name": "dynamictrees:falling_tree/medium/end1"},
+      {"name": "dynamictrees:falling_tree/medium/end2"},
+      {"name": "dynamictrees:falling_tree/medium/end3"}
     ]
   },
   "falling_tree_small_end": {
@@ -65,11 +59,11 @@
     "subtitle": "sounds.dynamictrees.falling_tree.hit_water",
     "sounds": [
       {"name": "dynamictrees:falling_tree/water/fall1",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/water/fall2",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/water/fall3",
-        "attenuation_distance": 32}
+        "attenuation_distance": 16}
     ]
   },
   "falling_tree_small_hit_water": {
@@ -85,24 +79,21 @@
     "subtitle": "sounds.dynamictrees.falling_tree.start",
     "sounds": [
       {"name": "dynamictrees:falling_tree/fungus/start1",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/fungus/start2",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/fungus/start3",
-        "attenuation_distance": 32},
+        "attenuation_distance": 16},
       {"name": "dynamictrees:falling_tree/fungus/start4",
-        "attenuation_distance": 32}
+        "attenuation_distance": 16}
     ]
   },
   "falling_tree_fungus_end": {
     "subtitle": "sounds.dynamictrees.falling_tree.end",
     "sounds": [
-      {"name": "dynamictrees:falling_tree/fungus/end1",
-        "attenuation_distance": 48},
-      {"name": "dynamictrees:falling_tree/fungus/end2",
-        "attenuation_distance": 48},
-      {"name": "dynamictrees:falling_tree/fungus/end3",
-        "attenuation_distance": 48}
+      {"name": "dynamictrees:falling_tree/fungus/end1"},
+      {"name": "dynamictrees:falling_tree/fungus/end2"},
+      {"name": "dynamictrees:falling_tree/fungus/end3"}
     ]
   },
   "falling_tree_fungus_small_end": {