Merge branch 'more-block-noises' into 'main'

More more item blocks sounds

See merge request cable-mc/cobblemon!2450

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

@@ -710,11 +710,11 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val THROAT_SPRAY = create("throat_spray", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.THROAT_SPRAY))
     @JvmField
-    val TERRAIN_EXTENDER = create("terrain_extender", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.EXTENDER))
+    val TERRAIN_EXTENDER = create("terrain_extender", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_METAL_CAN_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.EXTENDER))
     @JvmField
-    val MOOMOO_MILK = create("moomoo_milk", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.GLASS_BOTTLE))
+    val MOOMOO_MILK = create("moomoo_milk", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_JAR_GLASS_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.GLASS_BOTTLE))
     @JvmField
-    val MEDICINAL_BREW = create("medicinal_brew", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.GLASS_BOTTLE))
+    val MEDICINAL_BREW = create("medicinal_brew", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_JAR_GLASS_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.GLASS_BOTTLE))
 
     @JvmField
     val FULL_HEAL = create("full_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_BOTTLE_LIQUID_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))

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

@@ -720,5 +720,35 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
         ITEM_BLOCK_DICE_STEP
     )
 
+    @JvmField
+    val ITEM_BLOCK_METAL_CAN_PLACE = this.create("block.item_block.metal_can.place")
+    @JvmField
+    val ITEM_BLOCK_METAL_CAN_BREAK = this.create("block.item_block.metal_can.break")
+    @JvmField
+    val ITEM_BLOCK_METAL_CAN_STEP = this.create("block.item_block.metal_can.step")
+    @JvmField
+    val ITEM_BLOCK_METAL_CAN_SOUNDS = SoundType(1f, 1.1f,
+        ITEM_BLOCK_METAL_CAN_BREAK,
+        ITEM_BLOCK_METAL_CAN_STEP,
+        ITEM_BLOCK_METAL_CAN_PLACE,
+        ITEM_BLOCK_METAL_CAN_STEP,
+        ITEM_BLOCK_METAL_CAN_STEP
+    )
+
+    @JvmField
+    val ITEM_BLOCK_JAR_GLASS_LIQUID_PLACE = this.create("block.item_block.jar_glass_liquid.place")
+    @JvmField
+    val ITEM_BLOCK_JAR_GLASS_LIQUID_BREAK = this.create("block.item_block.jar_glass_liquid.break")
+    @JvmField
+    val ITEM_BLOCK_JAR_GLASS_LIQUID_STEP = this.create("block.item_block.jar_glass_liquid.step")
+    @JvmField
+    val ITEM_BLOCK_JAR_GLASS_LIQUID_SOUNDS = SoundType(1f, 1.1f,
+        ITEM_BLOCK_JAR_GLASS_LIQUID_BREAK,
+        ITEM_BLOCK_JAR_GLASS_LIQUID_STEP,
+        ITEM_BLOCK_JAR_GLASS_LIQUID_PLACE,
+        ITEM_BLOCK_JAR_GLASS_LIQUID_STEP,
+        ITEM_BLOCK_JAR_GLASS_LIQUID_STEP
+    )
+
     private fun create(name: String): SoundEvent = this.create(name, SoundEvent.createVariableRangeEvent(cobblemonResource(name)))
 }

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

@@ -990,7 +990,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/bottle_liquid_place_1", "volume": 0.4 },
       { "name": "cobblemon:block/item_block/bottle_liquid_place_2", "volume": 0.4 },
