Merge branch 'sterr/sound' into 'main'

Couple of sound tweaks

See merge request cable-mc/cobblemon!2245

CHANGELOG.md

@@ -173,6 +173,8 @@
 - Cleaned up seat data. Removed all now unused fields from seats in all species files. Also made locator seat names explicit in the species files (however, this doesn't break the legacy format)
 - Marks can now provide aspects.
 - Added new shiny and Alpha chance configs
+- Apricorns now make a new sound when harvested
+- Lowered the volume of harvesting berries
 
 ### Fixes
 - Fixed Croagunk's walkspeed

common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt

@@ -263,6 +263,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     @JvmField
     val BERRY_EAT_FULL = this.create("item.berry.eat.full")
 
+    @JvmField
+    val APRICORN_HARVEST = this.create("block.apricorn.harvest")
+
     @JvmField
     val BIG_ROOT_BREAK = this.create("block.big_root.break")
     @JvmField
@@ -410,9 +413,9 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     )
 
     @JvmField
-    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_cluster.break")
+    val TYPE_GEM_BLOCK_BREAK = this.create("block.type_gem_block.break")
     @JvmField
-    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_block.break")
+    val TYPE_GEM_CLUSTER_BREAK = this.create("block.type_gem_cluster.break")
     @JvmField
     val TYPE_GEM_BLOCK_HIT = this.create("block.type_gem_block.hit")
     @JvmField
@@ -421,7 +424,7 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
     val TYPE_GEM_BLOCK_STEP = this.create("block.type_gem_block.step")
 
     @JvmField
-    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.2f,
+    val TYPE_GEM_CLUSTER_SOUNDS = SoundType(1f, 1.1f,
         TYPE_GEM_CLUSTER_BREAK,
         TYPE_GEM_BLOCK_STEP,
         TYPE_GEM_BLOCK_PLACE,

common/src/main/kotlin/com/cobblemon/mod/common/block/ApricornBlock.kt

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common.block
 
+import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.apricorn.Apricorn
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.farming.ApricornHarvestEvent
@@ -176,7 +177,7 @@ class ApricornBlock(settings: Properties, val apricorn: Apricorn) : HorizontalDi
         world.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(player, resetState))
 
         if (!world.isClientSide) {
-            world.playSoundServer(position = pos.toVec3d(), sound = SoundEvents.ITEM_PICKUP, volume = 0.7F, pitch = 1.4F)
+            world.playSoundServer(position = pos.toVec3d(), sound = CobblemonSounds.APRICORN_HARVEST, volume = 1.0F, pitch = 1.0F)
 
             if (world is ServerLevel && player is ServerPlayer) {
                 CobblemonEvents.APRICORN_HARVESTED.post(ApricornHarvestEvent(player, apricorn, world, pos))

common/src/main/resources/assets/cobblemon/sounds.json

@@ -454,36 +454,36 @@
   "block.type_gem_block.break": {
     "subtitle": "subtitles.block.generic.break",
     "sounds": [
-      "cobblemon:block/type_gem/type_gem_block_break_1",
-      "cobblemon:block/type_gem/type_gem_block_break_2",
-      "cobblemon:block/type_gem/type_gem_block_break_3",
-      "cobblemon:block/type_gem/type_gem_block_break_4"
+      { "name": "cobblemon:block/type_gem/type_gem_block_break_1", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_break_2", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_break_3", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_break_4", "volume": 0.7 }
     ]
   },
   "block.type_gem_cluster.break": {
     "subtitle": "subtitles.block.generic.break",
     "sounds": [
-      "cobblemon:block/type_gem/type_gem_cluster_break_1",
-      "cobblemon:block/type_gem/type_gem_cluster_break_2",
-      "cobblemon:block/type_gem/type_gem_cluster_break_3",
-      "cobblemon:block/type_gem/type_gem_cluster_break_4"
+      { "name": "cobblemon:block/type_gem/type_gem_cluster_break_1", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_cluster_break_2", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_cluster_break_3", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_cluster_break_4", "volume": 0.7 }
     ]
   },
   "block.type_gem_block.hit": {
     "subtitle": "subtitles.block.generic.hit",
     "sounds": [
-      { "name": "cobblemon:block/type_gem/type_gem_block_hit_1", "volume": 0.8 },
-      { "name": "cobblemon:block/type_gem/type_gem_block_hit_2", "volume": 0.8 },
-      { "name": "cobblemon:block/type_gem/type_gem_block_hit_3", "volume": 0.8 },
-      { "name": "cobblemon:block/type_gem/type_gem_block_hit_4", "volume": 0.8 }
+      { "name": "cobblemon:block/type_gem/type_gem_block_hit_1", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_hit_2", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_hit_3", "volume": 0.7 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_hit_4", "volume": 0.7 }
     ]
   },
   "block.type_gem_block.place": {
     "subtitle": "subtitles.block.generic.place",
     "sounds": [
-      { "name": "cobblemon:block/type_gem/type_gem_block_place_1", "volume": 0.7 },
-      { "name": "cobblemon:block/type_gem/type_gem_block_place_2", "volume": 0.7 },
-      { "name": "cobblemon:block/type_gem/type_gem_block_place_3", "volume": 0.7 }
+      { "name": "cobblemon:block/type_gem/type_gem_block_place_1", "volume": 0.5 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_place_2", "volume": 0.5 },
+      { "name": "cobblemon:block/type_gem/type_gem_block_place_3", "volume": 0.5 }
     ]
   },
   "block.type_gem_block.step": {
@@ -648,9 +648,16 @@
   },
   "block.berry_bush.harvest": {
     "sounds": [
-      "cobblemon:block/berry/berry_bush_harvest_1",
-      "cobblemon:block/berry/berry_bush_harvest_2",
-      "cobblemon:block/berry/berry_bush_harvest_3"
+      { "name": "cobblemon:block/berry/berry_bush_harvest_1", "volume": 0.4 },
+      { "name": "cobblemon:block/berry/berry_bush_harvest_2", "volume": 0.4 },
+      { "name": "cobblemon:block/berry/berry_bush_harvest_3", "volume": 0.4 }
+    ]
+  },
+  "block.apricorn.harvest": {
+    "sounds": [
+      { "name": "cobblemon:block/berry/berry_bush_harvest_1", "volume": 0.4, "pitch": 1.5 },
+      { "name": "cobblemon:block/berry/berry_bush_harvest_2", "volume": 0.4, "pitch": 1.5 },
+      { "name": "cobblemon:block/berry/berry_bush_harvest_3", "volume": 0.4, "pitch": 1.5 }
     ]
   },
   "block.big_root.break": {