Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

Fusion-Flux · Aug 24, 2023 · cc47d64 · cc47d64
2 parents effc2cc + 09c4a41
commit cc47d64
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/com/fusionflux/portalcubed/blocks/blockentities/LaserNodeBlockEntity.java b/src/main/java/com/fusionflux/portalcubed/blocks/blockentities/LaserNodeBlockEntity.java
@@ -38,7 +38,7 @@ public LaserNodeBlockEntity(BlockPos pos, BlockState state) {
 
     public void updateState(boolean toggle) {
         assert level != null;
-        level.playSound(null, worldPosition, toggle ? PortalCubedSounds.LASER_NODE_ACTIVATE_EVENT : PortalCubedSounds.LASER_NODE_DEACTIVATE_EVENT, SoundSource.BLOCKS, 0.5f, 1f);
+        level.playSound(null, worldPosition, toggle ? PortalCubedSounds.LASER_NODE_ACTIVATE_EVENT : PortalCubedSounds.LASER_NODE_DEACTIVATE_EVENT, SoundSource.BLOCKS, 0.3f, 1f);
         level.setBlockAndUpdate(worldPosition, level.getBlockState(worldPosition).setValue(BlockStateProperties.ENABLED, toggle));
         setChanged();
     }

diff --git a/src/main/resources/assets/portalcubed/sounds.json b/src/main/resources/assets/portalcubed/sounds.json
@@ -259,31 +259,46 @@
 
 	"laser/emitter_activate": {
 		"sounds": [
-			"portalcubed:laser/laser_activation_01"
+			{
+				"name": "portalcubed:laser/laser_activation_01",
+				"volume": 0.3
+			}
 		],
 		"subtitle": "subtitles.portalcubed.laser.activate"
 	},
 	"laser/beam_music": {
 		"sounds": [
-			"portalcubed:laser/laser_beam_lp_02"
+			{
+				"name": "portalcubed:laser/laser_beam_lp_02",
+				"volume": 0.3
+			}
 		],
 		"subtitle": "subtitles.portalcubed.laser.ambiance"
 	},
 	"laser/node_music": {
 		"sounds": [
-			"portalcubed:laser/laser_node_lp_01"
+			{
+				"name": "portalcubed:laser/laser_node_lp_01",
+				"volume": 0.3
+			}
 		],
 		"subtitle": "subtitles.portalcubed.laser.node_sing"
 	},
 	"laser/node_activate": {
 		"sounds": [
-			"portalcubed:laser/laser_node_power_on"
+			{
+				"name": "portalcubed:laser/laser_node_power_on",
+				"volume": 0.3
+			}
 		],
 		"subtitle": "subtitles.portalcubed.laser.node_activate"
 	},
 	"laser/node_deactivate": {
 		"sounds": [
-			"portalcubed:laser/laser_node_power_off"
+			{
+				"name": "portalcubed:laser/laser_node_power_off",
+				"volume": 0.3
+			}
 		],
 		"subtitle": "subtitles.portalcubed.laser.node_deactivate"
 	},