-      { "name": "cobblemon:block/item_block/bottle_liquid_place_3", "volume": 0.4 }
+      { "name": "cobblemon:block/item_block/bottle_liquid_place_3", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/bottle_liquid_place_4", "volume": 0.4 }
     ]
   },
   "block.item_block.bottle_liquid.break": {
@@ -998,7 +999,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/bottle_liquid_break_1", "volume": 0.5 },
       { "name": "cobblemon:block/item_block/bottle_liquid_break_2", "volume": 0.5 },
-      { "name": "cobblemon:block/item_block/bottle_liquid_break_3", "volume": 0.5 }
+      { "name": "cobblemon:block/item_block/bottle_liquid_break_3", "volume": 0.5 },
+      { "name": "cobblemon:block/item_block/bottle_liquid_break_4", "volume": 0.5 }
     ]
   },
   "block.item_block.bottle_liquid.step": {
@@ -1006,7 +1008,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/bottle_liquid_step_1", "volume": 0.2 },
       { "name": "cobblemon:block/item_block/bottle_liquid_step_2", "volume": 0.2 },
-      { "name": "cobblemon:block/item_block/bottle_liquid_step_3", "volume": 0.2 }
+      { "name": "cobblemon:block/item_block/bottle_liquid_step_3", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/bottle_liquid_step_4", "volume": 0.2 }
     ]
   },
   "block.item_block.bottle_pills.place": {
@@ -1014,7 +1017,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/bottle_pills_place_1", "volume": 0.4 },
       { "name": "cobblemon:block/item_block/bottle_pills_place_2", "volume": 0.4 },
-      { "name": "cobblemon:block/item_block/bottle_pills_place_3", "volume": 0.4 }
+      { "name": "cobblemon:block/item_block/bottle_pills_place_3", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/bottle_pills_place_4", "volume": 0.4 }
     ]
   },
   "block.item_block.bottle_pills.break": {
@@ -1022,7 +1026,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/bottle_pills_break_1", "volume": 0.5 },
       { "name": "cobblemon:block/item_block/bottle_pills_break_2", "volume": 0.5 },
-      { "name": "cobblemon:block/item_block/bottle_pills_break_3", "volume": 0.5 }
+      { "name": "cobblemon:block/item_block/bottle_pills_break_3", "volume": 0.5 },
+      { "name": "cobblemon:block/item_block/bottle_pills_break_4", "volume": 0.5 }
     ]
   },
   "block.item_block.bottle_pills.step": {
@@ -1030,7 +1035,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/bottle_pills_step_1", "volume": 0.2 },
       { "name": "cobblemon:block/item_block/bottle_pills_step_2", "volume": 0.2 },
-      { "name": "cobblemon:block/item_block/bottle_pills_step_3", "volume": 0.2 }
+      { "name": "cobblemon:block/item_block/bottle_pills_step_3", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/bottle_pills_step_4", "volume": 0.2 }
     ]
   },
   "block.item_block.powder.place": {
@@ -1038,7 +1044,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/powder_place_1", "volume": 0.3 },
       { "name": "cobblemon:block/item_block/powder_place_2", "volume": 0.3 },
-      { "name": "cobblemon:block/item_block/powder_place_3", "volume": 0.3 }
+      { "name": "cobblemon:block/item_block/powder_place_3", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/powder_place_4", "volume": 0.3 }
     ]
   },
   "block.item_block.powder.break": {
@@ -1046,7 +1053,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/powder_break_1", "volume": 0.4 },
       { "name": "cobblemon:block/item_block/powder_break_2", "volume": 0.4 },
-      { "name": "cobblemon:block/item_block/powder_break_3", "volume": 0.4 }
+      { "name": "cobblemon:block/item_block/powder_break_3", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/powder_break_4", "volume": 0.4 }
     ]
   },
   "block.item_block.powder.step": {
@@ -1054,7 +1062,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/powder_step_1", "volume": 0.2 },
       { "name": "cobblemon:block/item_block/powder_step_2", "volume": 0.2 },
-      { "name": "cobblemon:block/item_block/powder_step_3", "volume": 0.2 }
+      { "name": "cobblemon:block/item_block/powder_step_3", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/powder_step_4", "volume": 0.2 }
     ]
   },
   "block.item_block.dice.place": {
@@ -1062,7 +1071,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/dice_place_1", "volume": 0.3 },
       { "name": "cobblemon:block/item_block/dice_place_2", "volume": 0.3 },
-      { "name": "cobblemon:block/item_block/dice_place_3", "volume": 0.3 }
+      { "name": "cobblemon:block/item_block/dice_place_3", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/dice_place_4", "volume": 0.3 }
     ]
   },
   "block.item_block.dice.break": {
@@ -1070,7 +1080,8 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/dice_break_1", "volume": 0.4 },
       { "name": "cobblemon:block/item_block/dice_break_2", "volume": 0.4 },
-      { "name": "cobblemon:block/item_block/dice_break_3", "volume": 0.4 }
+      { "name": "cobblemon:block/item_block/dice_break_3", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/dice_break_4", "volume": 0.4 }
     ]
   },
   "block.item_block.dice.step": {
@@ -1078,7 +1089,62 @@
     "sounds": [
       { "name": "cobblemon:block/item_block/dice_step_1", "volume": 0.2 },
       { "name": "cobblemon:block/item_block/dice_step_2", "volume": 0.2 },
-      { "name": "cobblemon:block/item_block/dice_step_3", "volume": 0.2 }
+      { "name": "cobblemon:block/item_block/dice_step_3", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/dice_step_4", "volume": 0.2 }
+    ]
+  },
+  "block.item_block.metal_can.place": {
+    "subtitle": "subtitles.block.generic.place",
+    "sounds": [
+      { "name": "cobblemon:block/item_block/metal_can_place_1", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/metal_can_place_2", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/metal_can_place_3", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/metal_can_place_4", "volume": 0.3 }
+    ]
+  },
+  "block.item_block.metal_can.break": {
+    "subtitle": "subtitles.block.generic.break",
+    "sounds": [
+      { "name": "cobblemon:block/item_block/metal_can_break_1", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/metal_can_break_2", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/metal_can_break_3", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/metal_can_break_4", "volume": 0.4 }
+    ]
+  },
+  "block.item_block.metal_can.step": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:block/item_block/metal_can_step_1", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/metal_can_step_2", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/metal_can_step_3", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/metal_can_step_4", "volume": 0.2 }
+    ]
+  },
+  "block.item_block.jar_glass_liquid.place": {
+    "subtitle": "subtitles.block.generic.place",
+    "sounds": [
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_place_1", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_place_2", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_place_3", "volume": 0.3 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_place_4", "volume": 0.3 }
+    ]
+  },
+  "block.item_block.jar_glass_liquid.break": {
+    "subtitle": "subtitles.block.generic.break",
+    "sounds": [
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_break_1", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_break_2", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_break_3", "volume": 0.4 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_break_4", "volume": 0.4 }
+    ]
+  },
+  "block.item_block.jar_glass_liquid.step": {
+    "subtitle": "subtitles.block.generic.footsteps",
+    "sounds": [
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_step_1", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_step_2", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_step_3", "volume": 0.2 },
+      { "name": "cobblemon:block/item_block/jar_glass_liquid_step_4", "volume": 0.2 }
     ]
   },
   "move.absorb.actor": {